projects/ldc: dmd/template.c comparison

comparison dmd/template.c @ 1367:8026319762be

Merged DMD 1.045 !!!

author	Tomas Lindquist Olsen <tomas.l.olsen gmail com>
date	Sat, 16 May 2009 22:21:31 +0200
parents	e961851fb8be
children	4dca8ed9d8b7

comparison

equal deleted inserted replaced

-:81121ac19f61
+:8026319762be
 	if (nfparams > 0 && nfargs >= nfparams - 1)
 	{
 	    /* See if 'A' of the template parameter matches 'A'
 	     * of the type of the last function parameter.
 	     */
-	    Argument *fparam = (Argument *)tp->parameters->data[nfparams - 1];
+	    Argument *fparam = Argument::getNth(tp->parameters, nfparams - 1);
 	    if (fparam->type->ty != Tident)
 		goto L1;
 	    TypeIdentifier *tid = (TypeIdentifier *)fparam->type;
 	    if (tid->idents.dim)
 		goto L1;
 this->loc = loc;
 this->name = ident;
 this->tiargs = NULL;
 this->tempdecl = NULL;
 this->inst = NULL;
+this->tinst = NULL;
 this->argsym = NULL;
 this->aliasdecl = NULL;
 this->semanticdone = 0;
 this->semantictiargsdone = 0;
 this->withsym = NULL;
 this->errors = 0;
 #if IN_LLVM
 // LDC
 this->emittedInModule = NULL;
-this->tinst = NULL;
 this->tmodule = NULL;
 #endif
 }
 /*****************
 this->loc = loc;
 this->name = td->ident;
 this->tiargs = tiargs;
 this->tempdecl = td;
 this->inst = NULL;
+this->tinst = NULL;
 this->argsym = NULL;
 this->aliasdecl = NULL;
 this->semanticdone = 0;
 this->semantictiargsdone = 1;
 this->withsym = NULL;
 #if LOG
 	printf("-TemplateInstance::semantic('%s', this=%p) already run\n", inst->toChars(), inst);
 #endif
 	return;
 }
+// get the enclosing template instance from the scope tinst
+tinst = sc->tinst;
 if (semanticdone != 0)
 {
 	error(loc, "recursive template expansion");
 //	inst = this;
 #if WINDOWS_SEH
 __try
 {
 #endif
+static int nest;
+//printf("%d\n", nest);
+if (++nest > 500)
+{
+	global.gag = 0;			// ensure error message gets printed
+	error("recursive expansion");
+	fatal();
+}
 for (int i = 0; i < members->dim; i++)
 {
 	Dsymbol *s = (Dsymbol *)members->data[i];
 	//printf("\t[%d] semantic on '%s' %p kind %s in '%s'\n", i, s->toChars(), s, s->kind(), this->toChars());
 	//printf("test: isnested = %d, sc2->parent = %s\n", isnested, sc2->parent->toChars());
 	//printf("test3: isnested = %d, s->parent = %s\n", isnested, s->parent->toChars());
 	s->semantic(sc2);
 	//printf("test4: isnested = %d, s->parent = %s\n", isnested, s->parent->toChars());
 	sc2->module->runDeferredSemantic();
 }
+--nest;
 #if WINDOWS_SEH
 }
 __except (__ehfilter(GetExceptionInformation()))
 {
 global.gag = 0;			// ensure error message gets printed
 // Give additional context info if error occurred during instantiation
 if (global.errors != errorsave)
 {
 	error("error instantiating");
-	if(tinst)
+	if (tinst && !global.gag)
-	    tinst->printInstantiationTrace();
+	{   tinst->printInstantiationTrace();
+	    fatal();
+	}
 	errors = 1;
 	if (global.gag)
 	    tempdecl->instances.remove(tempdecl_instance_idx);
 }
 	else if (sa)
 	{
 	  Lsa:
 	    buf.writeByte('S');
 	    Declaration *d = sa->isDeclaration();
-	    if (d && !d->type->deco)
+	    if (d && (!d->type || !d->type->deco))
 		error("forward reference of %s", d->toChars());
 	    else
 	    {
 		char *p = sa->mangle();
 		buf.printf("%zu%s", strlen(p), p);
 }
 }
 #if IN_DMD
+void TemplateInstance::printInstantiationTrace()
+{
+if (global.gag)
+	return;
+}
 void TemplateInstance::toObjFile(int multiobj)
 {
 #if LOG
 printf("TemplateInstance::toObjFile('%s', this = %p)\n", toChars(), this);
 #endif
 toCBuffer(&buf, &hgs);
 s = buf.toChars();
 buf.data = NULL;
 return s;
 }
+#if IN_LLVM
 void TemplateInstance::printInstantiationTrace()
 {
 if(global.gag)
 	return;
 	{}
 	for(; i < n_instantiations; ++i, cur = cur->tinst)
 	    fprintf(stdmsg,"    instantiatied in %s: %s\n", cur->loc.toChars(), cur->toChars());
 }
 }
+#endif
 /* ======================== TemplateMixin ================================ */
 TemplateMixin::TemplateMixin(Loc loc, Identifier *ident, Type *tqual,
 	Array *idents, Objects *tiargs)
 printf("\tdo semantic() on template instance members '%s'\n", toChars());
 #endif
 Scope *sc2;
 sc2 = scope->push(this);
 sc2->offset = sc->offset;
+static int nest;
+//printf("%d\n", nest);
+if (++nest > 500)
+{
+	global.gag = 0;			// ensure error message gets printed
+	error("recursive expansion");
+	fatal();
+}
 for (int i = 0; i < members->dim; i++)
 {
 	Dsymbol *s = (Dsymbol *)members->data[i];
 	s->semantic(sc2);
 }
+nest--;
 sc->offset = sc2->offset;
 /* The problem is when to parse the initializer for a variable.
 * Perhaps VarDeclaration::semantic() should do it like it does
 * for initializers inside a function.

Mercurial > projects > ldc

comparison dmd/template.c @ 1367:8026319762be