Changeset 645

Timestamp:

08/28/10 21:29:15 (14 years ago)

Author:

walter

Message:

Issue 4291 - Pure functions cannot access mixed in variables

Files:

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

trunk/src/expression.c

@@ -4269 +4269 @@
-                    hasPureParent = true;
-                    break;
-                }
-                Dsymbol *parent = outerfunc->toParent2();
-                if (!parent)
-                    break;
-                outerfunc = parent->isFuncDeclaration();
-            }
-
-            /* If ANY of its enclosing functions are pure,
-             * it cannot do anything impure.
-             * If it is pure, it cannot access any mutable variables other
-             * than those inside itself
-             */
-            if (hasPureParent && v->isDataseg() &&
-                !v->isImmutable())
-            {
-                error("pure function '%s' cannot access mutable static data '%s'",
-                    sc->func->toChars(), v->toChars());
-            }
-
+
+
-                !v->isImmutable() &&
-                !(v->storage_class & STCmanifest))
-            {
-                error("pure nested function '%s' cannot access mutable data '%s'",
-                    sc->func->toChars(), v->toChars());
-                if (v->isEnumDeclaration())
-                    error("enum");
-            }
-
-            /* Do not allow safe functions to access __gshared data
-             */
-            if (sc->func->isSafe() && v->storage_class & STCgshared)
-                error("safe function '%s' cannot access __gshared data '%s'",
-                    sc->func->toChars(), v->toChars());
-        }
-#else
-        if (sc->func && sc->func->isPure() && !sc->intypeof)
-        {
-            if (v->isDataseg() && !v->isImmutable())
-                error("pure function '%s' cannot access mutable static data '%s'", sc->func->toChars(), v->toChars());