Merge pull request #2705 from 9rnsr/fix11385

Issue 11385 - XXX is a nested function and cannot be accessed from XXX
dlang · Nov 8, 2013 · 7d308c5 · 7d308c5
2 parents d1cc3e7 + 42b6930
commit 7d308c5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/func.c b/src/func.c
@@ -2982,8 +2982,12 @@ int FuncDeclaration::getLevel(Loc loc, Scope *sc, FuncDeclaration *fd)
     return level;
 
 Lerr:
+    Dsymbol *p = toParent2();
+    while (p->toParent2()->isFuncDeclaration())
+        p = p->toParent2();
+
     // Don't give error if in template constraint
-    if (!((sc->flags & SCOPEstaticif) && parent->isTemplateDeclaration()))
+    if (!(sc->flags & SCOPEstaticif) && !p->parent->isTemplateDeclaration())
     {
         const char *xstatic = isStatic() ? "static " : "";
         // better diagnostics for static functions
@@ -3518,7 +3522,7 @@ void FuncDeclaration::checkNestedReference(Scope *sc, Loc loc)
         FuncDeclaration *fdthis = sc->parent->isFuncDeclaration();
 
         //printf("this = %s in [%s]\n", this->toChars(), this->loc.toChars());
-        //printf("fdv  = %s in [%s]\n", fdv->toChars(), fdv->loc.toChars());
+        //printf("fdv2 = %s in [%s]\n", fdv2->toChars(), fdv2->loc.toChars());
         //printf("fdthis = %s in [%s]\n", fdthis->toChars(), fdthis->loc.toChars());
 
         if (fdv2 && fdthis && fdv2 != fdthis)
@@ -3539,8 +3543,7 @@ void FuncDeclaration::checkNestedReference(Scope *sc, Loc loc)
             }
         }
 
-        FuncDeclaration *fdv = toParent()->isFuncDeclaration();
-        fdv = toParent()->isFuncDeclaration();
+        FuncDeclaration *fdv = toParent2()->isFuncDeclaration();
         if (fdv && fdthis && fdv != fdthis)
         {
             int lv = fdthis->getLevel(loc, sc, fdv);

diff --git a/test/runnable/nested.d b/test/runnable/nested.d
@@ -2465,6 +2465,27 @@ class C10495
     }
 }
 
+/*******************************************/
+// 11385
+
+auto map11385(alias fun, R)(R range)
+{
+    return MapResult11385!(fun, R)(range);
+}
+struct MapResult11385(alias fun, R)
+{
+    R range;
+    auto front() { return fun(range[0]); }
+}
+void test11385()
+{
+    //import std.algorithm;
+    static auto fun1(T)(T a) { return a * 2; }
+           auto fun2(T)(T a) { return a * 2; }
+    [1].map11385!(a=>fun1(a));   // OK
+    [1].map11385!(a=>fun2(a));   // NG:XXX is a nested function and cannot be accessed from XXX
+}
+
 /*******************************************/
 
 int main()
@@ -2550,6 +2571,7 @@ int main()
     test8832();
     test9315();
     test9244();
+    test11385();
 
     printf("Success\n");
     return 0;