jaclang 0.5.18__py3-none-any.whl → 0.6.1__py3-none-any.whl

jaclang/compiler/passes/main/pyast_gen_pass.py

@@ -19,8 +19,6 @@ T = TypeVar("T", bound=ast3.AST)
 class PyastGenPass(Pass):
     """Jac blue transpilation to python pass."""
 
-    cout = 1
-
     @staticmethod
     def node_compilable_test(node: ast3.AST) -> None:
         """Convert any AST node to a compilable module node."""
@@ -214,25 +212,18 @@ class PyastGenPass(Pass):
                 i.end_lineno = (
                     jac_node.loc.last_line
                     if jac_node.loc.last_line
+                    and (jac_node.loc.last_line > jac_node.loc.first_line)
                     else jac_node.loc.first_line
                 )
                 i.end_col_offset = (
                     jac_node.loc.col_end
                     if jac_node.loc.col_end
+                    and (jac_node.loc.col_end > jac_node.loc.col_start)
                     else jac_node.loc.col_start
                 )
                 i.jac_link: list[ast3.AST] = [jac_node]  # type: ignore
         return py_node
 
-    def link_jac_py_nodes(
-        self, jac_node: ast.AstNode, py_nodes: list[ast3.AST]
-    ) -> None:
-        """Link jac name ast to py ast nodes."""
-        jac_node.gen.py_ast = py_nodes
-        for i in py_nodes:
-            if isinstance(i.jac_link, list):  # type: ignore
-                i.jac_link.append(jac_node)  # type: ignore
-
     def pyinline_sync(
         self,
         py_nodes: list[ast3.AST],
@@ -329,7 +320,10 @@ class PyastGenPass(Pass):
         is_imported: bool,
         """
         clean_body = [i for i in node.body if not isinstance(i, ast.AstImplOnlyNode)]
-        pre_body = [*node.impl_mod.body, *clean_body] if node.impl_mod else clean_body
+        pre_body: list[ast.AstNode] = []
+        for pbody in node.impl_mod:
+            pre_body = [*pre_body, *pbody.body]
+        pre_body = [*pre_body, *clean_body]
         pre_body = [*pre_body, *node.test_mod.body] if node.test_mod else pre_body
         body = (
             [
@@ -611,9 +605,10 @@ class PyastGenPass(Pass):
                 )
             )
             if node.items:
-                self.warning(
-                    "Includes import * in target module into current namespace."
-                )
+                pass
+                # self.warning(
+                #     "Includes import * in target module into current namespace."
+                # )
         if not node.from_loc:
             py_nodes.append(self.sync(ast3.Import(names=node.items.gen.py_ast)))
         else:
@@ -647,8 +642,6 @@ class PyastGenPass(Pass):
                 )
             )
         ]
-        if node.alias:
-            self.link_jac_py_nodes(jac_node=node.alias, py_nodes=node.gen.py_ast)
 
     def exit_module_item(self, node: ast.ModuleItem) -> None:
         """Sub objects.
@@ -676,8 +669,6 @@ class PyastGenPass(Pass):
         doc: Optional[String],
         decorators: Optional[SubNodeList[ExprType]],
         """
-        self.needs_jac_feature()
-        self.needs_dataclass()
         body = self.resolve_stmt_block(
             node.body.body if isinstance(node.body, ast.ArchDef) else node.body,
             doc=node.doc,
@@ -689,6 +680,8 @@ class PyastGenPass(Pass):
         )
         ds_on_entry, ds_on_exit = self.collect_events(node)
         if node.arch_type.name != Tok.KW_CLASS:
+            self.needs_jac_feature()
+            self.needs_dataclass()
             decorators.append(
                 self.sync(
                     ast3.Call(
@@ -723,24 +716,26 @@ class PyastGenPass(Pass):
                     )
                 )
             )
-        decorators.append(
-            self.sync(
-                ast3.Call(
-                    func=self.sync(ast3.Name(id="__jac_dataclass__", ctx=ast3.Load())),
-                    args=[],
-                    keywords=[
-                        self.sync(
-                            ast3.keyword(
-                                arg="eq",
-                                value=self.sync(
-                                    ast3.Constant(value=False),
-                                ),
+            decorators.append(
+                self.sync(
+                    ast3.Call(
+                        func=self.sync(
+                            ast3.Name(id="__jac_dataclass__", ctx=ast3.Load())
+                        ),
+                        args=[],
+                        keywords=[
+                            self.sync(
+                                ast3.keyword(
+                                    arg="eq",
+                                    value=self.sync(
+                                        ast3.Constant(value=False),
+                                    ),
+                                )
                             )
-                        )
-                    ],
+                        ],
+                    )
                 )
             )
-        )
         base_classes = node.base_classes.gen.py_ast if node.base_classes else []
         if node.is_abstract:
             self.needs_jac_feature()
@@ -773,9 +768,6 @@ class PyastGenPass(Pass):
                 )
             )
         ]
-        self.link_jac_py_nodes(jac_node=node.name, py_nodes=node.gen.py_ast)
-        if isinstance(node.body, ast.ArchDef):
-            self.link_jac_py_nodes(jac_node=node.body, py_nodes=node.gen.py_ast)
 
     def collect_events(
         self, node: ast.Architype
@@ -828,12 +820,6 @@ class PyastGenPass(Pass):
         doc: Optional[String],
         decorators: Optional[SubNodeList[ExprType]],
         """
-        for i in node.target.archs:
-            if i.sym_link:
-                self.link_jac_py_nodes(jac_node=i, py_nodes=i.sym_link.decl.gen.py_ast)
-                self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
-                )
 
     def exit_enum(self, node: ast.Enum) -> None:
         """Sub objects.
@@ -874,8 +860,6 @@ class PyastGenPass(Pass):
                 )
             )
         ]
-        if isinstance(node.body, ast.EnumDef):
-            self.link_jac_py_nodes(jac_node=node.body, py_nodes=node.gen.py_ast)
 
     def exit_enum_def(self, node: ast.EnumDef) -> None:
         """Sub objects.
