Fix up for refactor_funcall

dlang · Jul 17, 2013 · 4b50b47 · 4b50b47
1 parent 43d47a1
commit 4b50b47
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -8615,6 +8615,7 @@ Expression *CallExp::semantic(Scope *sc)
         {
             dve = (DotVarExp *)(e1);
             s = dve->var;
+            tiargs = NULL;
         }
         else
         {   dte = (DotTemplateExp *)(e1);
@@ -8799,6 +8800,8 @@ Expression *CallExp::semantic(Scope *sc)
         Dsymbol *s = NULL;
         for (size_t i = 0; i < eo->vars->a.dim; i++)
         {   s = eo->vars->a[i];
+            if (tiargs && s->isFuncDeclaration())
+                continue;
             FuncDeclaration *f2 = resolveFuncCall(loc, sc, s, tiargs, tthis, arguments, 1);
             if (f2)
             {   if (f)
@@ -8950,6 +8953,7 @@ Expression *CallExp::semantic(Scope *sc)
 
         f = ve->var->isFuncDeclaration();
         assert(f);
+        tiargs = NULL;
 
         if (ve->hasOverloads)
             f = resolveFuncCall(loc, sc, f, tiargs, NULL, arguments, 2);