Refactoring for the detection mechanism of expression modifiable.

dlang · Jan 29, 2013 · fb2bc10 · fb2bc10
1 parent e2aa18c
commit fb2bc10
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 176 deletions.
diff --git a/src/declaration.c b/src/declaration.c
@@ -130,26 +130,28 @@ enum PROT Declaration::prot()
 
 #if DMDV2
 
-int Declaration::checkModify(Loc loc, Scope *sc, Type *t)
+int Declaration::checkModify(Loc loc, Scope *sc, Type *t, Expression *e1, int flag)
 {
-    if ((sc->flags & SCOPEcontract) && isParameter())
-        error(loc, "cannot modify parameter '%s' in contract", toChars());
+    VarDeclaration *v = isVarDeclaration();
+    if (v && v->canassign)
+        return 2;
 
+    if ((sc->flags & SCOPEcontract) && isParameter())
+    {
+        if (!flag) error(loc, "cannot modify parameter '%s' in contract", toChars());
+        return 0;
+    }
     if ((sc->flags & SCOPEcontract) && isResult())
-        error(loc, "cannot modify result '%s' in contract", toChars());
+    {
+        if (!flag) error(loc, "cannot modify result '%s' in contract", toChars());
+        return 0;
+    }
 
-    if (isCtorinit() && !t->isMutable() ||
-        (storage_class & STCnodefaultctor))
+    if (v && isCtorinit())
     {   // It's only modifiable if inside the right constructor
-        return modifyFieldVar(loc, sc, isVarDeclaration(), NULL);
+        return modifyFieldVar(loc, sc, v, e1) ? 2 : 1;
     }
-    else
-    {
-        VarDeclaration *v = isVarDeclaration();
-        if (v && v->canassign)
-            return TRUE;
-    }
-    return FALSE;
+    return 1;
 }
 #endif
 

diff --git a/src/declaration.h b/src/declaration.h
@@ -141,7 +141,7 @@ struct Declaration : Dsymbol
     void semantic(Scope *sc);
     const char *kind();
     unsigned size(Loc loc);
-    int checkModify(Loc loc, Scope *sc, Type *t);
+    int checkModify(Loc loc, Scope *sc, Type *t, Expression *e1, int flag);
 
     Dsymbol *search(Loc loc, Identifier *ident, int flags);