Fix some generic things

typon/trans/tests/user_generics.py

@@ -11,6 +11,12 @@ class Thing(Generic[T]):
     x: T
 
 
+def f(x: T):
+    pass
+
+
+
+
 if __name__ == "__main__":
     a = Thing[int](1)
     b = Thing[str]("abc")

typon/trans/tests/webserver.py

@@ -43,10 +43,6 @@ def server_loop(sockfd, filepath):
 
         fork(lambda: handle_connection(connfd, filepath))
 
-def server_loops(sockfd, filepath):
-    for i in range(20):
-        fork(lambda: server_loop(sockfd, filepath))
-
 if __name__ == "__main__":
     if len(sys.argv) > 2:
         print("Usage: webserver [ filepath ]")
@@ -57,4 +53,4 @@ if __name__ == "__main__":
 
     sockfd = create_listening_socket(PORT)
 
-    server_loops(sockfd, filepath)
+    server_loop(sockfd, filepath)
\ No newline at end of file

typon/trans/tests/webserver_eval.py

@@ -43,14 +43,10 @@ def server_loop(sockfd):
 
         fork(lambda: handle_connection(connfd))
 
-def server_loops(sockfd):
-    for i in range(20):
-        fork(lambda: server_loop(sockfd))
-
 if __name__ == "__main__":
     print("Serving on port", PORT)
     print()
 
     sockfd = create_listening_socket(PORT)
 
-    server_loops(sockfd)
+    server_loop(sockfd)

typon/trans/transpiler/phases/emit_cpp/expr.py

@@ -278,7 +278,7 @@ class ExpressionVisitor(NodeVisitor):
             yield "{}"
 
     def visit_Subscript(self, node: ast.Subscript) -> Iterable[str]:
-        if isinstance(node.type.type_object, MonomorphizedUserType):
+        if isinstance(node.type, TypeType) and isinstance(node.type.type_object, MonomorphizedUserType):
             yield node.type.type_object.name
             return
         yield from self.prec("[]").visit(node.value)

typon/trans/transpiler/phases/typing/block.py

@@ -280,7 +280,7 @@ class ScoperBlockVisitor(ScoperVisitor):
         else:
             # not generic
             ctype = self.process_class_ast(UserType(node.name), node, bases_after)
-        cttype = TypeType(OurGenericType)
+        cttype = TypeType(ctype)
         self.scope.vars[node.name] = VarDecl(VarKind.LOCAL, cttype)