Changeset 235

Timestamp:

11/04/09 07:24:58 (15 years ago)

Author:

walter

Message:

bugzilla 3367

Files:

• trunk/src/declaration.c (modified) (1 diff)
• trunk/src/expression.c (modified) (1 diff)
• trunk/src/func.c (modified) (3 diffs)
• trunk/src/module.c (modified) (1 diff)
• trunk/src/mtype.c (modified) (1 diff)

trunk/src/declaration.c

@@ -1074 +1074 @@
-                    /* Before calling the constructor, initialize
-                     * variable with a bit copy of the default
-                     * initializer
-                     */
-                    Expression *e = new AssignExp(loc, new VarExp(loc, this), t->defaultInit(loc));
-                    e->op = TOKblit;
-                    e->type = t;
-                    ei->exp = new CommaExp(loc, e, ei->exp);
-
-                    /* Replace __ctmp being constructed with e1
-                     */
-                    dve->e1 = e1;
-                    return;
-                }
-                }
-            }
-            }
-#endif
-            if (!ei->exp->implicitConvTo(type))
-            {
+            Type *ti = ei->exp->type->toBasetype();
+            // Look for constructor first
+            if (sd->ctor &&
+                /* Initializing with the same type is done differently
+                 */
+                !(ti->ty == Tstruct && t->toDsymbol(sc) == ti->toDsymbol(sc)))
+            {
+               // Rewrite as e1.ctor(arguments)
+                Expression *ector = new DotIdExp(loc, e1, Id::ctor);
+                ei->exp = new CallExp(loc, ector, ei->exp);
+            } 
+            else
-            /* Look for opCall
-             * See bugzilla 2702 for more discussion
-             */
-            Type *ti = ei->exp->type->toBasetype();
-            // Don't cast away invariant or mutability in initializer
-            if (search_function(sd, Id::call) &&
-                /* Initializing with the same type is done differently
-                 */
-                !(ti->ty == Tstruct && t->toDsymbol(sc) == ti->toDsymbol(sc)))
-            {   // Rewrite as e1.call(arguments)
-                Expression * eCall = new DotIdExp(loc, e1, Id::call);
-                ei->exp = new CallExp(loc, eCall, ei->exp);
-            }
-            }
-        }
-        ei->exp = new AssignExp(loc, e1, ei->exp);
-        ei->exp->op = op;
-        canassign++;
-        ei->exp = ei->exp->semantic(sc);
-        canassign--;
-        ei->exp->optimize(WANTvalue);
-        }
-        else
-        {

trunk/src/expression.c

@@ -321 +321 @@
-    return fd;
-
-Lno:
-    return NULL;        // don't have 'this' available
-}
-
-
-/***************************************
- * Pull out any properties.
- */
-
-Expression *resolveProperties(Scope *sc, Expression *e)
-{
-    //printf("resolveProperties(%s)\n", e->toChars());
-    if (e->type)
-    {
-    Type *t = e->type->toBasetype();
-
-    if (t->ty == Tfunction || e->op == TOKoverloadset)
-    {
+#if 0
+        if (t->ty == Tfunction && !((TypeFunction *)t)->isproperty)
+        error(e->loc, "not a property %s\n", e->toChars());
+#endif
-        e = new CallExp(e->loc, e);
-        e = e->semantic(sc);
-    }
-
-    /* Look for e being a lazy parameter; rewrite as delegate call
-     */
-    else if (e->op == TOKvar)
-    {   VarExp *ve = (VarExp *)e;
-
-        if (ve->var->storage_class & STClazy)
-        {
-        e = new CallExp(e->loc, e);
-        e = e->semantic(sc);
-        }
-    }
-
-    else if (e->op == TOKdotexp)
-    {
-        e->error("expression has no value");
-    }

trunk/src/func.c

@@ -2934 +2934 @@
-    Statement *s = new DeclarationStatement(0, v);
-    sa->push(s);
-    Expression *e = new IdentifierExp(0, id);
-    e = new AddAssignExp(0, e, new IntegerExp(1));
-    e = new EqualExp(TOKnotequal, 0, e, new IntegerExp(1));
-    s = new IfStatement(0, NULL, e, new ReturnStatement(0, NULL), NULL);
-    sa->push(s);
-    if (fbody)
-        sa->push(fbody);
-    fbody = new CompoundStatement(0, sa);
-    }
-
-    FuncDeclaration::semantic(sc);
-
-    // We're going to need ModuleInfo
-    Module *m = getModule();
-    if (!m)
-    m = sc->module;
-    if (m)
-    {   m->needmoduleinfo = 1;
+    //printf("module1 %s needs moduleinfo\n", m->toChars());
-#ifdef IN_GCC
-    m->strictlyneedmoduleinfo = 1;
-#endif
-    }
-}
-
-AggregateDeclaration *StaticCtorDeclaration::isThis()
-{
-    return NULL;
-}
-
-int StaticCtorDeclaration::isStaticConstructor()
-{
-    return TRUE;
-}
-
-int StaticCtorDeclaration::isVirtual()
-{
-    return FALSE;
-}
@@ -3043 +3044 @@
-    sa->push(s);
-    Expression *e = new IdentifierExp(0, id);
-    e = new AddAssignExp(0, e, new IntegerExp(-1));
-    e = new EqualExp(TOKnotequal, 0, e, new IntegerExp(0));
-    s = new IfStatement(0, NULL, e, new ReturnStatement(0, NULL), NULL);
-    sa->push(s);
-    if (fbody)
-        sa->push(fbody);
-    fbody = new CompoundStatement(0, sa);
-    vgate = v;
-    }
-
-    FuncDeclaration::semantic(sc);
-
-    // We're going to need ModuleInfo
-    Module *m = getModule();
-    if (!m)
-    m = sc->module;
-    if (m)
-    {   m->needmoduleinfo = 1;
+    //printf("module2 %s needs moduleinfo\n", m->toChars());
-#ifdef IN_GCC
-    m->strictlyneedmoduleinfo = 1;
-#endif
-    }
-}
-
-AggregateDeclaration *StaticDtorDeclaration::isThis()
-{
-    return NULL;
-}
-
-int StaticDtorDeclaration::isStaticDestructor()
-{
-    return TRUE;
-}
-
-int StaticDtorDeclaration::isVirtual()
-{
-    return FALSE;
-}
@@ -3195 +3197 @@
-    assert(!s);
-    utd = new UnitTestDeclaration(loc, endloc);
-    return FuncDeclaration::syntaxCopy(utd);
-}
-
-
-void UnitTestDeclaration::semantic(Scope *sc)
-{
-    if (global.params.useUnitTests)
-    {
-    type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
-    Scope *sc2 = sc->push();
-    sc2->linkage = LINKd;
-    FuncDeclaration::semantic(sc2);
-    sc2->pop();
-    }
-
-    // We're going to need ModuleInfo even if the unit tests are not
-    // compiled in, because other modules may import this module and refer
-    // to this ModuleInfo.
+    // (This doesn't make sense to me?)
-    Module *m = getModule();
-    if (!m)
-    m = sc->module;
-    if (m)
+    {
+    //printf("module3 %s needs moduleinfo\n", m->toChars());
-    m->needmoduleinfo = 1;
+    }
-}
-
-AggregateDeclaration *UnitTestDeclaration::isThis()
-{
-    return NULL;
-}
-
-int UnitTestDeclaration::isVirtual()
-{
-    return FALSE;
-}
-
-int UnitTestDeclaration::addPreInvariant()
-{
-    return FALSE;
-}
-
-int UnitTestDeclaration::addPostInvariant()
-{
-    return FALSE;

trunk/src/module.c

@@ -851 +851 @@
-    for (int i = 0; i < members->dim; i++)
-    {   Dsymbol *s = (Dsymbol *)members->data[i];
-
-    s->toCBuffer(&buf, &hgs);
-    }
-
-    // Transfer image to file
-    symfile->setbuffer(buf.data, buf.offset);
-    buf.data = NULL;
-
-    symfile->writev();
-}
-
-/**********************************
- * Determine if we need to generate an instance of ModuleInfo
- * for this Module.
- */
-
-int Module::needModuleInfo()
-{
+    //printf("needModuleInfo() %s, %d, %d\n", toChars(), needmoduleinfo, global.params.cov);
-    return needmoduleinfo || global.params.cov;
-}
-
-Dsymbol *Module::search(Loc loc, Identifier *ident, int flags)
-{
-    /* Since modules can be circularly referenced,
-     * need to stop infinite recursive searches.
-     * This is done with the cache.
-     */
-
-    //printf("%s Module::search('%s', flags = %d) insearch = %d\n", toChars(), ident->toChars(), flags, insearch);
-    Dsymbol *s;
-    if (insearch)
-    s = NULL;
-    else if (searchCacheIdent == ident && searchCacheFlags == flags)
-    {
-    s = searchCacheSymbol;
-    //printf("%s Module::search('%s', flags = %d) insearch = %d searchCacheSymbol = %s\n", toChars(), ident->toChars(), flags, insearch, searchCacheSymbol ? searchCacheSymbol->toChars() : "null");
-    }
-    else

trunk/src/mtype.c

@@ -5105 +5105 @@
-        break;
-        }
-        sd = s->isStructDeclaration();
-        if (sd)
-        {
-        if (exp->op == TOKsuper)
-        {
-            error(loc, "struct %s has no 'super'", sd->toChars());
-            goto Lerr;
-        }
-        t = sd->type->pointerTo();
-        break;
-        }
-    }
-    }
-    else
-#endif
-    {
-    sc->intypeof++;
-    exp = exp->semantic(sc);
-
+
+
+
-    sc->intypeof--;
-    if (exp->op == TOKtype)
-    {
-        error(loc, "argument %s to typeof is not an expression", exp->toChars());
-    }
-    t = exp->type;
-    if (!t)
-    {
-        error(loc, "expression (%s) has no type", exp->toChars());
-        goto Lerr;
-    }
-    if (t->ty == Ttypeof)
-        error(loc, "forward reference to %s", toChars());
-
-    /* typeof should reflect the true type,
-     * not what 'auto' would have gotten us.
-     */
-    //t = t->toHeadMutable();
-    }
-    if (idents.dim)