Changeset 2319 for cobra/trunk/Source/Members.cobra

Timestamp:

03/15/10 05:32:06 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Fixed: References to local variables in ensure are not flagged as errors.
ticket:198

Files:

• cobra/trunk/Source/Members.cobra (modified) (3 diffs)

cobra/trunk/Source/Members.cobra

@@ -1665 +1665 @@
     def _bindImp is override
         base._bindImp
+        # note: expressions cannot refer to locals in contracts
         newExprs = List<of Expr>()
-        i = 0
         for expr in _exprs
             expr.bindImp  # TODO: error recovery
             assert expr.type
+            if not expr.hasError, _checkForLocalReferences(expr)
             if expr.type is not .compiler.boolType
                 expr = TruthExpr(expr).bindAll to Expr # CC: axe cast when Cobra supports "as this"
                 assert expr.type
             newExprs.add(expr)
-            i += 1
         _exprs.clear
         _exprs.addRange(newExprs)
 
+    def _checkForLocalReferences(expr as Expr)
+        for expr in expr.allExprs
+            if expr inherits IdentifierExpr
+                if expr.definition inherits LocalVar
+                    if expr.name <> 'result' or not expr.definition.isImplicit
+                        expr.recordError('Cannot refer to local variable "[expr.name]" in a contract. Use an "assert" statement in the implementation to verify conditions on locals.')
+    
     def checkConnectToken
         """
@@ -1722 +1729 @@
 
     
-class EnsurePart
-    is partial
-    inherits ContractPart
+class EnsurePart inherits ContractPart is partial
 
     cue init(codeMember as AbstractMethod)
@@ -1747 +1752 @@
         return have
 
-    def _bindImp is override
-        if _codeMember.resultType is .compiler.voidType
+    def _bindImp
+        codeMember = _codeMember
+        if codeMember.resultType is .compiler.voidType
             base._bindImp
         else
-            resultLocal = _codeMember.findLocal('result')
+            resultLocal = codeMember.findLocal('result')
             resultBuiltIn = ResultVar(.token, _codeMember)
-            if resultLocal
-                _codeMember.replaceLocal(resultBuiltIn)
-            else
-                _codeMember.addLocal(resultBuiltIn)
+            if resultLocal, codeMember.replaceLocal(resultBuiltIn)
+            else, codeMember.addLocal(resultBuiltIn)
             try
                 base._bindImp
             finally
-                if resultLocal
-                    _codeMember.replaceLocal(resultLocal to LocalVar)
-                else
-                    _codeMember.removeLocal('result')
+                if resultLocal, codeMember.replaceLocal(resultLocal to LocalVar)
+                else, codeMember.removeLocal('result')