Merge pull request #64 from MarcellPerger1/add-typechecking

refactor: Rename VarType to VarDeclType

Author: MarcellPerger1

parser/astgen/ast_node.py

@@ -7,7 +7,7 @@
 from ..common import HasRegion, StrRegion
 
 __all__ = [
-    "AstNode", "AstProgramNode", "VarDeclScope", "VarType", "AstDeclNode",
+    "AstNode", "AstProgramNode", "VarDeclScope", "VarDeclType", "AstDeclNode",
     "AstRepeat", "AstIf", "AstWhile", "AstAssign", "AstAugAssign", "AstDefine",
     "AstNumber", "AstString", "AstAnyName", "AstIdent", "AstAttrName",
     "AstListLiteral", "AstAttribute", "AstItem", "AstCall", "AstOp", "AstBinOp",
@@ -90,7 +90,7 @@ class VarDeclScope(Enum):
     GLOBAL = 'global'
 
 
-class VarType(Enum):
+class VarDeclType(Enum):
     VARIABLE = 'variable'
     LIST = 'list'
 
@@ -99,7 +99,7 @@ class VarType(Enum):
 class AstDeclNode(AstNode):
     name = 'var_decl'
     scope: VarDeclScope
-    type: VarType
+    type: VarDeclType
     ident: AstIdent
     value: AstNode | None
 

parser/astgen/astgen.py

@@ -136,8 +136,8 @@ def _walk_smt(self, smt: AnyNode) -> list[AstNode]:
     def _walk_var_decl(self, smt: DeclNode):
         scope = (VarDeclScope.LET if isinstance(smt.decl_scope, DeclScope_Let)
                  else VarDeclScope.GLOBAL)
-        tp = (VarType.LIST if isinstance(smt.decl_type, DeclType_List)
-              else VarType.VARIABLE)
+        tp = (VarDeclType.LIST if isinstance(smt.decl_type, DeclType_List)
+              else VarDeclType.VARIABLE)
         # Add the region from the keywords to first decl (to make single-var
         # decls a more sensible .region that includes the `let` keyword as well)
         extra_region_first = region_union(smt.decl_scope, smt.decl_type)
@@ -146,7 +146,7 @@ def _walk_var_decl(self, smt: DeclNode):
                 for i, d in enumerate(smt.decl_list.decls)]
 
     def _walk_single_decl(self, d: DeclItemNode, scope: VarDeclScope,
-                          tp: VarType, extra_region: StrRegion | None):
+                          tp: VarDeclType, extra_region: StrRegion | None):
         return AstDeclNode(
             region_union(d.ident, d.value, extra_region),
             scope, tp, self._walk_ident(d.ident),