Add VarDeclaration.expandInitializer to factor out common code

dlang · Sep 30, 2015 · b362ceb · b362ceb
1 parent a989653
commit b362ceb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 40 deletions.
diff --git a/src/declaration.d b/src/declaration.d
@@ -2113,11 +2113,12 @@ public:
 
     /*******************************************
      * If variable has a constant expression initializer, get it.
-     * Otherwise, return NULL.
+     * Otherwise, return null.
      */
     final Expression getConstInitializer(bool needFullType = true)
     {
         assert(type && _init);
+
         // Ungag errors when not speculative
         uint oldgag = global.gag;
         if (global.gag)
@@ -2126,18 +2127,39 @@ public:
             if (sym && !sym.isSpeculative())
                 global.gag = 0;
         }
+
         if (_scope)
         {
             inuse++;
             _init = _init.semantic(_scope, type, INITinterpret);
             _scope = null;
             inuse--;
         }
+
         Expression e = _init.toExpression(needFullType ? type : null);
         global.gag = oldgag;
         return e;
     }
 
+    /*******************************************
+     * Helper function for the expansion of manifest constant.
+     */
+    final Expression expandInitializer(Loc loc)
+    {
+        assert((storage_class & STCmanifest) && _init);
+
+        auto e = getConstInitializer();
+        if (!e)
+        {
+            .error(loc, "cannot make expression out of initializer for %s", toChars());
+            return new ErrorExp();
+        }
+
+        e = e.copy();
+        e.loc = loc;    // for better error message
+        return e;
+    }
+
     override final void checkCtorConstInit()
     {
         version (none)

diff --git a/src/expression.d b/src/expression.d
@@ -3752,23 +3752,7 @@ public:
                     .error(loc, "circular initialization of %s", v.toChars());
                     return new ErrorExp();
                 }
-                if (v._scope)
-                {
-                    v.inuse++;
-                    v._init = v._init.semantic(v._scope, v.type, INITinterpret);
-                    v._scope = null;
-                    v.inuse--;
-                }
-
-                e = v._init.toExpression(v.type);
-                if (!e)
-                {
-                    .error(loc, "cannot make expression out of initializer for %s", v.toChars());
-                    return new ErrorExp();
-                }
-                e = e.copy();
-                e.loc = loc; // for better error message
-
+                e = v.expandInitializer(loc);
                 v.inuse++;
                 e = e.semantic(sc);
                 v.inuse--;
@@ -5308,28 +5292,7 @@ public:
                         error("recursive expansion of %s '%s'", ti.kind(), ti.toPrettyChars());
                         return new ErrorExp();
                     }
-                    //if (v.inuse)  // This is the point.
-                    //{
-                    //    .error(loc, "circular initialization of %s", v.toChars());
-                    //    return new ErrorExp();
-                    //}
-                    if (v._scope)
-                    {
-                        v.inuse++;
-                        v._init = v._init.semantic(v._scope, v.type, INITinterpret);
-                        v._scope = null;
-                        v.inuse--;
-                    }
-
-                    auto e = v._init.toExpression(v.type);
-                    if (!e)
-                    {
-                        error("cannot make expression out of initializer for %s", v.toChars());
-                        return new ErrorExp();
-                    }
-                    e = e.copy();
-                    e.loc = loc; // for better error message
-
+                    auto e = v.expandInitializer(loc);
                     ti.inuse++;
                     e = e.semantic(sc);
                     ti.inuse--;