jaclang 0.5.7__py3-none-any.whl → 0.5.9__py3-none-any.whl

jaclang/compiler/passes/main/def_impl_match_pass.py

@@ -9,7 +9,7 @@ body field.
 import jaclang.compiler.absyntree as ast
 from jaclang.compiler.passes import Pass
 from jaclang.compiler.passes.main import SubNodeTabPass
-from jaclang.compiler.symtable import SymbolTable, SymbolType
+from jaclang.compiler.symtable import Symbol, SymbolTable, SymbolType
 
 
 class DeclDefMatchPass(Pass):
@@ -28,6 +28,14 @@ class DeclDefMatchPass(Pass):
         """Rebuild sub node table."""
         self.ir = SubNodeTabPass(input_ir=self.ir, prior=self).ir
 
+    def defn_lookup(self, lookup: Symbol) -> ast.AstImplNeedingNode | None:
+        """Lookup a definition in a symbol table."""
+        for defn in range(len(lookup.defn)):
+            candidate = lookup.defn[len(lookup.defn) - (defn + 1)]
+            if isinstance(candidate, ast.AstImplNeedingNode) and candidate.needs_impl:
+                return candidate
+        return None
+
     def connect_def_impl(self, sym_tab: SymbolTable) -> None:
         """Connect Decls and Defs."""
         for sym in sym_tab.tab.values():
@@ -35,7 +43,11 @@ class DeclDefMatchPass(Pass):
                 # currently strips the type info from impls
                 arch_refs = [x[3:] for x in sym.sym_name.split(".")]
                 lookup = sym_tab.lookup(arch_refs[0])
-                decl_node = lookup.decl if lookup else None
+                decl_node = (
+                    self.defn_lookup(lookup)
+                    if len(arch_refs) == 1 and lookup
+                    else lookup.defn[-1] if lookup else None
+                )
                 for name in arch_refs[1:]:
                     if decl_node:
                         lookup = (
@@ -43,7 +55,11 @@ class DeclDefMatchPass(Pass):
                             if decl_node.sym_tab
                             else None
                         )
-                        decl_node = lookup.decl if lookup else None
+                        decl_node = (
+                            self.defn_lookup(lookup)
+                            if len(arch_refs) == 1 and lookup
+                            else lookup.defn[-1] if lookup else None
+                        )
                     else:
                         break
                 if not decl_node:

jaclang/compiler/passes/main/def_use_pass.py

@@ -73,7 +73,7 @@ class DefUsePass(SymTabPass):
         ):
             self.def_insert(
                 node,
-                single_use="has var",
+                single_decl="has var",
                 access_spec=node.parent.parent,
             )
         else:

jaclang/compiler/passes/main/fuse_typeinfo_pass.py

