projects/ddmd: dmd/TypeInstance.d annotate

annotate dmd/TypeInstance.d @ 187:b0d41ff5e0df

Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218

author	Abscissa
date	Tue, 07 Jun 2011 23:37:34 -0400
parents	e3afd1303184
children

rev	line source
0 10317f0c89a5 Initial commit korDen parents: diff changeset	1 module dmd.TypeInstance;
10317f0c89a5 Initial commit korDen parents: diff changeset	2
114 e28b18c23469 added a module dmd.common for commonly used stuff Trass3r parents: 113 diff changeset	3 import dmd.common;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	4 import dmd.TypeQualified;
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	5 import dmd.TemplateAliasParameter;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	6 import dmd.TemplateDeclaration;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	7 import dmd.TemplateInstance;
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	8 import dmd.TemplateParameter;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	9 import dmd.TemplateValueParameter;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	10 import dmd.TemplateTupleParameter;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	11 import dmd.Tuple;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	12 import dmd.VarExp;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	13 import dmd.MOD;
10317f0c89a5 Initial commit korDen parents: diff changeset	14 import dmd.MATCH;
10317f0c89a5 Initial commit korDen parents: diff changeset	15 import dmd.Loc;
10317f0c89a5 Initial commit korDen parents: diff changeset	16 import dmd.Global;
10317f0c89a5 Initial commit korDen parents: diff changeset	17 import dmd.Type;
10317f0c89a5 Initial commit korDen parents: diff changeset	18 import dmd.OutBuffer;
10317f0c89a5 Initial commit korDen parents: diff changeset	19 import dmd.HdrGenState;
10317f0c89a5 Initial commit korDen parents: diff changeset	20 import dmd.Dsymbol;
10317f0c89a5 Initial commit korDen parents: diff changeset	21 import dmd.Expression;
10317f0c89a5 Initial commit korDen parents: diff changeset	22 import dmd.Scope;
10317f0c89a5 Initial commit korDen parents: diff changeset	23 import dmd.ArrayTypes;
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	24 import dmd.TOK;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	25 import dmd.TY;
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	26 import dmd.Util : printf;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	27
187 b0d41ff5e0df Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218 Abscissa parents: 178 diff changeset	28 import dmd.DDMDExtensions;
b0d41ff5e0df Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218 Abscissa parents: 178 diff changeset	29
0 10317f0c89a5 Initial commit korDen parents: diff changeset	30 /* Similar to TypeIdentifier, but with a TemplateInstance as the root
10317f0c89a5 Initial commit korDen parents: diff changeset	31 */
10317f0c89a5 Initial commit korDen parents: diff changeset	32 class TypeInstance : TypeQualified
10317f0c89a5 Initial commit korDen parents: diff changeset	33 {
187 b0d41ff5e0df Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218 Abscissa parents: 178 diff changeset	34 mixin insertMemberExtension!(typeof(this));
b0d41ff5e0df Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218 Abscissa parents: 178 diff changeset	35
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	36 TemplateInstance tempinst;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	37
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	38 this(Loc loc, TemplateInstance tempinst)
0 10317f0c89a5 Initial commit korDen parents: diff changeset	39 {
178 e3afd1303184 Many small bugs fixed korDen parents: 121 diff changeset	40 register();
0 10317f0c89a5 Initial commit korDen parents: diff changeset	41 super(Tinstance, loc);
10317f0c89a5 Initial commit korDen parents: diff changeset	42 this.tempinst = tempinst;
10317f0c89a5 Initial commit korDen parents: diff changeset	43 }
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	44
72 2e2a5c3f943a reduced warnings by adding override to the methods Trass3r parents: 16 diff changeset	45 override Type syntaxCopy()
0 10317f0c89a5 Initial commit korDen parents: diff changeset	46 {
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	47 //printf("TypeInstance::syntaxCopy() %s, %d\n", toChars(), idents.dim);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	48 TypeInstance t;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	49
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	50 t = new TypeInstance(loc, cast(TemplateInstance)tempinst.syntaxCopy(null));
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	51 t.syntaxCopyHelper(this);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	52 t.mod = mod;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	53 return t;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	54 }
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	55
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	56 //char *toChars();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	57
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	58 //void toDecoBuffer(OutBuffer *buf, int flag);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	59
72 2e2a5c3f943a reduced warnings by adding override to the methods Trass3r parents: 16 diff changeset	60 override void toCBuffer2(OutBuffer buf, HdrGenState* hgs, MOD mod)
0 10317f0c89a5 Initial commit korDen parents: diff changeset	61 {
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	62 if (mod != this.mod)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	63 { toCBuffer3(buf, hgs, mod);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	64 return;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	65 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	66 tempinst.toCBuffer(buf, hgs);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	67 toCBuffer2Helper(buf, hgs);
0 10317f0c89a5 Initial commit korDen parents: diff changeset	68 }
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	69
72 2e2a5c3f943a reduced warnings by adding override to the methods Trass3r parents: 16 diff changeset	70 override void resolve(Loc loc, Scope sc, Expression* pe, Type* pt, Dsymbol* ps)
0 10317f0c89a5 Initial commit korDen parents: diff changeset	71 {
10317f0c89a5 Initial commit korDen parents: diff changeset	72 // Note close similarity to TypeIdentifier::resolve()
10317f0c89a5 Initial commit korDen parents: diff changeset	73 Dsymbol s;
10317f0c89a5 Initial commit korDen parents: diff changeset	74
10317f0c89a5 Initial commit korDen parents: diff changeset	75 *pe = null;
10317f0c89a5 Initial commit korDen parents: diff changeset	76 *pt = null;
10317f0c89a5 Initial commit korDen parents: diff changeset	77 *ps = null;
10317f0c89a5 Initial commit korDen parents: diff changeset	78
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	79 static if (false) {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	80 if (!idents.dim)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	81 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	82 error(loc, "template instance '%s' has no identifier", toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	83 return;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	84 }
0 10317f0c89a5 Initial commit korDen parents: diff changeset	85 }
10317f0c89a5 Initial commit korDen parents: diff changeset	86 //id = (Identifier *)idents.data[0];
10317f0c89a5 Initial commit korDen parents: diff changeset	87 //printf("TypeInstance::resolve(sc = %p, idents = '%s')\n", sc, id->toChars());
10317f0c89a5 Initial commit korDen parents: diff changeset	88 s = tempinst;
10317f0c89a5 Initial commit korDen parents: diff changeset	89 if (s)
10317f0c89a5 Initial commit korDen parents: diff changeset	90 s.semantic(sc);
10317f0c89a5 Initial commit korDen parents: diff changeset	91 resolveHelper(loc, sc, s, null, pe, pt, ps);
10317f0c89a5 Initial commit korDen parents: diff changeset	92 if (*pt)
10317f0c89a5 Initial commit korDen parents: diff changeset	93 pt = (pt).addMod(mod);
10317f0c89a5 Initial commit korDen parents: diff changeset	94 //printf("pt = '%s'\n", (*pt)->toChars());
10317f0c89a5 Initial commit korDen parents: diff changeset	95 }
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	96
72 2e2a5c3f943a reduced warnings by adding override to the methods Trass3r parents: 16 diff changeset	97 override Type semantic(Loc loc, Scope sc)
0 10317f0c89a5 Initial commit korDen parents: diff changeset	98 {
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	99 Type t;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	100 Expression e;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	101 Dsymbol s;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	102
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	103 //printf("TypeInstance::semantic(%s)\n", toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	104
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	105 if (sc.parameterSpecialization)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	106 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	107 uint errors = global.errors;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	108 global.gag++;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	109
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	110 resolve(loc, sc, &e, &t, &s);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	111
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	112 global.gag--;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	113 if (errors != global.errors)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	114 { if (global.gag == 0)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	115 global.errors = errors;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	116 return this;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	117 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	118 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	119 else
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	120 resolve(loc, sc, &e, &t, &s);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	121
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	122 if (!t)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	123 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	124 debug printf("2: ");
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	125 error(loc, "%s is used as a type", toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	126 t = tvoid;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	127 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	128 return t;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	129 }
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	130
72 2e2a5c3f943a reduced warnings by adding override to the methods Trass3r parents: 16 diff changeset	131 override Dsymbol toDsymbol(Scope sc)
0 10317f0c89a5 Initial commit korDen parents: diff changeset	132 {
10317f0c89a5 Initial commit korDen parents: diff changeset	133 Type t;
10317f0c89a5 Initial commit korDen parents: diff changeset	134 Expression e;
10317f0c89a5 Initial commit korDen parents: diff changeset	135 Dsymbol s;
10317f0c89a5 Initial commit korDen parents: diff changeset	136
10317f0c89a5 Initial commit korDen parents: diff changeset	137 //printf("TypeInstance::semantic(%s)\n", toChars());
10317f0c89a5 Initial commit korDen parents: diff changeset	138
10317f0c89a5 Initial commit korDen parents: diff changeset	139 if (sc.parameterSpecialization)
10317f0c89a5 Initial commit korDen parents: diff changeset	140 {
10317f0c89a5 Initial commit korDen parents: diff changeset	141 uint errors = global.errors;
10317f0c89a5 Initial commit korDen parents: diff changeset	142 global.gag++;
10317f0c89a5 Initial commit korDen parents: diff changeset	143
10317f0c89a5 Initial commit korDen parents: diff changeset	144 resolve(loc, sc, &e, &t, &s);
10317f0c89a5 Initial commit korDen parents: diff changeset	145
10317f0c89a5 Initial commit korDen parents: diff changeset	146 global.gag--;
10317f0c89a5 Initial commit korDen parents: diff changeset	147 if (errors != global.errors)
10317f0c89a5 Initial commit korDen parents: diff changeset	148 {
10317f0c89a5 Initial commit korDen parents: diff changeset	149 if (global.gag == 0)
10317f0c89a5 Initial commit korDen parents: diff changeset	150 global.errors = errors;
10317f0c89a5 Initial commit korDen parents: diff changeset	151
10317f0c89a5 Initial commit korDen parents: diff changeset	152 return null;
10317f0c89a5 Initial commit korDen parents: diff changeset	153 }
10317f0c89a5 Initial commit korDen parents: diff changeset	154 }
10317f0c89a5 Initial commit korDen parents: diff changeset	155 else
10317f0c89a5 Initial commit korDen parents: diff changeset	156 resolve(loc, sc, &e, &t, &s);
10317f0c89a5 Initial commit korDen parents: diff changeset	157
10317f0c89a5 Initial commit korDen parents: diff changeset	158 return s;
10317f0c89a5 Initial commit korDen parents: diff changeset	159 }
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	160
72 2e2a5c3f943a reduced warnings by adding override to the methods Trass3r parents: 16 diff changeset	161 override MATCH deduceType(Scope sc, Type tparam, TemplateParameters parameters, Objects dedtypes)
0 10317f0c89a5 Initial commit korDen parents: diff changeset	162 {
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	163 static if (0) {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	164 printf("TypeInstance::deduceType()\n");
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	165 printf("\tthis = %d, ", ty); print();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	166 printf("\ttparam = %d, ", tparam.ty); tparam.print();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	167 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	168
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	169 // Extra check
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	170 if (tparam && tparam.ty == Tinstance)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	171 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	172 TypeInstance tp = cast(TypeInstance)tparam;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	173
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	174 //printf("tempinst->tempdecl = %p\n", tempinst->tempdecl);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	175 //printf("tp->tempinst->tempdecl = %p\n", tp->tempinst->tempdecl);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	176 if (!tp.tempinst.tempdecl)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	177 { //printf("tp->tempinst->name = '%s'\n", tp->tempinst->name->toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	178 if (!tp.tempinst.name.equals(tempinst.name))
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	179 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	180 /* Handle case of:
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	181 * template Foo(T : sa!(T), alias sa)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	182 */
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	183 int i = templateIdentifierLookup(tp.tempinst.name, parameters);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	184 if (i == -1)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	185 { /* Didn't find it as a parameter identifier. Try looking
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	186 * it up and seeing if is an alias. See Bugzilla 1454
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	187 */
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	188 Dsymbol s = tempinst.tempdecl.scope_.search(Loc(0), tp.tempinst.name, null);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	189 if (s)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	190 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	191 s = s.toAlias();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	192 TemplateDeclaration td = s.isTemplateDeclaration();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	193 if (td && td == tempinst.tempdecl)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	194 goto L2;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	195 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	196 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	197 }
121 347de076ad34 TemplateParameters -> Vector Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 114 diff changeset	198 TemplateParameter tpx = parameters[i];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	199 // This logic duplicates tpx->matchArg()
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	200 TemplateAliasParameter ta = tpx.isTemplateAliasParameter();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	201 if (!ta)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	202 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	203 Object sa = tempinst.tempdecl;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	204 if (!sa)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	205 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	206 if (ta.specAlias && sa != ta.specAlias)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	207 goto Lnomatch;
113 3482c73a991b More cleanup for arrays Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 94 diff changeset	208 if (dedtypes[i])
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	209 { // Must match already deduced symbol
113 3482c73a991b More cleanup for arrays Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 94 diff changeset	210 Object s = dedtypes[i];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	211
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	212 if (s != sa)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	213 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	214 }
94 3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	215 dedtypes[i] = sa;
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	216 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	217 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	218 else if (tempinst.tempdecl != tp.tempinst.tempdecl)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	219 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	220
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	221 L2:
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	222
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	223 for (int i = 0; 1; i++)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	224 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	225 //printf("\ttest: tempinst->tiargs[%d]\n", i);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	226 Object o1;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	227 if (i < tempinst.tiargs.dim)
113 3482c73a991b More cleanup for arrays Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 94 diff changeset	228 o1 = tempinst.tiargs[i];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	229 else if (i < tempinst.tdtypes.dim && i < tp.tempinst.tiargs.dim)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	230 // Pick up default arg
113 3482c73a991b More cleanup for arrays Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 94 diff changeset	231 o1 = tempinst.tdtypes[i];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	232 else
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	233 break;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	234
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	235 if (i >= tp.tempinst.tiargs.dim)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	236 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	237
113 3482c73a991b More cleanup for arrays Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 94 diff changeset	238 Object o2 = tp.tempinst.tiargs[i];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	239
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	240 Type t1 = isType(o1);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	241 Type t2 = isType(o2);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	242
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	243 Expression e1 = isExpression(o1);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	244 Expression e2 = isExpression(o2);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	245
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	246 Dsymbol s1 = isDsymbol(o1);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	247 Dsymbol s2 = isDsymbol(o2);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	248
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	249 Tuple v1 = isTuple(o1);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	250 Tuple v2 = isTuple(o2);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	251 static if (0) {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	252 if (t1) printf("t1 = %s\n", t1.toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	253 if (t2) printf("t2 = %s\n", t2.toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	254 if (e1) printf("e1 = %s\n", e1.toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	255 if (e2) printf("e2 = %s\n", e2.toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	256 if (s1) printf("s1 = %s\n", s1.toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	257 if (s2) printf("s2 = %s\n", s2.toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	258 if (v1) printf("v1 = %s\n", v1.toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	259 if (v2) printf("v2 = %s\n", v2.toChars());
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	260 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	261
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	262 TemplateTupleParameter ttp;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	263 int j;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	264 if (t2 &&
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	265 t2.ty == Tident &&
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	266 i == tp.tempinst.tiargs.dim - 1 &&
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	267 i == tempinst.tempdecl.parameters.dim - 1 &&
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	268 (ttp = tempinst.tempdecl.isVariadic()) !is null)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	269 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	270 /* Given:
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	271 * struct A(B...) {}
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	272 * alias A!(int, float) X;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	273 * static if (!is(X Y == A!(Z), Z))
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	274 * deduce that Z is a tuple(int, float)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	275 */
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	276
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	277 j = templateParameterLookup(t2, parameters);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	278 if (j == -1)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	279 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	280
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	281 /* Create tuple from remaining args
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	282 */
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	283 Tuple vt = new Tuple();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	284 int vtdim = tempinst.tiargs.dim - i;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	285 vt.objects.setDim(vtdim);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	286 for (size_t k = 0; k < vtdim; k++)
94 3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	287 vt.objects[k] = tempinst.tiargs[i + k];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	288
94 3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	289 auto v = cast(Tuple)dedtypes[j];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	290 if (v)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	291 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	292 if (!match(v, vt, tempinst.tempdecl, sc))
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	293 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	294 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	295 else
94 3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	296 dedtypes[j] = vt;
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	297 break; //return MATCHexact;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	298 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	299
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	300 if (t1 && t2)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	301 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	302 if (!t1.deduceType(sc, t2, parameters, dedtypes))
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	303 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	304 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	305 else if (e1 && e2)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	306 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	307 if (!e1.equals(e2))
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	308 { if (e2.op == TOKvar)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	309 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	310 /*
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	311 * (T:Number!(e2), int e2)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	312 */
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	313 j = templateIdentifierLookup((cast(VarExp)e2).var.ident, parameters);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	314 goto L1;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	315 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	316 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	317 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	318 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	319 else if (e1 && t2 && t2.ty == Tident)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	320 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	321 j = templateParameterLookup(t2, parameters);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	322 L1:
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	323 if (j == -1)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	324 goto Lnomatch;
121 347de076ad34 TemplateParameters -> Vector Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 114 diff changeset	325 auto tp_ = parameters[j];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	326 // BUG: use tp->matchArg() instead of the following
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	327 TemplateValueParameter tv = tp_.isTemplateValueParameter();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	328 if (!tv)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	329 goto Lnomatch;
113 3482c73a991b More cleanup for arrays Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 94 diff changeset	330 Expression e = cast(Expression)dedtypes[j];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	331 if (e)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	332 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	333 if (!e1.equals(e))
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	334 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	335 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	336 else
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	337 { Type vt = tv.valType.semantic(Loc(0), sc);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	338 MATCH m = cast(MATCH)e1.implicitConvTo(vt);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	339 if (!m)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	340 goto Lnomatch;
94 3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	341 dedtypes[j] = e1;
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	342 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	343 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	344 else if (s1 && t2 && t2.ty == Tident)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	345 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	346 j = templateParameterLookup(t2, parameters);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	347 if (j == -1)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	348 goto Lnomatch;
121 347de076ad34 TemplateParameters -> Vector Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 114 diff changeset	349 auto tp_ = parameters[j];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	350 // BUG: use tp->matchArg() instead of the following
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	351 TemplateAliasParameter ta = tp_.isTemplateAliasParameter();
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	352 if (!ta)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	353 goto Lnomatch;
113 3482c73a991b More cleanup for arrays Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 94 diff changeset	354 auto s = cast(Dsymbol)dedtypes[j];
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	355 if (s)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	356 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	357 if (!s1.equals(s))
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	358 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	359 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	360 else
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	361 {
94 3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	362 dedtypes[j] = s1;
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	363 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	364 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	365 else if (s1 && s2)
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	366 {
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	367 if (!s1.equals(s2))
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	368 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	369 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	370 // BUG: Need to handle tuple parameters
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	371 else
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	372 goto Lnomatch;
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	373 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	374 }
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	375 return Type.deduceType(sc, tparam, parameters, dedtypes);
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	376
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	377 Lnomatch:
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	378 //printf("no match\n");
5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	379 return MATCHnomatch;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	380 }
16 5c9b78899f5d Implemented methods for Tuples, fixed some linking issues. Robert Clipsham <robert@octarineparrot.com> parents: 0 diff changeset	381 }

Mercurial > projects > ddmd

annotate dmd/TypeInstance.d @ 187:b0d41ff5e0df