Changeset 608

Timestamp:

08/09/10 05:30:23 (14 years ago)

Author:

walter

Message:

bugzilla 3326 $ in delegate literal causes Access Violation

Files:

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

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

@@ -1304 +1304 @@
- * rather than the current one.
- */
-
-void VarDeclaration::checkNestedReference(Scope *sc, Loc loc)
-{
-    //printf("VarDeclaration::checkNestedReference() %s\n", toChars());
-    if (parent && !isDataseg() && parent != sc->parent)
-    {
-        // The function that this variable is in
-        FuncDeclaration *fdv = toParent()->isFuncDeclaration();
-        // The current function
-        FuncDeclaration *fdthis = sc->parent->isFuncDeclaration();
-
-        if (fdv && fdthis)
-        {
-            if (loc.filename)
-                fdthis->getLevel(loc, fdv);
-            nestedref = 1;
-            fdv->nestedFrameRef = 1;
-            //printf("var %s in function %s is nested ref\n", toChars(), fdv->toChars());
+            // __dollar creates problems because it isn't a real variable Bugzilla 3326
+            if (ident == Id::dollar)
+                ::error(loc, "cannnot use $ inside a function literal");
-        }
-    }
-}
-
-/*******************************
- * Does symbol go into data segment?
- * Includes extern variables.
- */
-
-int VarDeclaration::isDataseg()
-{
-#if 0
-    printf("VarDeclaration::isDataseg(%p, '%s')\n", this, toChars());
-    printf("%llx, %p, %p\n", storage_class & (STCstatic | STCconst), parent->isModule(), parent->isTemplateInstance());
-    printf("parent = '%s'\n", parent->toChars());
-#endif
-    Dsymbol *parent = this->toParent();
-    if (!parent && !(storage_class & (STCstatic | STCconst)))
-    {   error("forward referenced");
-        type = Type::terror;

trunk/src/declaration.c

@@ -1426 +1426 @@
-            for (int i = 0; i < nestedrefs.dim; i++)
-            {   FuncDeclaration *f = (FuncDeclaration *)nestedrefs.data[i];
-                if (f == fdthis)
-                    goto L1;
-            }
-            nestedrefs.push(fdthis);
-          L1: ;
-
-
-            for (int i = 0; i < fdv->closureVars.dim; i++)
-            {   Dsymbol *s = (Dsymbol *)fdv->closureVars.data[i];
-                if (s == this)
-                    goto L2;
-            }
-
-            fdv->closureVars.push(this);
-          L2: ;
-
-            //printf("fdthis is %s\n", fdthis->toChars());
-            //printf("var %s in function %s is nested ref\n", toChars(), fdv->toChars());
+            // __dollar creates problems because it isn't a real variable Bugzilla 3326
+            if (ident == Id::dollar)
+                ::error(loc, "cannnot use $ inside a function literal");
-        }
-    }
-}
-
-/****************************
- * Get ExpInitializer for a variable, if there is one.
- */
-
-ExpInitializer *VarDeclaration::getExpInitializer()
-{
-    ExpInitializer *ei;
-
-    if (init)
-        ei = init->isExpInitializer();
-    else
-    {
-        Expression *e = type->defaultInit(loc);
-        if (e)
-            ei = new ExpInitializer(loc, e);
-        else