Changeset 776

Timestamp:

12/05/10 04:09:44 (14 years ago)

Author:

walter

Message:

bugzilla 5107 Const-shared classes/structs not typed as shared

Files:

• trunk/src/class.c (modified) (1 diff)
• trunk/src/struct.c (modified) (1 diff)

trunk/src/class.c

@@ -553 +554 @@
-                    }
-                    else
-                        assert(0);
-                    if (t->ty == Tstruct)       // ref to struct
-                        t = Type::tvoidptr;
-                    assert(!vthis);
-                    vthis = new ThisDeclaration(loc, t);
-                    members->push(vthis);
-                }
-            }
-        }
-    }
-
-    if (storage_class & STCauto)
-        error("storage class 'auto' is invalid when declaring a class, did you mean to use 'scope'?");
-    if (storage_class & STCscope)
-        isscope = 1;
-    if (storage_class & STCabstract)
-        isabstract = 1;
-    if (storage_class & STCimmutable)
-invariantOf(
-else 
-constOf(
-else 
-sharedOf(
+addMod(MODimmutable
+
+addMod(MODconst
+
+addMod(MODshared
-
-    sc = sc->push(this);
-    sc->stc &= ~(STCfinal | STCauto | STCscope | STCstatic |
-                 STCabstract | STCdeprecated | STC_TYPECTOR | STCtls | STCgshared);
-    sc->stc |= storage_class & STC_TYPECTOR;
-    sc->parent = this;
-    sc->inunion = 0;
-
-    if (isCOMclass())
-    {
-#if _WIN32
-        sc->linkage = LINKwindows;
-#else
-        /* This enables us to use COM objects under Linux and
-         * work with things like XPCOM
-         */
-        sc->linkage = LINKc;
-#endif
-    }
-    sc->protection = PROTpublic;

trunk/src/struct.c

@@ -300 +300 @@
-
-    unsigned dprogress_save = Module::dprogress;
-
-    parent = sc->parent;
-    type = type->semantic(loc, sc);
-#if STRUCTTHISREF
-    handle = type;
-#else
-    handle = type->pointerTo();
-#endif
-    structalign = sc->structalign;
-    protection = sc->protection;
-    storage_class |= sc->stc;
-    if (sc->stc & STCdeprecated)
-        isdeprecated = 1;
-    assert(!isAnonymous());
-    if (sc->stc & STCabstract)
-        error("structs, unions cannot be abstract");
-#if DMDV2
-    if (storage_class & STCimmutable)
-invariantOf(
-else 
-constOf(
-else 
-sharedOf(
+addMod(MODimmutable
+
+addMod(MODconst
+
+addMod(MODshared
-#endif
-
-    if (sizeok == 0)            // if not already done the addMember step
-    {
-        int hasfunctions = 0;
-        for (int i = 0; i < members->dim; i++)
-        {
-            Dsymbol *s = (Dsymbol *)members->data[i];
-            //printf("adding member '%s' to '%s'\n", s->toChars(), this->toChars());
-            s->addMember(sc, this, 1);
-            if (s->isFuncDeclaration())
-                hasfunctions = 1;
-        }
-
-        // If nested struct, add in hidden 'this' pointer to outer scope
-        if (hasfunctions && !(storage_class & STCstatic))
-        {   Dsymbol *s = toParent2();
-            if (s)
-            {
-                AggregateDeclaration *ad = s->isAggregateDeclaration();