@@ -885,12 +869,6 @@ class PyastGenPass(Pass):
         doc: Optional[String],
         decorators: Optional[SubNodeList[ExprType]],
         """
-        for i in node.target.archs:
-            if i.sym_link:
-                self.link_jac_py_nodes(jac_node=i, py_nodes=i.sym_link.decl.gen.py_ast)
-                self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
-                )
 
     def exit_ability(self, node: ast.Ability) -> None:
         """Sub objects.
@@ -992,9 +970,6 @@ class PyastGenPass(Pass):
                 )
             )
         ]
-        self.link_jac_py_nodes(jac_node=node.name_ref, py_nodes=node.gen.py_ast)
-        if isinstance(node.body, ast.AbilityDef):
-            self.link_jac_py_nodes(jac_node=node.body, py_nodes=node.gen.py_ast)
 
     def gen_llm_body(self, node: ast.Ability) -> list[ast3.AST]:
         """Generate llm body."""
@@ -1065,7 +1040,11 @@ class PyastGenPass(Pass):
                 if isinstance(node.signature, ast.FuncSignature)
                 else []
             )
-            action = node.semstr.gen.py_ast[0] if node.semstr else None
+            action = (
+                node.semstr.gen.py_ast[0]
+                if node.semstr
+                else self.sync(ast3.Constant(value=None))
+            )
             return [
                 self.sync(
                     ast3.Assign(
@@ -1284,15 +1263,6 @@ class PyastGenPass(Pass):
         doc: Optional[String],
         decorators: Optional[SubNodeList[ExprType]],
         """
-        for i in node.target.archs:
-            if i.sym_link:
-                self.link_jac_py_nodes(jac_node=i, py_nodes=i.sym_link.decl.gen.py_ast)
-                self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
-                )
-        if isinstance(node.parent, ast.Ability) and node.parent.signature:
-            # TODO: Here we need to do a link for each subnode to the original parent signature
-            pass
 
     def exit_func_signature(self, node: ast.FuncSignature) -> None:
         """Sub objects.
@@ -1385,12 +1355,20 @@ class PyastGenPass(Pass):
             ):
                 node.gen.py_ast = [
                     self.sync(
-                        ast3.Attribute(
-                            value=self.sync(
-                                ast3.Name(id=Con.JAC_FEATURE.value, ctx=ast3.Load())
+                        ast3.Call(
+                            func=self.sync(
+                                ast3.Attribute(
+                                    value=self.sync(
+                                        ast3.Name(
+                                            id=Con.JAC_FEATURE.value, ctx=ast3.Load()
+                                        )
+                                    ),
+                                    attr="get_root_type",
+                                    ctx=ast3.Load(),
+                                )
                             ),
-                            attr="RootType",
-                            ctx=ast3.Load(),
+                            args=[],
+                            keywords=[],
                         )
                     )
                 ]
@@ -1449,7 +1427,6 @@ class PyastGenPass(Pass):
                 )
             )
         ]
-        self.link_jac_py_nodes(jac_node=node.name, py_nodes=node.gen.py_ast)
 
     def exit_arch_has(self, node: ast.ArchHas) -> None:
         """Sub objects.
@@ -1705,8 +1682,6 @@ class PyastGenPass(Pass):
                 )
             )
         ]
-        if node.name:
-            self.link_jac_py_nodes(jac_node=node.name, py_nodes=node.gen.py_ast)
 
     def exit_finally_stmt(self, node: ast.FinallyStmt) -> None:
         """Sub objects.
@@ -1814,9 +1789,6 @@ class PyastGenPass(Pass):
                 )
             )
         ]
