Fix user type storage in scope

trans/transpiler/phases/typing/block.py

@@ -6,7 +6,7 @@ from transpiler.phases.typing.expr import ScoperExprVisitor
 from transpiler.phases.typing.class_ import ScoperClassVisitor
 from transpiler.phases.typing.scope import VarDecl, VarKind, ScopeKind
 from transpiler.phases.typing.types import BaseType, TypeVariable, FunctionType, IncompatibleTypesError, TY_MODULE, \
-    Promise, TY_NONE, PromiseKind, TupleType, UserType
+    Promise, TY_NONE, PromiseKind, TupleType, UserType, TypeType
 
 
 @dataclass
@@ -100,7 +100,7 @@ class ScoperBlockVisitor(ScoperVisitor):
 
     def visit_ClassDef(self, node: ast.ClassDef):
         ctype = UserType(node.name)
-        self.scope.vars[node.name] = VarDecl(VarKind.LOCAL, ctype)
+        self.scope.vars[node.name] = VarDecl(VarKind.LOCAL, TypeType(ctype))
         scope = self.scope.child(ScopeKind.CLASS)
         scope.obj_type = ctype
         scope.class_ = scope

trans/transpiler/phases/typing/expr.py

@@ -105,9 +105,9 @@ class ScoperExprVisitor(ScoperVisitor):
         return actual
 
     def visit_function_call(self, ftype: BaseType, arguments: List[BaseType]):
-        if isinstance(ftype, UserType):
-            init: FunctionType = self.visit_getattr(ftype, "__init__")
-            ctor = FunctionType(init.args[1:], ftype)
+        if isinstance(ftype, TypeType) and isinstance(ftype.type_object, UserType):
+            init: FunctionType = self.visit_getattr(ftype.type_object, "__init__")
+            ctor = FunctionType(init.args[1:], ftype.type_object)
             return self.visit_function_call(ctor, arguments)
         if not isinstance(ftype, FunctionType):
             raise IncompatibleTypesError(f"Cannot call {ftype}")