Changeset 371

Timestamp:

02/06/10 03:53:22 (15 years ago)

Author:

walter

Message:

bugzilla 3450 incorrect result for is (typeof({ ... }())) inside a struct

Files:

• branches/dmd-1.x/src/func.c (modified) (1 diff)
• trunk/src/func.c (modified) (1 diff)

branches/dmd-1.x/src/func.c

@@ -715 +715 @@
-    sc2->parent = this;
-    sc2->callSuper = 0;
-    sc2->sbreak = NULL;
-    sc2->scontinue = NULL;
-    sc2->sw = NULL;
-    sc2->fes = fes;
-    sc2->linkage = LINKd;
-    sc2->stc &= ~(STCauto | STCscope | STCstatic | STCabstract | STCdeprecated | STCfinal);
-    sc2->protection = PROTpublic;
-    sc2->explicitProtection = 0;
-    sc2->structalign = 8;
-    sc2->incontract = 0;
-    sc2->tf = NULL;
-    sc2->noctor = 0;
-
-    // Declare 'this'
-    AggregateDeclaration *ad = isThis();
-    if (ad)
-    {   VarDeclaration *v;
-
-
+ && !sc->intypeof
-        {
-
+function 
-        return;
-        }
-        else
-        {
-
+ || sc->intypeof
-        assert(ad->handle);
-        v = new ThisDeclaration(loc, ad->handle);
-        v->storage_class |= STCparameter | STCin;
-        v->semantic(sc2);
-        if (!sc2->insert(v))
-            assert(0);
-        v->parent = this;
-        vthis = v;
-        }
-    }
-    else if (isNested())
-    {
-        /* The 'this' for a nested function is the link to the
-         * enclosing function's stack frame.
-         * Note that nested functions and member functions are disjoint.
-         */
-        VarDeclaration *v = new ThisDeclaration(loc, Type::tvoid->pointerTo());
-        v->storage_class |= STCparameter | STCin;
-        v->semantic(sc2);
-        if (!sc2->insert(v))

trunk/src/func.c

@@ -824 +824 @@
-    sc2->sbreak = NULL;
-    sc2->scontinue = NULL;
-    sc2->sw = NULL;
-    sc2->fes = fes;
-    sc2->linkage = LINKd;
-    sc2->stc &= ~(STCauto | STCscope | STCstatic | STCabstract | STCdeprecated |
-            STC_TYPECTOR | STCfinal | STCtls | STCgshared | STCref |
-            STCproperty | STCsafe | STCtrusted | STCsystem);
-    sc2->protection = PROTpublic;
-    sc2->explicitProtection = 0;
-    sc2->structalign = 8;
-    sc2->incontract = 0;
-    sc2->tf = NULL;
-    sc2->noctor = 0;
-
-    // Declare 'this'
-    AggregateDeclaration *ad = isThis();
-    if (ad)
-    {   VarDeclaration *v;
-
-
+ && !sc->intypeof
-        {
-
+function 
-        return;
-        }
-        else
-        {
-
+ || sc->intypeof
-        assert(ad->handle);
-        Type *thandle = ad->handle;
-#if STRUCTTHISREF
-        thandle = thandle->addMod(type->mod);
-        thandle = thandle->addStorageClass(storage_class);
-        if (isPure())
-            thandle = thandle->addMod(MODconst);
-#else
-        if (storage_class & STCconst || type->isConst())
-        {
-            assert(0); // BUG: shared not handled
-            if (thandle->ty == Tclass)
-            thandle = thandle->constOf();
-            else
-            {   assert(thandle->ty == Tpointer);
-            thandle = thandle->nextOf()->constOf()->pointerTo();
-            }
-        }
-        else if (storage_class & STCimmutable || type->isImmutable())
-        {