fix Issue 8002 - Excess initial errors when passing template args to …

…non-templated struct
dlang · Apr 30, 2012 · 81eca37 · 81eca37
1 parent 9c8b749
commit 81eca37
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/template.c b/src/template.c
@@ -4486,19 +4486,27 @@ void TemplateInstance::semantic(Scope *sc, Expressions *fargs)
     }
     else
     {
+        /* Find template declaration first.
+         */
+        tempdecl = findTemplateDeclaration(sc);
+        if (!tempdecl)
+        {   inst = this;
+            //printf("error return %p, %d\n", tempdecl, global.errors);
+            return;             // error recovery
+        }
+
         /* Run semantic on each argument, place results in tiargs[]
-         * (if we havetempdecl, then tiargs is already evaluated)
+         * (if we have tempdecl, then tiargs is already evaluated)
          */
         semanticTiargs(sc);
         if (arrayObjectIsError(tiargs))
         {   inst = this;
             //printf("error return %p, %d\n", tempdecl, global.errors);
             return;             // error recovery
         }
+
         unsigned errs = global.errors;
-        tempdecl = findTemplateDeclaration(sc);
-        if (tempdecl)
-            tempdecl = findBestMatch(sc, fargs);
+        tempdecl = findBestMatch(sc, fargs);
         if (!tempdecl || (errs != global.errors))
         {   inst = this;
             //printf("error return %p, %d\n", tempdecl, global.errors);