[Refactoring] Variable interpretation from its initializer

Reuse VarDeclaration::getConstInitializer.
dlang · May 9, 2013 · 04dd7b7 · 04dd7b7
1 parent 75d3660
commit 04dd7b7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 57 deletions.
diff --git a/src/declaration.c b/src/declaration.c
@@ -2041,21 +2041,20 @@ ExpInitializer *VarDeclaration::getExpInitializer()
  * Otherwise, return NULL.
  */
 
-Expression *VarDeclaration::getConstInitializer()
+Expression *VarDeclaration::getConstInitializer(bool needFullType)
 {
-    if ((isConst() || isImmutable() || storage_class & STCmanifest) &&
-        storage_class & STCinit)
+    assert(type && init);
+
+    if (scope)
     {
-        ExpInitializer *ei = getExpInitializer();
-        if (ei)
-            return ei->exp;
-        else if (init)
-        {
-            return init->toExpression();
-        }
+        inuse++;
+        init->semantic(scope, type, INITinterpret);
+        scope = NULL;
+        inuse--;
     }
+    Expression *e = init->toExpression(needFullType ? type : NULL);
 
-    return NULL;
+    return e;
 }
 
 /*************************************

diff --git a/src/declaration.h b/src/declaration.h
@@ -309,7 +309,7 @@ struct VarDeclaration : Declaration
 #endif
     Expression *callScopeDtor(Scope *sc);
     ExpInitializer *getExpInitializer();
-    Expression *getConstInitializer();
+    Expression *getConstInitializer(bool needFullType = true);
     void checkCtorConstInit();
     void checkNestedReference(Scope *sc, Loc loc);
     Dsymbol *toAlias();

diff --git a/src/expression.c b/src/expression.c
@@ -4381,19 +4381,11 @@ Expression *StructLiteralExp::semantic(Scope *sc)
         else
         {
             if (v->init)
-            {   if (v->init->isVoidInitializer())
+            {
+                if (v->init->isVoidInitializer())
                     e = NULL;
                 else
-                {
-                    if (v->scope)
-                    {
-                        v->inuse++;
-                        v->init->semantic(v->scope, v->type, INITinterpret);
-                        v->scope = NULL;
-                        v->inuse--;
-                    }
-                    e = v->init->toExpression(/*vd->type*/);
-                }
+                    e = v->getConstInitializer(false);
             }
             else if (v->type->needsNested() && ctorinit)
                 e = v->type->defaultInit(loc);

diff --git a/src/mtype.c b/src/mtype.c
@@ -8027,18 +8027,11 @@ Expression *TypeStruct::defaultInitLiteral(Loc loc)
         if (vd->offset < offset)
             e = NULL;
         else if (vd->init)
-        {   if (vd->init->isVoidInitializer())
+        {
+            if (vd->init->isVoidInitializer())
                 e = NULL;
             else
-            {
-                if (vd->scope)
-                {
-                    vd->inuse++;
-                    vd->init->semantic(vd->scope, vd->type, INITinterpret);
-                    vd->inuse--;
-                }
-                e = vd->init->toExpression(/*vd->type*/);
-            }
+                e = vd->getConstInitializer(false);
         }
         else
             e = vd->type->defaultInitLiteral(loc);

diff --git a/src/optimize.c b/src/optimize.c
@@ -68,14 +68,7 @@ Expression *expandVar(int result, VarDeclaration *v)
                         v->error("recursive initialization of constant");
                     goto L1;
                 }
-                if (v->scope)
-                {
-                    v->inuse++;
-                    v->init->semantic(v->scope, v->type, INITinterpret);
-                    v->scope = NULL;
-                    v->inuse--;
-                }
-                Expression *ei = v->init->toExpression(v->type);
+                Expression *ei = v->getConstInitializer();
                 if (!ei)
                 {   if (v->storage_class & STCmanifest)
                         v->error("enum cannot be initialized with %s", v->init->toChars());

diff --git a/src/template.c b/src/template.c
@@ -182,14 +182,7 @@ Expression *getValue(Expression *e)
         VarDeclaration *v = ((VarExp *)e)->var->isVarDeclaration();
         if (v && v->storage_class & STCmanifest)
         {
-            if (v->scope)
-            {
-                v->inuse++;
-                v->init->semantic(v->scope, v->type, INITinterpret);
-                v->scope = NULL;
-                v->inuse--;
-            }
-            e = v->init->toExpression(v->type);
+            e = v->getConstInitializer();
         }
     }
     return e;
@@ -202,14 +195,7 @@ Expression *getValue(Dsymbol *&s)
         VarDeclaration *v = s->isVarDeclaration();
         if (v && v->storage_class & STCmanifest)
         {
-            if (v->scope)
-            {
-                v->inuse++;
-                v->init->semantic(v->scope, v->type, INITinterpret);
-                v->scope = NULL;
-                v->inuse--;
-            }
-            e = v->init->toExpression(v->type);
+            e = v->getConstInitializer();
         }
     }
     return e;