projects/ddmd: dmd/TypeInstance.d annotate

annotate dmd/TypeInstance.d @ 178:e3afd1303184

Many small bugs fixed Made all classes derive from TObject to detect memory leaks (functionality is disabled for now) Began work on overriding backend memory allocations (to avoid memory leaks)

author	korDen
date	Sun, 17 Oct 2010 07:42:00 +0400
parents	347de076ad34
children	b0d41ff5e0df

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

Mercurial > projects > ddmd

annotate dmd/TypeInstance.d @ 178:e3afd1303184