Changeset 616

Timestamp:

08/12/10 06:10:46 (14 years ago)

Author:

walter

Message:

bugzilla 3294 forward reference to inferred return type of function call

Files:

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

trunk/src/expression.c

@@ -476 +476 @@
-        e = new CommaExp(loc, ae, new VarExp(loc, tmp));
-        e = e->semantic(sc);
-    }
-    return e;
-}
-#endif
-
-/****************************************
- * Now that we know the exact type of the function we're calling,
- * the arguments[] need to be adjusted:
- *      1. implicitly convert argument to the corresponding parameter type
- *      2. add default arguments for any missing arguments
- *      3. do default promotions on arguments corresponding to ...
- *      4. add hidden _arguments[] argument
- *      5. call copy constructor for struct value arguments
- * Returns:
- *      return type from function
- */
-
-Type *functionParameters(Loc loc, Scope *sc, TypeFunction *tf,
-
+, FuncDeclaration *fd
-{
-    //printf("functionParameters()\n");
-    assert(arguments);
-    size_t nargs = arguments ? arguments->dim : 0;
-    size_t nparams = Parameter::dim(tf->parameters);
-
-    if (nargs > nparams && tf->varargs == 0)
-        error(loc, "expected %zu arguments, not %zu for non-variadic function type %s", nparams, nargs, tf->toChars());
-
-    unsigned n = (nargs > nparams) ? nargs : nparams;   // n = max(nargs, nparams)
-
-    unsigned wildmatch = 0;
-    int done = 0;
-    for (size_t i = 0; i < n; i++)
-    {
-        Expression *arg;
-
-        if (i < nargs)
-            arg = (Expression *)arguments->data[i];
-        else
@@ -762 +762 @@
-                    !se->var->isFuncDeclaration()->isUnique())
-                    arg->error("function %s is overloaded", arg->toChars());
-            }
-            arg->rvalue();
-        }
-        arg = arg->optimize(WANTvalue);
-    L3:
-        arguments->data[i] = (void *) arg;
-        if (done)
-            break;
-    }
-
-    // If D linkage and variadic, add _arguments[] as first argument
-    if (tf->linkage == LINKd && tf->varargs == 1)
-    {
-        assert(arguments->dim >= nparams);
-        Expression *e = createTypeInfoArray(sc, (Expression **)&arguments->data[nparams],
-                arguments->dim - nparams);
-        arguments->insert(0, e);
-    }
+
+    // If inferring return type, and semantic3() needs to be run if not already run
+    if (!tf->next && fd->inferRetType)
+        fd->semantic3(fd->scope);
+
-    Type *tret = tf->next;
-    if (wildmatch)
-    {   /* Adjust function return type based on wildmatch
-         */
-        //printf("wildmatch = x%x\n", wildmatch);
-        assert(tret->isWild());
-        if (wildmatch & MODconst || wildmatch & (wildmatch - 1))
-            tret = tret->constOf();
-        else if (wildmatch & MODimmutable)
-            tret = tret->invariantOf();
-        else
-        {   assert(wildmatch & MODmutable);
-            tret = tret->mutableOf();
-        }
-    }
-    return tret;
-}
-
-/**************************************************
- * Write expression out to buf, but wrap it
@@ -3819 +3824 @@
-        else if (thisexp)
-        {   error("e.new is only for allocating nested classes");
-            goto Lerr;
-        }
-
-        FuncDeclaration *f = NULL;
-        if (cd->ctor)
-            f = resolveFuncCall(sc, loc, cd->ctor, NULL, NULL, arguments, 0);
-        if (f)
-        {
-            checkDeprecated(sc, f);
-            member = f->isCtorDeclaration();
-            assert(member);
-
-            cd->accessCheck(loc, sc, member);
-
-            tf = (TypeFunction *)f->type;
-
-            if (!arguments)
-                arguments = new Expressions();
-
+, f
-
-            type = type->addMod(tf->nextOf()->mod);
-        }
-        else
-        {
-            if (arguments && arguments->dim)
-            {   error("no constructor for %s", cd->toChars());
-                goto Lerr;
-            }
-        }
-
-        if (cd->aggNew)
-        {
-            // Prepend the size argument to newargs[]
-            Expression *e = new IntegerExp(loc, cd->size(loc), Type::tsize_t);
-            if (!newargs)
-                newargs = new Expressions();
-            newargs->shift(e);
-
-            f = cd->aggNew->overloadResolve(loc, NULL, newargs);
-            allocator = f->isNewDeclaration();
-            assert(allocator);
-
-            tf = (TypeFunction *)f->type;
-
+, f
-        }
-        else
-        {
-            if (newargs && newargs->dim)
-            {   error("no allocator for %s", cd->toChars());
-                goto Lerr;
-            }
-        }
-    }
-    else if (tb->ty == Tstruct)
-    {
-        TypeStruct *ts = (TypeStruct *)tb;
-        StructDeclaration *sd = ts->sym;
-        TypeFunction *tf;
-
-        FuncDeclaration *f = NULL;
-        if (sd->ctor)
-            f = resolveFuncCall(sc, loc, sd->ctor, NULL, NULL, arguments, 0);
-        if (f)
-        {
-            checkDeprecated(sc, f);
-            member = f->isCtorDeclaration();
-            assert(member);
-
-            sd->accessCheck(loc, sc, member);
-
-            tf = (TypeFunction *)f->type;
-            type = tf->next;
-
-            if (!arguments)
-                arguments = new Expressions();
-
+, f
-        }
-        else
-        {
-            if (arguments && arguments->dim)
-            {   error("no constructor for %s", sd->toChars());
-                goto Lerr;
-            }
-        }
-
-
-        if (sd->aggNew)
-        {
-            // Prepend the uint size argument to newargs[]
-            Expression *e = new IntegerExp(loc, sd->size(loc), Type::tuns32);
-            if (!newargs)
-                newargs = new Expressions();
-            newargs->shift(e);
-
-            f = sd->aggNew->overloadResolve(loc, NULL, newargs);
-            allocator = f->isNewDeclaration();
-            assert(allocator);
-
-            tf = (TypeFunction *)f->type;
-
+, f
-#if 0
-            e = new VarExp(loc, f);
-            e = new CallExp(loc, e, newargs);
-            e = e->semantic(sc);
-            e->type = type->pointerTo();
-            return e;
-#endif
-        }
-        else
-        {
-            if (newargs && newargs->dim)
-            {   error("no allocator for %s", sd->toChars());
-                goto Lerr;
-            }
-        }
-
-        type = type->pointerTo();
-    }
-    else if (tb->ty == Tarray && (arguments && arguments->dim))
-    {
@@ -7131 +7136 @@
-
-            e1 = new DotVarExp(loc, new ThisExp(loc), f);
-            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();
-
-
-
-
-
-
+
-
-    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);
-        }
-    }
-

trunk/src/mars.c

@@ -74 +74 @@
-#else
-#error "fix this"
-#endif
-
-#if TARGET_WINDOS
-    dll_ext  = "dll";
-#elif TARGET_LINUX || TARGET_FREEBSD || TARGET_SOLARIS
-    dll_ext  = "so";
-#elif TARGET_OSX
-    dll_ext = "dylib";
-#else
-#error "fix this"
-#endif
-
-    copyright = "Copyright (c) 1999-2010 by Digital Mars";
-    written = "written by Walter Bright"
-#if TARGET_NET
-    "\nMSIL back-end (alpha release) by Cristian L. Vlasceanu and associates.";
-#endif
-    ;
-8
+9
-    global.structalign = 8;
-
-    memset(&params, 0, sizeof(Param));
-}
-
-char *Loc::toChars()
-{
-    OutBuffer buf;
-    char *p;
-
-    if (filename)
-    {
-        buf.printf("%s", filename);
-    }
-
-    if (linnum)
-        buf.printf("(%d)", linnum);
-    buf.writeByte(0);
-    return (char *)buf.extractData();
-}