fix Issue 15152 - template fails to instantiate if argument is itself…

… a template
dlang · Oct 5, 2015 · 4d1b086 · 4d1b086
1 parent da933af
commit 4d1b086
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 30 deletions.
diff --git a/src/mtype.d b/src/mtype.d
@@ -2695,6 +2695,69 @@ public:
         *ps = null;
     }
 
+    /***************************************
+     * Normalize `e` as the result of Type.resolve() process.
+     */
+    final void resolveExp(Expression e, Type *pt, Expression *pe, Dsymbol* ps)
+    {
+        *pt = null;
+        *pe = null;
+        *ps = null;
+
+        Dsymbol s;
+        switch (e.op)
+        {
+            case TOKerror:
+                *pt = Type.terror;
+                return;
+
+            case TOKtype:
+                *pt = e.type;
+                return;
+
+            case TOKvar:
+                s = (cast(VarExp)e).var;
+                if (s.isVarDeclaration())
+                    goto default;
+                //if (s.isOverDeclaration())
+                //    todo;
+                break;
+
+            case TOKtemplate:
+                // TemplateDeclaration
+                s = (cast(TemplateExp)e).td;
+                break;
+
+            case TOKimport:
+                s = (cast(ScopeExp)e).sds;
+                // TemplateDeclaration, TemplateInstance, Import, Package, Module
+                break;
+
+            case TOKfunction:
+                s = getDsymbol(e);
+                break;
+
+            //case TOKthis:
+            //case TOKsuper:
+
+            //case TOKtuple:
+
+            //case TOKoverloadset:
+
+            //case TOKdotvar:
+            //case TOKdottd:
+            //case TOKdotti:
+            //case TOKdottype:
+            //case TOKdot:
+
+            default:
+                *pe = e;
+                return;
+        }
+
+        *ps = s;
+    }
+
     /***************************************
      * Return !=0 if the type or any of its subtypes is wild.
      */
@@ -6825,14 +6888,10 @@ public:
                 eindex = DsymbolExp.resolve(loc, sc, sindex, false);
             Expression e = new IndexExp(loc, DsymbolExp.resolve(loc, sc, s, false), eindex);
             e = e.semantic(sc);
-            if (e.op == TOKerror)
-                *pt = Type.terror;
-            else if (e.op == TOKtype)
-                *pt = (cast(TypeExp)e).type;
-            else
-                *pe = e;
+            resolveExp(e, pt, pe, ps);
             return;
         }
+
         // Convert oindex to Expression, then try to resolve to constant.
         if (tindex)
             tindex.resolve(loc, sc, &eindex, &tindex, &sindex);
@@ -6866,6 +6925,8 @@ public:
         *pe = isExpression(o);
         if (*pt)
             *pt = (*pt).semantic(loc, sc);
+        if (*pe)
+            resolveExp(*pe, pt, pe, ps);
     }
 
     final Expression toExpressionHelper(Expression e, size_t i = 0)
@@ -6956,12 +7017,7 @@ public:
 
                     ex = toExpressionHelper(ex, i + 1);
                     ex = ex.semantic(sc);
-                    if (ex.op == TOKerror)
-                        *pt = Type.terror;
-                    else if (ex.op == TOKtype)
-                        *pt = ex.type;
-                    else if ((*ps = getDsymbol(ex)) is null)
-                        *pe = ex;
+                    resolveExp(ex, pt, pe, ps);
                     return;
                 }
                 Type t = s.getType(); // type symbol, type alias, or type tuple?
@@ -7019,12 +7075,7 @@ public:
 
                         e = toExpressionHelper(e, i);
                         e = e.semantic(sc);
-                        if (e.op == TOKerror)
-                            *pt = Type.terror;
-                        else if (e.op == TOKtype)
-                            *pt = e.type;
-                        else if ((*ps = getDsymbol(e)) is null)
-                            *pe = e;
+                        resolveExp(e, pt, pe, ps);
                         return;
                     }
                     else
@@ -7528,12 +7579,7 @@ public:
             {
                 auto e = toExpressionHelper(new TypeExp(loc, t));
                 e = e.semantic(sc);
-                if (e.op == TOKerror)
-                    goto Lerr;
-                else if (e.op == TOKtype)
-                    *pt = e.type;
-                else if ((*ps = getDsymbol(e)) is null)
-                    *pe = e;
+                resolveExp(e, pt, pe, ps);
             }
         }
         if (*pt)
@@ -7638,12 +7684,7 @@ public:
             {
                 auto e = toExpressionHelper(new TypeExp(loc, t));
                 e = e.semantic(sc);
-                if (e.op == TOKerror)
-                    goto Lerr;
-                else if (e.op == TOKtype)
-                    *pt = e.type;
-                else if ((*ps = getDsymbol(e)) is null)
-                    *pe = e;
+                resolveExp(e, pt, pe, ps);
             }
         }
         if (*pt)

diff --git a/test/runnable/template9.d b/test/runnable/template9.d
@@ -4691,6 +4691,22 @@ void test14886()
     static assert(is(typeof(bar2(R.init, x)) == int));
 }
 
+/******************************************/
+// 15152
+
+void test15152()
+{
+    void func(string M)() { }
+
+    struct S
+    {
+        enum name = "a";
+    }
+
+    enum s = S.init;
+    func!(s.name);
+}
+
 /******************************************/
 
 int main()