fix Issue 13158 - "void has no value" in std.variant.Algebraic (affec…

…ts D:YAML)
dlang · Jul 21, 2014 · 75ffb63 · 75ffb63
1 parent 59b0000
commit 75ffb63
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 19 deletions.
diff --git a/src/template.c b/src/template.c
@@ -6340,6 +6340,26 @@ void TemplateInstance::semantic(Scope *sc, Expressions *fargs)
     tryExpandMembers(sc2);
 
     semanticRun = PASSsemanticdone;
+
+    /* ConditionalDeclaration may introduce eponymous declaration,
+     * so we should find it once again after semantic.
+     */
+    if (members->dim)
+    {
+        Dsymbol *s;
+        if (Dsymbol::oneMembers(members, &s, tempdecl->ident) && s)
+        {
+            if (!aliasdecl || aliasdecl != s)
+            {
+                //printf("s->kind = '%s'\n", s->kind());
+                //s->print();
+                //printf("'%s', '%s'\n", s->ident->toChars(), tempdecl->ident->toChars());
+                //printf("setting aliasdecl 2\n");
+                aliasdecl = s;
+            }
+        }
+    }
+
     if (global.errors != errorsave)
         goto Laftersemantic;
 
@@ -6369,25 +6389,6 @@ void TemplateInstance::semantic(Scope *sc, Expressions *fargs)
         goto Laftersemantic;
     }
 
-    /* ConditionalDeclaration may introduce eponymous declaration,
-     * so we should find it once again after semantic.
-     */
-    if (members->dim)
-    {
-        Dsymbol *s;
-        if (Dsymbol::oneMembers(members, &s, tempdecl->ident) && s)
-        {
-            if (!aliasdecl || aliasdecl != s)
-            {
-                //printf("s->kind = '%s'\n", s->kind());
-                //s->print();
-                //printf("'%s', '%s'\n", s->ident->toChars(), tempdecl->ident->toChars());
-                //printf("setting aliasdecl 2\n");
-                aliasdecl = s;
-            }
-        }
-    }
-
     /* The problem is when to parse the initializer for a variable.
      * Perhaps VarDeclaration::semantic() should do it like it does
      * for initializers inside a function.

diff --git a/test/runnable/template9.d b/test/runnable/template9.d
@@ -3699,6 +3699,35 @@ void test13127a()
     foo(a, a);
 }
 
+/******************************************/
+// 13159
+
+template maxSize13159(T...)
+{
+    static if (T.length == 1)
+    {
+        enum size_t maxSize13159 = T[0].sizeof;
+    }
+    else
+    {
+        enum size_t maxSize13159 =
+            T[0].sizeof >= maxSize13159!(T[1 .. $])
+                ? T[0].sizeof
+                : maxSize13159!(T[1 .. $]);
+    }
+}
+
+struct Node13159
+{
+    struct Pair
+    {
+        Node13159 value;
+    }
+
+    //alias Algebraic!(Node[], int) Value;
+    enum n = maxSize13159!(Node13159[], int);
+}
+
 /******************************************/
 
 int main()