Replace AliasDeclaration::inSemantic with Declaration::inuse

I noticed that it was completely redundant. We can reduce memory size a little.
dlang · Jun 10, 2015 · 525dcb6 · 525dcb6
1 parent 4e5a31e
commit 525dcb6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/declaration.c b/src/declaration.c
@@ -280,7 +280,6 @@ bool TupleDeclaration::needThis()
     return false;
 }
 
-
 /********************************* AliasDeclaration ****************************/
 
 AliasDeclaration::AliasDeclaration(Loc loc, Identifier *id, Type *type)
@@ -293,7 +292,6 @@ AliasDeclaration::AliasDeclaration(Loc loc, Identifier *id, Type *type)
     this->aliassym = NULL;
     this->import = NULL;
     this->overnext = NULL;
-    this->inSemantic = 0;
     assert(type);
 }
 
@@ -307,7 +305,6 @@ AliasDeclaration::AliasDeclaration(Loc loc, Identifier *id, Dsymbol *s)
     this->aliassym = s;
     this->import = NULL;
     this->overnext = NULL;
-    this->inSemantic = 0;
     assert(s);
 }
 
@@ -331,7 +328,7 @@ void AliasDeclaration::semantic(Scope *sc)
             aliassym->semantic(sc);
         return;
     }
-    this->inSemantic = 1;
+    inuse = 1;
 
     storage_class |= sc->stc & STCdeprecated;
     protection = sc->protection;
@@ -411,7 +408,7 @@ void AliasDeclaration::semantic(Scope *sc)
     }
     if (overnext)
         ScopeDsymbol::multiplyDefined(Loc(), overnext, this);
-    this->inSemantic = 0;
+    inuse = 0;
 
     if (global.gag && errors != global.errors)
         type = savedtype;
@@ -492,7 +489,7 @@ void AliasDeclaration::semantic(Scope *sc)
     }
     //printf("setting aliassym %s to %s %s\n", toChars(), s->kind(), s->toChars());
     aliassym = s;
-    this->inSemantic = 0;
+    inuse = 0;
 }
 
 bool AliasDeclaration::overloadInsert(Dsymbol *s)
@@ -548,13 +545,13 @@ Type *AliasDeclaration::getType()
 
 Dsymbol *AliasDeclaration::toAlias()
 {
-    //printf("[%s] AliasDeclaration::toAlias('%s', this = %p, aliassym = %p, kind = '%s', inSemantic = %d)\n",
-    //    loc.toChars(), toChars(), this, aliassym, aliassym ? aliassym->kind() : "", inSemantic);
+    //printf("[%s] AliasDeclaration::toAlias('%s', this = %p, aliassym = %p, kind = '%s', inuse = %d)\n",
+    //    loc.toChars(), toChars(), this, aliassym, aliassym ? aliassym->kind() : "", inuse);
     assert(this != aliassym);
     //static int count; if (++count == 10) *(char*)0=0;
-    if (inSemantic == 1 && type && scope)
+    if (inuse == 1 && type && scope)
     {
-        inSemantic = 2;
+        inuse = 2;
         unsigned olderrors = global.errors;
         Dsymbol *s = type->toDsymbol(scope);
         //printf("[%s] type = %s, s = %p, this = %p\n", loc.toChars(), type->toChars(), s, this);
@@ -566,7 +563,7 @@ Dsymbol *AliasDeclaration::toAlias()
             if (global.errors != olderrors)
                 goto Lerr;
             aliassym = s;
-            inSemantic = 0;
+            inuse = 0;
         }
         else
         {
@@ -576,10 +573,10 @@ Dsymbol *AliasDeclaration::toAlias()
             if (global.errors != olderrors)
                 goto Lerr;
             //printf("t = %s\n", t->toChars());
-            inSemantic = 0;
+            inuse = 0;
         }
     }
-    if (inSemantic)
+    if (inuse)
     {
         error("recursive alias declaration");
 
@@ -604,9 +601,9 @@ Dsymbol *AliasDeclaration::toAlias()
     }
     else if (scope)
         semantic(scope);
-    inSemantic = 1;
+    inuse = 1;
     Dsymbol *s = aliassym ? aliassym->toAlias() : this;
-    inSemantic = 0;
+    inuse = 0;
     return s;
 }
 

diff --git a/src/declaration.h b/src/declaration.h
@@ -195,7 +195,6 @@ class AliasDeclaration : public 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);
     AliasDeclaration(Loc loc, Identifier *ident, Dsymbol *s);