Changeset 615

Timestamp:

08/11/10 02:47:39 (14 years ago)

Author:

walter

Message:

auto return type forward ref fix

Files:

• trunk/src/expression.c (modified) (1 diff)

trunk/src/expression.c

@@ -7133 +7133 @@
-            goto Lagain;
-        }
-
-        accessCheck(loc, sc, NULL, f);
-
-        ve->var = f;
-//      ve->hasOverloads = 0;
-        ve->type = f->type;
-        t1 = f->type;
-    }
-    assert(t1->ty == Tfunction);
-    tf = (TypeFunction *)(t1);
-
-Lcheckargs:
-    assert(tf->ty == Tfunction);
-
-    if (!arguments)
-        arguments = new Expressions();
-    type = functionParameters(loc, sc, tf, arguments);
-
+    if (!type && f && f->scope)
+    {   f->semantic3(f->scope);
+        type = f->type->nextOf();
+    }
+
-    if (!type)
-    {
-        error("forward reference to inferred return type of function call %s", toChars());
-        return new ErrorExp();
-    }
-
-    if (f && f->tintro)
-    {
-        Type *t = type;
-        int offset = 0;
-        TypeFunction *tf = (TypeFunction *)f->tintro;
-
-        if (tf->next->isBaseOf(t, &offset) && offset)
-        {
-            type = tf->next;
-            return castTo(sc, t);
-        }
-    }
-
-    return this;