Merge pull request #1665 from 9rnsr/fix9514

Issue 9514 - "template instance … is not an alias"
dlang · Feb 16, 2013 · 0efbffd · 0efbffd
1 parent df3d214
commit 0efbffd
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 3 deletions.
diff --git a/src/declaration.c b/src/declaration.c
@@ -19,6 +19,7 @@
 #include "scope.h"
 #include "aggregate.h"
 #include "module.h"
+#include "import.h"
 #include "id.h"
 #include "expression.h"
 #include "statement.h"
@@ -414,6 +415,7 @@ AliasDeclaration::AliasDeclaration(Loc loc, Identifier *id, Type *type)
     this->loc = loc;
     this->type = type;
     this->aliassym = NULL;
+    this->import = NULL;
     this->htype = NULL;
     this->haliassym = NULL;
     this->overnext = NULL;
@@ -429,6 +431,7 @@ AliasDeclaration::AliasDeclaration(Loc loc, Identifier *id, Dsymbol *s)
     this->loc = loc;
     this->type = NULL;
     this->aliassym = s;
+    this->import = NULL;
     this->htype = NULL;
     this->haliassym = NULL;
     this->overnext = NULL;
@@ -673,6 +676,13 @@ Dsymbol *AliasDeclaration::toAlias()
     }
     else if (aliassym || type->deco)
         ;   // semantic is already done.
+    else if (import)
+    {
+        /* If this is an internal alias for selective import,
+         * resolve it under the correct scope.
+         */
+        import->semantic(NULL);
+    }
     else if (scope)
         semantic(scope);
     Dsymbol *s = aliassym ? aliassym->toAlias() : this;

diff --git a/src/declaration.h b/src/declaration.h
@@ -234,6 +234,7 @@ struct AliasDeclaration : Declaration
 {
     Dsymbol *aliassym;
     Dsymbol *overnext;          // next in overload list
+    Dsymbol *import;            // !=NULL if unresolved internal alias for selective import
     int inSemantic;
 
     AliasDeclaration(Loc loc, Identifier *ident, Type *type);

diff --git a/src/import.c b/src/import.c
@@ -180,6 +180,11 @@ void Import::semantic(Scope *sc)
 {
     //printf("Import::semantic('%s')\n", toChars());
 
+    if (scope)
+    {   sc = scope;
+        scope = NULL;
+    }
+
     // Load if not already done so
     if (!mod)
     {   load(sc);
@@ -234,14 +239,17 @@ void Import::semantic(Scope *sc)
         sc->protection = PROTpublic;
 #endif
         for (size_t i = 0; i < aliasdecls.dim; i++)
-        {   Dsymbol *s = aliasdecls[i];
+        {   AliasDeclaration *ad = aliasdecls[i];
 
             //printf("\tImport alias semantic('%s')\n", s->toChars());
             if (mod->search(loc, names[i], 0))
-                s->semantic(sc);
+            {
+                ad->semantic(sc);
+                ad->import = NULL;  // forward reference resolved
+            }
             else
             {
-                s = mod->search_correct(names[i]);
+                Dsymbol *s = mod->search_correct(names[i]);
                 if (s)
                     mod->error(loc, "import '%s' not found, did you mean '%s %s'?", names[i]->toChars(), s->kind(), s->toChars());
                 else
@@ -374,6 +382,7 @@ int Import::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
 
         TypeIdentifier *tname = new TypeIdentifier(loc, name);
         AliasDeclaration *ad = new AliasDeclaration(loc, alias, tname);
+        ad->import = this;
         result |= ad->addMember(sc, sd, memnum);
 
         aliasdecls.push(ad);

diff --git a/test/compilable/fwdref9514a.d b/test/compilable/fwdref9514a.d
@@ -0,0 +1,22 @@
+// PERMUTE_ARGS:
+// REQUIRED_ARGS: -o-
+
+template TStructHelpers()
+{
+    void opEquals(Foo)
+    {
+        auto n = FieldNames!();
+    }
+}
+
+struct Foo
+{
+    mixin TStructHelpers!();
+}
+
+import imports.fwdref9514 : find;  // selective import without aliasing
+
+template FieldNames()
+{
+    static if (find!`true`([1])) enum int FieldNames = 1;
+}
diff --git a/test/compilable/fwdref9514b.d b/test/compilable/fwdref9514b.d
@@ -0,0 +1,22 @@
+// PERMUTE_ARGS:
+// REQUIRED_ARGS: -o-
+
+template TStructHelpers()
+{
+    void opEquals(Foo)
+    {
+        auto n = FieldNames!();
+    }
+}
+
+struct Foo
+{
+    mixin TStructHelpers!();
+}
+
+import imports.fwdref9514 : foo = find;  // selective import with aliasing
+
+template FieldNames()
+{
+    static if (foo!`true`([1])) enum int FieldNames = 1;
+}
diff --git a/test/compilable/imports/fwdref9514.d b/test/compilable/imports/fwdref9514.d
@@ -0,0 +1,4 @@
+bool find(alias pred, R)(R range)
+{
+    return true;
+}