Changeset 404

Timestamp:

03/02/10 20:38:55 (15 years ago)

Author:

walter

Message:

bugzilla 3803 compiler segfaults

Files:

• branches/dmd-1.x/src/expression.c (modified) (1 diff)
• trunk/src/expression.c (modified) (1 diff)

branches/dmd-1.x/src/expression.c

@@ -5915 +5915 @@
-
-Expression *DotTemplateInstanceExp::semantic(Scope *sc)
-{
-#if 1
-#if LOGSEMANTIC
-    printf("DotTemplateInstanceExp::semantic('%s')\n", toChars());
-#endif
-    Expression *eleft;
-    Expression *e = new DotIdExp(loc, e1, ti->name);
-L1:
-    e = e->semantic(sc);
-    if (e->op == TOKdottd)
-    {
-    if (global.errors)
-        return new ErrorExp();  // TemplateInstance::semantic() will fail anyway
-    DotTemplateExp *dte = (DotTemplateExp *)e;
-    TemplateDeclaration *td = dte->td;
-    eleft = dte->e1;
-    ti->tempdecl = td;
-    ti->semantic(sc);
+    if (!ti->inst)          // if template failed to expand
+        return new ErrorExp();
-    Dsymbol *s = ti->inst->toAlias();
-    Declaration *v = s->isDeclaration();
-    if (v)
-    {   e = new DotVarExp(loc, eleft, v);
-        e = e->semantic(sc);
-        return e;
-    }
-    e = new ScopeExp(loc, ti);
-    e = new DotExp(loc, eleft, e);
-    e = e->semantic(sc);
-    return e;
-    }
-    else if (e->op == TOKimport)
-    {   ScopeExp *se = (ScopeExp *)e;
-    TemplateDeclaration *td = se->sds->isTemplateDeclaration();
-    if (!td)
-    {   error("%s is not a template", e->toChars());
-        return new ErrorExp();
-    }
-    ti->tempdecl = td;

trunk/src/expression.c

@@ -6271 +6271 @@
-}
-
-Expression *DotTemplateInstanceExp::semantic(Scope *sc)
-{
-#if LOGSEMANTIC
-    printf("DotTemplateInstanceExp::semantic('%s')\n", toChars());
-#endif
-    Expression *eleft;
-    Expression *e = new DotIdExp(loc, e1, ti->name);
-L1:
-    e = e->semantic(sc);
-    if (e->op == TOKdottd)
-    {
-    if (global.errors)
-        return new ErrorExp();  // TemplateInstance::semantic() will fail anyway
-    DotTemplateExp *dte = (DotTemplateExp *)e;
-    TemplateDeclaration *td = dte->td;
-    eleft = dte->e1;
-    ti->tempdecl = td;
-    ti->semantic(sc);
+    if (!ti->inst)          // if template failed to expand
+        return new ErrorExp();
-    Dsymbol *s = ti->inst->toAlias();
-    Declaration *v = s->isDeclaration();
-    if (v)
-    {   e = new DotVarExp(loc, eleft, v);
-        e = e->semantic(sc);
-        return e;
-    }
-    e = new ScopeExp(loc, ti);
-    e = new DotExp(loc, eleft, e);
-    e = e->semantic(sc);
-    return e;
-    }
-    else if (e->op == TOKimport)
-    {   ScopeExp *se = (ScopeExp *)e;
-    TemplateDeclaration *td = se->sds->isTemplateDeclaration();
-    if (!td)
-    {   error("%s is not a template", e->toChars());
-        return new ErrorExp();
-    }
-    ti->tempdecl = td;