add annotations across the codebase

Author: yangdanny97

compiler/astnodes/classdef.py

@@ -46,7 +46,7 @@ def toJSON(self, dump_location=True):
                              for decl in self.declarations]
         return d
 
-    def getIdentifier(self):
+    def getIdentifier(self) -> Identifier:
         return self.name
 
     def getDefaultConstructor(self) -> FuncDef:

compiler/astnodes/funcdef.py

@@ -3,10 +3,13 @@
 from .typedvar import TypedVar
 from .typeannotation import TypeAnnotation
 from .stmt import Stmt
+from ..types import FuncType
 from typing import List
 
 
 class FuncDef(Declaration):
+    freevars: List[Identifier]  # used in AST transformations, not printed out
+    type: FuncType = None  # type signature of function
 
     # The AST for
     #     def NAME(PARAMS) -> RETURNTYPE:
@@ -22,8 +25,7 @@ def __init__(self, location: List[int], name: Identifier, params: List[TypedVar]
         self.declarations = declarations
         self.statements = [s for s in statements if s is not None]
         self.isMethod = isMethod
-        self.freevars = []  # used in AST transformations, not printed out
-        self.type = None  # type signature of function
+        self.freevars = []
 
     def getFreevarNames(self):
         return set([v.name for v in self.freevars])
@@ -56,5 +58,5 @@ def toJSON(self, dump_location=True):
         d["statements"] = [s.toJSON(dump_location) for s in self.statements]
         return d
 
-    def getIdentifier(self):
+    def getIdentifier(self) -> Identifier:
         return self.name

compiler/astnodes/identifier.py

@@ -1,5 +1,6 @@
 from .expr import Expr
 from typing import List
+from ..types import VarInstance
 
 CIL_KEYWORDS = set(["char", "value", "int32", "int64", "string", "long", "null"] +
                    ["add",
@@ -121,11 +122,11 @@
 
 
 class Identifier(Expr):
+    varInstance: VarInstance = None
 
     def __init__(self, location: List[int], name: str):
         super().__init__(location, "Identifier")
         self.name = name
-        self.varInstance = None
 
     def visit(self, visitor):
         return visitor.Identifier(self)

compiler/astnodes/node.py

@@ -19,7 +19,7 @@ def preorder(self, visitor):
     def postorder(self, visitor):
         return self.visit(visitor)
 
-    def toJSON(self, dump_location=True):
+    def toJSON(self, dump_location=True) -> dict:
         d = {}
         d['kind'] = self.kind
         if dump_location:

compiler/astnodes/typedvar.py

@@ -1,17 +1,18 @@
 from .node import Node
 from .identifier import Identifier
 from .typeannotation import TypeAnnotation
+from ..types import ValueType, VarInstance
 from typing import List
 
 
 class TypedVar(Node):
+    t: ValueType = None  # the typechecked type goes here
+    varInstance: VarInstance = None
 
     def __init__(self, location: List[int], identifier: Identifier, typ: TypeAnnotation):
         super().__init__(location, "TypedVar")
         self.identifier = identifier
         self.type = typ
-        self.t = None  # the typechecked type goes here
-        self.varInstance = None
 
     def name(self):
         return self.identifier.name

compiler/astnodes/vardef.py

@@ -1,10 +1,12 @@
 from .declaration import Declaration
 from .expr import Expr
+from .identifier import Identifier
 from .typedvar import TypedVar
-from typing import List
+from typing import List, Optional
 
 
 class VarDef(Declaration):
+    attrOfClass: Optional[str]
 
     def __init__(self, location: List[int], var: TypedVar, value: Expr, isAttr: bool = False, attrOfClass=None):
         super().__init__(location, "VarDef")
@@ -31,7 +33,7 @@ def toJSON(self, dump_location=True):
         d["value"] = self.value.toJSON(dump_location)
         return d
 
-    def getIdentifier(self):
+    def getIdentifier(self) -> Identifier:
         return self.var.identifier
 
     def getName(self) -> str:

compiler/cil_backend.py

@@ -8,13 +8,13 @@
 
 
 class CilStackLoc:
-    def __init__(self, name, loc, t, isArg):
+    def __init__(self, name: str, loc: int, t: str, isArg: bool):
         self.name = name
         self.loc = loc
         self.isArg = isArg
         self.t = t
 
-    def decl(self):
+    def decl(self) -> str:
         return f"[{self.loc}] {self.t} {self.name}"
 
 
@@ -26,6 +26,7 @@ def __init__(self, main: str, ts: TypeSystem):
         self.builder = Builder(main)
         self.main = main  # name of main class
         self.ts = ts
+        self.locals = []
         self.enterScope()
 
     def indent(self):
@@ -612,7 +613,7 @@ def BooleanLiteral(self, node: BooleanLiteral):
     def IntegerLiteral(self, node: IntegerLiteral):
         self.instr(f"ldc.i8 {node.value}")
 
-    def NoneLiteral(self, node: NoneLiteral):
+    def NoneLiteral(self, _: NoneLiteral):
         self.instr("ldnull")
 
     def StringLiteral(self, node: StringLiteral):

compiler/closurevisitor.py

@@ -2,22 +2,15 @@
 from .types import *
 from .visitor import Visitor
 from .varcollector import VarCollector
-from typing import List
-
-
-class VarInstance:
-    def __init__(self):
-        self.isNonlocal = False
-        self.isGlobal = False
-        self.isSelf = False
+from typing import List, Dict
 
 
 def newInstance(tv: TypedVar) -> VarInstance:
     tv.varInstance = VarInstance()
     return tv.varInstance
 
 
-def merge(d1, d2):
+def merge(d1: dict, d2: dict) -> dict:
     combined = {}
     for k in d1:
         combined[k] = d1[k]
@@ -43,10 +36,11 @@ class ClosureVisitor(Visitor):
 
     # instances that are captured by nested functions are marked as refs
     # instances that correspond to global variables are marked as such
+    globals: Dict[str, VarInstance]
+    decls: List[Dict[str, VarInstance]]
 
     def __init__(self):
         self.globals = {}
-        self.nonlocals = []  # uncaptured nonlocals
         self.decls = []
 
     def getInstance(self, name: str) -> VarInstance:

compiler/compiler.py

@@ -17,11 +17,12 @@
 
 
 class Compiler:
+    transformer: ClosureTransformer = None
+
     def __init__(self):
         self.ts = TypeSystem()
         self.parser = Parser()
         self.typechecker = TypeChecker(self.ts)
-        self.transformer = None
 
     def parse(self, infile) -> Node:
         astparser = self.parser

compiler/empty_list_typer.py

@@ -9,10 +9,8 @@
 
 
 class EmptyListTyper(Visitor):
-
-    def __init__(self):
-        self.expectedType = None
-        self.expReturnType = None
+    expectedType: ValueType = None
+    expReturnType: ValueType = None
 
     def visit(self, node: Node):
         return node.preorder(self)