Changeset 791

Timestamp:

12/07/10 23:19:16 (14 years ago)

Author:

walter

Message:

bugzilla 5238 PATCH: fix return of uninitialised var in interpret.c

Files:

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

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

@@ -1316 +1316 @@
-    return getVarExp(loc, istate, var);
-}
-
-Expression *DeclarationExp::interpret(InterState *istate)
-{
-#if LOG
-    printf("DeclarationExp::interpret() %s\n", toChars());
-#endif
-    Expression *e;
-    VarDeclaration *v = declaration->isVarDeclaration();
-    if (v)
-    {
-        Dsymbol *s = v->toAlias();
-        if (s == v && !v->isStatic() && v->init)
-        {
-            ExpInitializer *ie = v->init->isExpInitializer();
-            if (ie)
-                e = ie->exp->interpret(istate);
-            else if (v->init->isVoidInitializer())
-                e = NULL;
+            else
+            {
+                error("Declaration %s is not yet implemented in CTFE", toChars());
+                e = EXP_CANT_INTERPRET;
+            }
-        }
-#if DMDV2
-        else if (s == v && (v->isConst() || v->isImmutable()) && v->init)
-#else
-        else if (s == v && v->isConst() && v->init)
-#endif
-        {   e = v->init->toExpression();
-            if (!e)
-                e = EXP_CANT_INTERPRET;
-            else if (!e->type)
-                e->type = v->type;
-        }
-
+
+
-        else
-        {
-%s cannot be interpreted at compile time"
+Declaration %s is not yet implemented in CTFE", toChars()
-            e = EXP_CANT_INTERPRET;
-        }
-#endif
-    }
-    else if (declaration->isAttribDeclaration() ||
-             declaration->isTemplateMixin() ||
-             declaration->isTupleDeclaration())
-    {   // These can be made to work, too lazy now
-
-
+
-        e = EXP_CANT_INTERPRET;
-    }
-    else
-    {   // Others should not contain executable code, so are trivial to evaluate
-        e = NULL;
-    }
-#if LOG
-    printf("-DeclarationExp::interpret(%s): %p\n", toChars(), e);
-#endif
-    return e;
-}
-
-Expression *TupleExp::interpret(InterState *istate)
-{
-#if LOG
-    printf("TupleExp::interpret() %s\n", toChars());
-#endif
-    Expressions *expsx = NULL;
-
-    for (size_t i = 0; i < exps->dim; i++)

trunk/src/interpret.c

@@ -1316 +1316 @@
-    return getVarExp(loc, istate, var);
-}
-
-Expression *DeclarationExp::interpret(InterState *istate)
-{
-#if LOG
-    printf("DeclarationExp::interpret() %s\n", toChars());
-#endif
-    Expression *e;
-    VarDeclaration *v = declaration->isVarDeclaration();
-    if (v)
-    {
-        Dsymbol *s = v->toAlias();
-        if (s == v && !v->isStatic() && v->init)
-        {
-            ExpInitializer *ie = v->init->isExpInitializer();
-            if (ie)
-                e = ie->exp->interpret(istate);
-            else if (v->init->isVoidInitializer())
-                e = NULL;
+            else
+            {
+                error("Declaration %s is not yet implemented in CTFE", toChars());
+                e = EXP_CANT_INTERPRET;
+            }
-        }
-#if DMDV2
-        else if (s == v && (v->isConst() || v->isImmutable()) && v->init)
-#else
-        else if (s == v && v->isConst() && v->init)
-#endif
-        {   e = v->init->toExpression();
-            if (!e)
-                e = EXP_CANT_INTERPRET;
-            else if (!e->type)
-                e->type = v->type;
-        }
-
+
+
-        else
-        {
-%s cannot be interpreted at compile time"
+Declaration %s is not yet implemented in CTFE", toChars()
-            e = EXP_CANT_INTERPRET;
-        }
-#endif
-    }
-    else if (declaration->isAttribDeclaration() ||
-             declaration->isTemplateMixin() ||
-             declaration->isTupleDeclaration())
-    {   // These can be made to work, too lazy now
-
-
+
-        e = EXP_CANT_INTERPRET;
-    }
-    else
-    {   // Others should not contain executable code, so are trivial to evaluate
-        e = NULL;
-    }
-#if LOG
-    printf("-DeclarationExp::interpret(%s): %p\n", toChars(), e);
-#endif
-    return e;
-}
-
-Expression *TupleExp::interpret(InterState *istate)
-{
-#if LOG
-    printf("TupleExp::interpret() %s\n", toChars());
-#endif
-    Expressions *expsx = NULL;
-
-    for (size_t i = 0; i < exps->dim; i++)