Changeset 610

Timestamp:

08/10/10 10:24:07 (14 years ago)

Author:

walter

Message:

wrong scope for function parameter

Files:

• trunk/src/declaration.c (modified) (1 diff)
• trunk/src/func.c (modified) (2 diffs)

trunk/src/declaration.c

@@ -1393 +1393 @@
-        (storage_class & STCstatic || parent->isModule()))
-        return TRUE;
-    return FALSE;
-}
-
-void VarDeclaration::checkCtorConstInit()
-{
-#if 0 /* doesn't work if more than one static ctor */
-    if (ctorinit == 0 && isCtorinit() && !(storage_class & STCfield))
-        error("missing initializer in static constructor for const variable");
-#endif
-}
-
-/************************************
- * Check to see if this variable is actually in an enclosing function
- * rather than the current one.
- */
-
-void VarDeclaration::checkNestedReference(Scope *sc, Loc loc)
-{
+    //printf("VarDeclaration::checkNestedReference() %s\n", toChars());
-    if (parent && !isDataseg() && parent != sc->parent &&
-        !(storage_class & STCmanifest))
-    {
-        // The function that this variable is in
-        FuncDeclaration *fdv = toParent()->isFuncDeclaration();
-        // The current function
-        FuncDeclaration *fdthis = sc->parent->isFuncDeclaration();
-
-        if (fdv && fdthis && fdv != fdthis)
-        {
-            if (loc.filename)
-                fdthis->getLevel(loc, fdv);
-
-            for (int i = 0; i < nestedrefs.dim; i++)
-            {   FuncDeclaration *f = (FuncDeclaration *)nestedrefs.data[i];
-                if (f == fdthis)
-                    goto L1;
-            }
-            nestedrefs.push(fdthis);
-          L1: ;

trunk/src/func.c

@@ -1501 +1501 @@
-
-            fbody = new CompoundStatement(0, a);
-#if DMDV2
-            /* Append destructor calls for parameters as finally blocks.
-             */
-            if (parameters)
-            {   for (size_t i = 0; i < parameters->dim; i++)
-                {
-                    VarDeclaration *v = (VarDeclaration *)parameters->data[i];
-
-                    if (v->storage_class & (STCref | STCout))
-                        continue;
-
-                    /* Don't do this for static arrays, since static
-                     * arrays are called by reference. Remove this
-                     * when we change them to call by value.
-                     */
-                    if (v->type->toBasetype()->ty == Tsarray)
-                        continue;
-
-
+2
-                    if (e)
-                    {   Statement *s = new ExpStatement(0, e);
-
+2
-                        if (fbody->blockExit() == BEfallthru)
-                            fbody = new CompoundStatement(0, fbody, s);
-                        else
-                            fbody = new TryFinallyStatement(0, fbody, s);
-                    }
-                }
-            }
-#endif
-
-#if 1
-            if (isSynchronized())
-            {   /* Wrap the entire function body in a synchronized statement
-                 */
-                ClassDeclaration *cd = parent->isClassDeclaration();
-                if (cd)
-                {
-#if TARGET_WINDOS
-                    if (/*config.flags2 & CFG2seh &&*/  // always on for WINDOS
-                        !isStatic() && !fbody->usesEH())
-                    {
@@ -2352 +2352 @@
- * Error if this cannot call fd.
- * Returns:
- *      0       same level
- *      -1      increase nesting by 1 (fd is nested within 'this')
- *      >0      decrease nesting by number
- */
-
-int FuncDeclaration::getLevel(Loc loc, FuncDeclaration *fd)
-{   int level;
-    Dsymbol *s;
-    Dsymbol *fdparent;
-
-    //printf("FuncDeclaration::getLevel(fd = '%s')\n", fd->toChars());
-    fdparent = fd->toParent2();
-    if (fdparent == this)
-        return -1;
-    s = this;
-    level = 0;
-    while (fd != s && fdparent != s->toParent2())
-    {
-'%s'\n"
+%s, '%s'\n", s->kind()
-        FuncDeclaration *thisfd = s->isFuncDeclaration();
-        if (thisfd)
-        {   if (!thisfd->isNested() && !thisfd->vthis)
-                goto Lerr;
-        }
-        else
-        {
-            AggregateDeclaration *thiscd = s->isAggregateDeclaration();
-            if (thiscd)
-            {   if (!thiscd->isNested())
-                    goto Lerr;
-            }
-            else
-                goto Lerr;
-        }
-
-        s = s->toParent2();
-        assert(s);
-        level++;
-    }
-    return level;
-
-Lerr:
-
+
+
-    return 1;
-}
-
-void FuncDeclaration::appendExp(Expression *e)
-{   Statement *s;
-
-    s = new ExpStatement(0, e);
-    appendState(s);
-}
-
-void FuncDeclaration::appendState(Statement *s)
-{
-    if (!fbody)
-        fbody = s;
-    else
-    {
-        CompoundStatement *cs = fbody->isCompoundStatement();
-        if (cs)
-        {
-            if (!cs->statements)