@@ -0,0 +1,357 @@
+"""Integrate mypy infrastructure into Jac.
+
+This is used to call mypy type checking into Jac files by integrating
+mypy apis into Jac and use jac py ast in it.
+"""
+
+from __future__ import annotations
+
+import os
+import traceback
+from typing import Callable, TypeVar
+
+import jaclang.compiler.absyntree as ast
+from jaclang.compiler.passes import Pass
+from jaclang.utils.helpers import pascal_to_snake
+
+import mypy.nodes as MypyNode  # noqa N812
+import mypy.types as MypyTypes  # noqa N812
+
+
+T = TypeVar("T", bound=ast.AstSymbolNode)
+
+
+class FuseTypeInfoPass(Pass):
+    """Python and bytecode file self.__debug_printing pass."""
+
+    def __debug_print(self, *argv: object) -> None:
+        if "FuseTypeInfoDebug" in os.environ:
+            print("FuseTypeInfo::", *argv)
+
+    def __call_type_handler(
+        self, node: ast.AstSymbolNode, mypy_type: MypyTypes.ProperType
+    ) -> None:
+        mypy_type_name = pascal_to_snake(mypy_type.__class__.__name__)
+        type_handler_name = f"get_type_from_{mypy_type_name}"
+        if hasattr(self, type_handler_name):
+            getattr(self, type_handler_name)(node, mypy_type)
+        else:
+            self.__debug_print(
+                f'{node.loc}"MypyTypes::{mypy_type.__class__.__name__}" isn\'t supported yet'
+            )
+
+    def __set_sym_table_link(self, node: ast.AstSymbolNode) -> None:
+        typ = node.sym_info.typ.split(".")
+        typ_sym_table = self.ir.sym_tab
+        if typ_sym_table and typ[0] == typ_sym_table.name:
+            for i in typ[1:]:
+                f = typ_sym_table.find_scope(i)
+                if f:
+                    typ_sym_table = f
+
+        if typ_sym_table != self.ir.sym_tab:
+            node.sym_info.typ_sym_table = typ_sym_table
+
+    @staticmethod
+    def __handle_node(
+        func: Callable[[FuseTypeInfoPass, T], None]
+    ) -> Callable[[FuseTypeInfoPass, T], None]:
+        def node_handler(self: FuseTypeInfoPass, node: T) -> None:
+            if not isinstance(node, ast.AstSymbolNode):
+                print(f"Warning {node.__class__.__name__} is not an AstSymbolNode")
+
+            try:
+                jac_node_str = f'jac node "{node.loc}::{node.__class__.__name__}'
+                if hasattr(node, "value"):
+                    jac_node_str += f'::{node.value}"'
+                else:
+                    jac_node_str += '"'
+
+                # Jac node has only one mypy node linked to it
+                if len(node.gen.mypy_ast) == 1:
+                    func(self, node)
+                    self.__set_sym_table_link(node)
+
+                # Jac node has multiple mypy nodes linked to it
+                elif len(node.gen.mypy_ast) > 1:
+                    # Checking that these nodes are duplicate or not
+                    temp = []
+                    for n in node.gen.mypy_ast:
+                        n_id = f"{type(node)}"
+                        n_id += f"::{n.line}::{n.column}"
+                        n_id += f" - {n.end_line}::{n.end_column}"
+                        if n_id not in temp:
+                            temp.append(n_id)
+
+                    # Check the number of unique mypy nodes linked
+                    if len(temp) > 1:
+                        self.__debug_print(
+                            jac_node_str, "has multiple mypy nodes associated to it"
+                        )
+                    else:
+                        # self.__debug_print(jac_node_str, "has duplicate mypy nodes associated to it")
+                        func(self, node)
+                        self.__set_sym_table_link(node)
+
+                # Jac node doesn't have mypy nodes linked to it
+                else:
+                    self.__debug_print(
+                        jac_node_str, "doesn't have mypy node associated to it"
+                    )
+
+            except AttributeError as e:
+                self.__debug_print(
+                    f'Internal error happened while parsing "{e.obj.__class__.__name__}"'
+                )
+                traceback.print_exc()
+                print(e)
+
+        return node_handler
+
+    def enter_import(self, node: ast.Import) -> None:
+        """Pass handler for import nodes."""
+        # Pruning the import nodes
+        self.prune()
+
+    @__handle_node
+    def enter_name(self, node: ast.NameSpec) -> None:
+        """Pass handler for name nodes."""
+        mypy_node = node.gen.mypy_ast[0]
+
+        if hasattr(mypy_node, "node"):
+            # orig_node = mypy_node
+            mypy_node = mypy_node.node
+
+            if isinstance(mypy_node, (MypyNode.Var, MypyNode.FuncDef)):
+                self.__call_type_handler(node, mypy_node.type)
+
+            elif isinstance(mypy_node, MypyNode.MypyFile):
+                node.sym_info = ast.SymbolInfo("types.ModuleType")
+
+            elif isinstance(mypy_node, MypyNode.TypeInfo):
+                node.sym_info = ast.SymbolInfo(mypy_node.fullname)
+
+            elif isinstance(mypy_node, MypyNode.OverloadedFuncDef):
+                self.__call_type_handler(node, mypy_node.items[0].func.type)
+
+            else:
+                self.__debug_print(
+                    f'"{node.loc}::{node.__class__.__name__}" mypy (with node attr) node isn\'t supported',
+                    type(mypy_node),
+                )
+
+        else:
+            if isinstance(mypy_node, MypyNode.ClassDef):
+                node.sym_info.typ = mypy_node.fullname
+                self.__set_sym_table_link(node)
+            elif isinstance(mypy_node, MypyNode.FuncDef):
+                self.__call_type_handler(node, mypy_node.type)
+            elif isinstance(mypy_node, MypyNode.Argument):
+                self.__call_type_handler(node, mypy_node.variable.type)
+            else:
+                self.__debug_print(
+                    f'"{node.loc}::{node.__class__.__name__}" mypy node isn\'t supported',
+                    type(mypy_node),
+                )
+
+    @__handle_node
+    def enter_module_path(self, node: ast.ModulePath) -> None:
+        """Pass handler for ModulePath nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_module_item(self, node: ast.ModuleItem) -> None:
+        """Pass handler for ModuleItem nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_architype(self, node: ast.Architype) -> None:
+        """Pass handler for Architype nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_arch_def(self, node: ast.ArchDef) -> None:
+        """Pass handler for ArchDef nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_enum(self, node: ast.Enum) -> None:
+        """Pass handler for Enum nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_enum_def(self, node: ast.EnumDef) -> None:
+        """Pass handler for EnumDef nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_ability(self, node: ast.Ability) -> None:
+        """Pass handler for Ability nodes."""
+        if isinstance(node.gen.mypy_ast[0], MypyNode.FuncDef):
+            self.__call_type_handler(node, node.gen.mypy_ast[0].type.ret_type)
+        else:
+            self.__debug_print(
+                f"{node.loc}: Can't get type of an ability from mypy node other than Ability."
+            )
+
+    @__handle_node
+    def enter_ability_def(self, node: ast.AbilityDef) -> None:
+        """Pass handler for AbilityDef nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_param_var(self, node: ast.ParamVar) -> None:
+        """Pass handler for ParamVar nodes."""
+        if isinstance(node.gen.mypy_ast[0], MypyNode.Argument):
+            mypy_node: MypyNode.Argument = node.gen.mypy_ast[0]
+            if mypy_node.variable.type:
+                self.__call_type_handler(node, mypy_node.variable.type)
+        else:
+            self.__debug_print(
+                f"{node.loc}: Can't get parameter value from mypyNode other than Argument"
+            )
+
+    # TODO: support all lhs if needed
+    @__handle_node
+    def enter_has_var(self, node: ast.HasVar) -> None:
+        """Pass handler for HasVar nodes."""
+        mypy_node = node.gen.mypy_ast[0]
+        if isinstance(mypy_node, MypyNode.AssignmentStmt):
+            n = mypy_node.lvalues[0].node
+            if isinstance(n, (MypyNode.Var, MypyNode.FuncDef)):
+                self.__call_type_handler(node, n.type)
+            else:
+                self.__debug_print(
+                    "Getting type of 'AssignmentStmt' is only supported with Var and FuncDef"
+                )
+        else:
+            self.__debug_print(
+                "Getting type of 'HasVar' is only supported with AssignmentStmt"
+            )
+
+    @__handle_node
+    def enter_multi_string(self, node: ast.MultiString) -> None:
+        """Pass handler for MultiString nodes."""
+        node.sym_info = ast.SymbolInfo("builtins.str")
+
+    @__handle_node
+    def enter_f_string(self, node: ast.FString) -> None:
+        """Pass handler for FString nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_list_val(self, node: ast.ListVal) -> None:
+        """Pass handler for ListVal nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_set_val(self, node: ast.SetVal) -> None:
+        """Pass handler for SetVal nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_tuple_val(self, node: ast.TupleVal) -> None:
+        """Pass handler for TupleVal nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_dict_val(self, node: ast.DictVal) -> None:
+        """Pass handler for DictVal nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_list_compr(self, node: ast.ListCompr) -> None:
+        """Pass handler for ListCompr nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_dict_compr(self, node: ast.DictCompr) -> None:
+        """Pass handler for DictCompr nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_index_slice(self, node: ast.IndexSlice) -> None:
+        """Pass handler for IndexSlice nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_arch_ref(self, node: ast.ArchRef) -> None:
+        """Pass handler for ArchRef nodes."""
+        if isinstance(node.gen.mypy_ast[0], MypyNode.ClassDef):
+            mypy_node: MypyNode.ClassDef = node.gen.mypy_ast[0]
+            node.sym_info.typ = mypy_node.fullname
+            self.__set_sym_table_link(node)
+        else:
+            self.__debug_print(
+                f"{node.loc}: Can't get ArchRef value from mypyNode other than ClassDef"
+            )
+
+    @__handle_node
+    def enter_special_var_ref(self, node: ast.SpecialVarRef) -> None:
+        """Pass handler for SpecialVarRef nodes."""
+        return self.enter_name(node)
+
+    @__handle_node
+    def enter_edge_op_ref(self, node: ast.EdgeOpRef) -> None:
+        """Pass handler for EdgeOpRef nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_filter_compr(self, node: ast.FilterCompr) -> None:
+        """Pass handler for FilterCompr nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_assign_compr(self, node: ast.AssignCompr) -> None:
+        """Pass handler for AssignCompr nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    @__handle_node
+    def enter_int(self, node: ast.Int) -> None:
+        """Pass handler for Int nodes."""
+        node.sym_info.typ = "builtins.int"
+
+    @__handle_node
+    def enter_float(self, node: ast.Float) -> None:
+        """Pass handler for Float nodes."""
+        node.sym_info.typ = "builtins.float"
+
+    @__handle_node
+    def enter_string(self, node: ast.String) -> None:
+        """Pass handler for String nodes."""
+        node.sym_info.typ = "builtins.str"
+
+    @__handle_node
+    def enter_bool(self, node: ast.Bool) -> None:
+        """Pass handler for Bool nodes."""
+        node.sym_info.typ = "builtins.bool"
+
+    @__handle_node
+    def enter_builtin_type(self, node: ast.BuiltinType) -> None:
+        """Pass handler for BuiltinType nodes."""
+        self.__debug_print("Getting type not supported in", type(node))
+
+    def get_type_from_instance(
+        self, node: ast.AstSymbolNode, mypy_type: MypyTypes.Instance
+    ) -> None:
+        """Get type info from mypy type Instance."""
+        node.sym_info = ast.SymbolInfo(str(mypy_type))
+
+    def get_type_from_callable_type(
+        self, node: ast.AstSymbolNode, mypy_type: MypyTypes.CallableType
+    ) -> None:
+        """Get type info from mypy type CallableType."""
+        node.sym_info = ast.SymbolInfo(str(mypy_type.ret_type))
+
+    # TODO: Which overloaded function to get the return value from?
+    def get_type_from_overloaded(
+        self, node: ast.AstSymbolNode, mypy_type: MypyTypes.Overloaded
+    ) -> None:
+        """Get type info from mypy type Overloaded."""
+        self.__call_type_handler(node, mypy_type.items[0])
+
+    def get_type_from_none_type(
+        self, node: ast.AstSymbolNode, mypy_type: MypyTypes.NoneType
+    ) -> None:
+        """Get type info from mypy type NoneType."""
+        node.sym_info = ast.SymbolInfo("None")

