Changeset 310

Timestamp:

12/24/09 23:45:11 (15 years ago)

Author:

walter

Message:

bugzilla 3645 manifest constant (enum) crashes dmd

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

@@ -211 +211 @@
-         */
-        assert(istate);
-        for (size_t i = 0; i < istate->vars.dim; i++)
-        {   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];
-            if (v == v2)
-            {   istate->vars.data[i] = NULL;
-            break;
-            }
-        }
-        }
-        else
-        {   // Value parameters and non-trivial references
-        v->value = earg;
-        }
-#if LOG
-        printf("interpreted arg[%d] = %s\n", i, earg->toChars());
-#endif
-    }
-    }
-    // Don't restore the value of 'this' upon function return
-
+
+
-    VarDeclaration *thisvar = ((VarExp *)(thisarg))->var->isVarDeclaration();
-        for (size_t i = 0; i < istate->vars.dim; i++)
-    {   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];
-        if (v == thisvar)
-        {   istate->vars.data[i] = NULL;
-        break;
-        }
-    }
-    }
-
-    /* Save the values of the local variables used
-     */
-    Expressions valueSaves;
-    if (istate && !isNested())
-    {
-    //printf("saving local variables...\n");
-    valueSaves.setDim(istate->vars.dim);
-    for (size_t i = 0; i < istate->vars.dim; i++)
-    {   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];
-        if (v)

trunk/src/interpret.c

@@ -230 +230 @@
-         */
-        assert(istate);
-        for (size_t i = 0; i < istate->vars.dim; i++)
-        {   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];
-            if (v == v2)
-            {   istate->vars.data[i] = NULL;
-            break;
-            }
-        }
-        }
-        else
-        {   // Value parameters and non-trivial references
-        v->value = earg;
-        }
-#if LOG
-        printf("interpreted arg[%d] = %s\n", i, earg->toChars());
-#endif
-    }
-    }
-    // Don't restore the value of 'this' upon function return
-
+
+
-    VarDeclaration *thisvar = ((VarExp *)(thisarg))->var->isVarDeclaration();
-        for (size_t i = 0; i < istate->vars.dim; i++)
-    {   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];
-        if (v == thisvar)
-        {   istate->vars.data[i] = NULL;
-        break;
-        }
-    }
-    }
-
-    /* Save the values of the local variables used
-     */
-    Expressions valueSaves;
-    if (istate && !isNested())
-    {
-    //printf("saving local variables...\n");
-    valueSaves.setDim(istate->vars.dim);
-    for (size_t i = 0; i < istate->vars.dim; i++)
-    {   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];
-        if (v)