Merge pull request #470 from jacqueswww/410_invalid_annotate_assign

Add checks preventing assigning values on defining types.

tests/parser/exceptions/test_structure_exception.py

@@ -131,6 +131,16 @@ def foo():
     """
 def foo():
     x = y = 3
+    """,
+    """
+def foo() -> num:
+    q:num = 111
+    return q
+    """,
+    """
+q:num = 111
+def foo() -> num:
+    return self.q
     """
 ]
 

viper/parser/parser.py

@@ -171,7 +171,9 @@ def add_contract(code):
 
 
 def add_globals_and_events(_defs, _events, _getters, _globals, item):
-    if isinstance(item.annotation, ast.Call) and item.annotation.func.id == "__log__":
+    if item.value is not None:
+        raise StructureException('May not assign value whilst defining type', item)
+    elif isinstance(item.annotation, ast.Call) and item.annotation.func.id == "__log__":
         if _globals or len(_defs):
             raise StructureException("Events must all come before global declarations and function definitions", item)
         _events.append(item)

viper/parser/stmt.py

@@ -69,6 +69,8 @@ def parse_pass(self):
         return LLLnode.from_list('pass', typ=None, pos=getpos(self.stmt))
 
     def ann_assign(self):
+        if self.stmt.value is not None:
+            raise StructureException('May not assign value whilst defining type', self.stmt)
         typ = parse_type(self.stmt.annotation, location='memory')
         varname = self.stmt.target.id
         pos = self.context.new_variable(varname, typ)