partial integration of pull 190

dlang · Dec 31, 2011 · 05a314a · 05a314a
1 parent 9a66fc1
commit 05a314a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/dsymbol.c b/src/dsymbol.c
@@ -759,7 +759,7 @@ Dsymbol *ScopeDsymbol::search(Loc loc, Identifier *ident, int flags)
     {
         // Look in imported modules
         for (size_t i = 0; i < imports->dim; i++)
-        {   ScopeDsymbol *ss = (*imports)[i];
+        {   Dsymbol *ss = (*imports)[i];
             Dsymbol *s2;
 
             // If private import, don't search it
@@ -798,7 +798,7 @@ Dsymbol *ScopeDsymbol::search(Loc loc, Identifier *ident, int flags)
                          )
                        )
                     {
-                        ss->multiplyDefined(loc, s, s2);
+                        ScopeDsymbol::multiplyDefined(loc, s, s2);
                         break;
                     }
                 }
@@ -807,26 +807,27 @@ Dsymbol *ScopeDsymbol::search(Loc loc, Identifier *ident, int flags)
         if (s)
         {
             Declaration *d = s->isDeclaration();
-            if (d && d->protection == PROTprivate && !d->parent->isTemplateMixin())
+            if (d && d->protection == PROTprivate &&
+                !d->parent->isTemplateMixin())
                 error(loc, "%s is private", d->toPrettyChars());
         }
     }
     return s;
 }
 
-void ScopeDsymbol::importScope(ScopeDsymbol *s, enum PROT protection)
+void ScopeDsymbol::importScope(Dsymbol *s, enum PROT protection)
 {
     //printf("%s->ScopeDsymbol::importScope(%s, %d)\n", toChars(), s->toChars(), protection);
 
     // No circular or redundant import's
     if (s != this)
     {
         if (!imports)
-            imports = new ScopeDsymbols();
+            imports = new Dsymbols();
         else
         {
             for (size_t i = 0; i < imports->dim; i++)
-            {   ScopeDsymbol *ss = (*imports)[i];
+            {   Dsymbol *ss = (*imports)[i];
                 if (ss == s)                    // if already imported
                 {
                     if (protection > prots[i])

diff --git a/src/dsymbol.h b/src/dsymbol.h
@@ -248,14 +248,14 @@ struct ScopeDsymbol : Dsymbol
     Dsymbols *members;          // all Dsymbol's in this scope
     DsymbolTable *symtab;       // members[] sorted into table
 
-    ScopeDsymbols *imports;     // imported ScopeDsymbol's
+    Dsymbols *imports;          // imported Dsymbol's
     unsigned char *prots;       // array of PROT, one for each import
 
     ScopeDsymbol();
     ScopeDsymbol(Identifier *id);
     Dsymbol *syntaxCopy(Dsymbol *s);
     Dsymbol *search(Loc loc, Identifier *ident, int flags);
-    void importScope(ScopeDsymbol *s, enum PROT protection);
+    void importScope(Dsymbol *s, enum PROT protection);
     int isforwardRef();
     void defineRef(Dsymbol *s);
     static void multiplyDefined(Loc loc, Dsymbol *s1, Dsymbol *s2);