Changeset 639:8aebdf56c455

Timestamp:

10/02/08 17:12:19 (2 months ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Move check for access of context for nested class from backend into frontend.

Files:

• dmd/declaration.h (modified) (1 diff)
• dmd/expression.c (modified) (2 diffs)
• gen/classes.cpp (modified) (1 diff)
• gen/llvmhelpers.cpp (modified) (1 diff)

dmd/declaration.h

@@ -637 +637 @@
-
-    // llvmdc stuff
+
+    // vars declared in this function that nested funcs reference
+    // is this is not empty, nestedFrameRef is set and these VarDecls
+    // probably have nestedref set too, see VarDeclaration::checkNestedReference
-    std::set<VarDeclaration*> nestedVars;
+
-    std::string intrinsicName;
-

dmd/expression.c

@@ -3371 +3371 @@
-        Dsymbol *s = cd->toParent2();
-        ClassDeclaration *cdn = s->isClassDeclaration();
+        FuncDeclaration *fdn = s->isFuncDeclaration();
-
-        //printf("cd isNested, cdn = %s\n", cdn ? cdn->toChars() : "null");
@@ -3422 +3423 @@
-        else if (thisexp)
-        error("e.new is only for allocating nested classes");
+        else if (fdn)
+        {
+        // make sure the parent context fdn of cd is reachable from sc
+        for (Dsymbol *sp = sc->parent; 1; sp = sp->parent)
+        {
+            if (fdn == sp)
+            break;
+            FuncDeclaration *fsp = sp ? sp->isFuncDeclaration() : NULL;
+            if (!sp || (fsp && fsp->isStatic()))
+            {
+            error("outer function context of %s is needed to 'new' nested class %s", fdn->toPrettyChars(), cd->toPrettyChars());
+            break;
+            }
+        }
+        
+        }
-    }
-    else if (thisexp)

gen/classes.cpp

@@ -843 +843 @@
-        LOG_SCOPE;
-
-        if (gIR->func()->decl->isStatic())
-        {
-            newexp->error("function %s is static and cannot access nested class %s", gIR->func()->decl->toPrettyChars(), tc->sym->toPrettyChars());
-            fatal();
-        }
-
-        // get context
-        LLValue* nest = DtoNestedContext(loc, tc->sym);

gen/llvmhelpers.cpp

@@ -391 +391 @@
-
-    IrFunction* irfunc = gIR->func();
-
+
+
+
-    if (irfunc->nestedVar)
-        return irfunc->nestedVar;
+    // otherwise, it may have gotten a context from the caller
-    else if (irfunc->nestArg)
-        return irfunc->nestArg;
+    // or just have a this argument
-    else if (irfunc->thisArg)
-    {