jaclang/compiler/passes/main/import_pass.py

@@ -47,8 +47,10 @@ class ImportPass(Pass):
                     self.annex_impl(mod)
                     i.sub_module = mod
                     i.add_kids_right([mod], pos_update=False)
-                # elif i.lang.tag.value == "py":
-                #     self.import_py_module(node=i, mod_path=node.loc.mod_path)
+                # elif i.parent.lang.tag.value == "py":
+                #     mod = self.import_py_module(node=i, mod_path=node.loc.mod_path)
+                #     i.sub_module = mod
+                #     i.add_kids_right([mod], pos_update=False)
                 self.enter_module_path(i)
             SubNodeTabPass(prior=self, input_ir=node)
         self.annex_impl(node)
@@ -140,9 +142,10 @@ class ImportPass(Pass):
                 if spec.origin in self.import_table:
                     return self.import_table[spec.origin]
                 with open(spec.origin, "r", encoding="utf-8") as f:
+                    # print(f"\nImporting python module {node.path_str}")
                     mod = PyastBuildPass(
                         input_ir=ast.PythonModuleAst(
-                            py_ast.parse(f.read()), mod_path=mod_path
+                            py_ast.parse(f.read()), mod_path=spec.origin
                         ),
                     ).ir
                 if mod:
@@ -157,4 +160,5 @@ class ImportPass(Pass):
                 f"Failed to import python module {node.path_str}: {e}",
                 node_override=node,
             )
+            raise e
         return None