-        self.link_jac_py_nodes(jac_node=node.expr, py_nodes=node.gen.py_ast)
-        if node.alias:
-            self.link_jac_py_nodes(jac_node=node.alias, py_nodes=node.gen.py_ast)
 
     def exit_raise_stmt(self, node: ast.RaiseStmt) -> None:
         """Sub objects.
@@ -2074,7 +2046,6 @@ class PyastGenPass(Pass):
                     jac_node=x,
                 )
             )
-            self.link_jac_py_nodes(jac_node=x, py_nodes=[py_nodes[-1]])
         node.gen.py_ast = [*py_nodes]
 
     def exit_non_local_stmt(self, node: ast.NonLocalStmt) -> None:
@@ -2090,7 +2061,6 @@ class PyastGenPass(Pass):
                     jac_node=x,
                 )
             )
-            self.link_jac_py_nodes(jac_node=x, py_nodes=[py_nodes[-1]])
         node.gen.py_ast = [*py_nodes]
 
     def exit_assignment(self, node: ast.Assignment) -> None:
@@ -2632,8 +2602,6 @@ class PyastGenPass(Pass):
                 )
             )
         ]
-        if node.key:
-            self.link_jac_py_nodes(jac_node=node.key, py_nodes=node.gen.py_ast)
 
     def exit_inner_compr(self, node: ast.InnerCompr) -> None:
         """Sub objects.
@@ -2743,9 +2711,6 @@ class PyastGenPass(Pass):
                         )
                     )
                 ]
-                self.link_jac_py_nodes(
-                    jac_node=node.right.sym_name_node, py_nodes=node.gen.py_ast
-                )
             else:
                 self.error("Invalid attribute access")
         elif isinstance(node.right, ast.FilterCompr):
@@ -3010,7 +2975,6 @@ class PyastGenPass(Pass):
                     for kw_pair in node.params.items
                     if isinstance(kw_pair, ast.KWPair)
                 ]
-                self.cout += 1
             else:
                 inputs = []