jaclang 0.7.2__py3-none-any.whl → 0.7.7__py3-none-any.whl

jaclang/compiler/passes/main/pyast_gen_pass.py

@@ -42,7 +42,6 @@ class PyastGenPass(Pass):
         """Initialize pass."""
         self.debuginfo: dict[str, list[str]] = {"jac_mods": []}
         self.already_added: list[str] = []
-        self.method_sigs: list[ast.FuncSignature | ast.EventSignature] = []
         self.preamble: list[ast3.AST] = [
             self.sync(
                 ast3.ImportFrom(
@@ -393,7 +392,7 @@ class PyastGenPass(Pass):
                 args=self.sync(
                     ast3.arguments(
                         posonlyargs=[],
-                        args=[self.sync(ast3.arg(arg="check", annotation=None))],
+                        args=[self.sync(ast3.arg(arg="_jac_check", annotation=None))],
                         kwonlyargs=[],
                         vararg=None,
                         kwargs=None,
@@ -552,7 +551,7 @@ class PyastGenPass(Pass):
                                             arg="mod_bundle",
                                             value=self.sync(
                                                 ast3.Name(
-                                                    id="__jac_mod_bundle__",
+                                                    id="__name__",
                                                     ctx=ast3.Load(),
                                                 )
                                             ),
@@ -678,14 +677,6 @@ class PyastGenPass(Pass):
         doc: Optional[String],
         decorators: Optional[SubNodeList[ExprType]],
         """
-        # Record all signatures that are part of methods
-        for i in (
-            node.body.body.items
-            if isinstance(node.body, ast.ArchDef)
-            else node.body.items if node.body else []
-        ):
-            if isinstance(i, ast.Ability):
-                self.method_sigs.append(i.signature)
         if isinstance(node.body, ast.AstImplOnlyNode):
             self.traverse(node.body)
 
@@ -768,6 +759,18 @@ class PyastGenPass(Pass):
                 )
             )
         base_classes = node.base_classes.gen.py_ast if node.base_classes else []
+        if node.arch_type.name != Tok.KW_CLASS:
+            base_classes.append(
+                self.sync(
+                    ast3.Attribute(
+                        value=self.sync(
+                            ast3.Name(id=Con.JAC_FEATURE.value, ctx=ast3.Load())
+                        ),
+                        attr=node.arch_type.value.capitalize(),
+                        ctx=ast3.Load(),
+                    )
+                )
+            )
         if node.is_abstract:
             self.needs_jac_feature()
             base_classes.append(
@@ -1091,7 +1094,7 @@ class PyastGenPass(Pass):
                                 value=(
                                     node.signature.semstr.lit_value
                                     if node.signature.semstr
-                                    else None
+                                    else ""
                                 )
                             )
                         )
@@ -1333,7 +1336,7 @@ class PyastGenPass(Pass):
         """
         params = (
             [self.sync(ast3.arg(arg="self", annotation=None))]
-            if node in self.method_sigs and not node.is_static
+            if node.is_method and not node.is_static
             else []
         )
         vararg = None
@@ -1391,7 +1394,7 @@ class PyastGenPass(Pass):
                     posonlyargs=[],
                     args=(
                         [self.sync(ast3.arg(arg="self", annotation=None)), here]
-                        if node in self.method_sigs
+                        if node.is_method
                         else [here]
                     ),
                     kwonlyargs=[],
@@ -1409,27 +1412,19 @@ class PyastGenPass(Pass):
         name_ref: NameType,
         arch: Token,
         """
-        if node.arch.name == Tok.TYPE_OP:
+        if node.arch_type.name == Tok.TYPE_OP:
             if (
-                isinstance(node.name_ref, ast.SpecialVarRef)
-                and node.name_ref.var.name == Tok.KW_ROOT
+                isinstance(node.arch_name, ast.SpecialVarRef)
+                and node.arch_name.orig.name == Tok.KW_ROOT
             ):
                 node.gen.py_ast = [
                     self.sync(
-                        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(),
-                                )
+                        ast3.Attribute(
+                            value=self.sync(
+                                ast3.Name(id=Con.JAC_FEATURE.value, ctx=ast3.Load())
                             ),
-                            args=[],
-                            keywords=[],
+                            attr="RootType",
+                            ctx=ast3.Load(),
                         )
                     )
                 ]
@@ -1439,13 +1434,13 @@ class PyastGenPass(Pass):
                     self.sync(
                         ast3.Attribute(
                             value=self.sync(ast3.Name(id="_jac_typ", ctx=ast3.Load())),
-                            attr=node.name_ref.sym_name,
+                            attr=node.arch_name.sym_name,
                             ctx=ast3.Load(),
                         )
                     )
                 ]
         else:
-            node.gen.py_ast = node.name_ref.gen.py_ast
+            node.gen.py_ast = node.arch_name.gen.py_ast
 
     def exit_arch_ref_chain(self, node: ast.ArchRefChain) -> None:
         """Sub objects.
@@ -1463,7 +1458,7 @@ class PyastGenPass(Pass):
             attr = self.sync(
                 ast3.Attribute(
                     value=make_attr_chain(arch[:-1]),
-                    attr=cur.name_ref.sym_name,
+                    attr=cur.arch_name.sym_name,
                     ctx=ast3.Load(),
                 ),
                 jac_node=cur,
@@ -1881,6 +1876,38 @@ class PyastGenPass(Pass):
             )
         ]
 
+    def exit_check_stmt(self, node: ast.CheckStmt) -> None:
+        """Sub objects.
+
+        target: ExprType,
+        """
+        if isinstance(node.target, ast.FuncCall) and isinstance(
+            node.target.gen.py_ast[0], ast3.Call
+        ):
+            func = node.target.target.gen.py_ast[0]
+            if isinstance(func, ast3.Name):
+                new_func: ast3.expr = self.sync(
+                    ast3.Attribute(
+                        value=self.sync(ast3.Name(id="_jac_check", ctx=ast3.Load())),
+                        attr=func.id,
+                        ctx=ast3.Load(),
+                    )
+                )
+                node.target.gen.py_ast[0].func = new_func
+                node.gen.py_ast = [
+                    self.sync(
+                        ast3.Expr(
+                            value=node.target.gen.py_ast[0],
+                        )
+                    )
+                ]
+                return
+        self.error(
+            "For now, check statements must be function calls "
+            "in the style of assertTrue(), assertEqual(), etc.",
+            node,
+        )
+
     def exit_ctrl_stmt(self, node: ast.CtrlStmt) -> None:
         """Sub objects.
 
@@ -3090,14 +3117,42 @@ class PyastGenPass(Pass):
 
         var: Token,
         """
-        try:
-            var_ast_expr = ast3.parse(node.sym_name).body[0]
-            if not isinstance(var_ast_expr, ast3.Expr):
-                raise self.ice("Invalid special var ref for pyast generation")
-            var_ast = var_ast_expr.value
-        except Exception:
-            raise self.ice("Invalid special var ref for pyast generation")
-        node.gen.py_ast = [self.sync(var_ast, deep=True)]
+        if node.name == Tok.KW_SUPER:
+            node.gen.py_ast = [
+                self.sync(
+                    ast3.Call(
+                        func=self.sync(ast3.Name(id="super", ctx=node.py_ctx_func())),
+                        args=[],
+                        keywords=[],
+                    )
+                )
+            ]
+        elif node.name == Tok.KW_ROOT:
+            node.gen.py_ast = [
+                self.sync(
+                    ast3.Call(
+                        func=self.sync(
+                            ast3.Attribute(
+                                value=self.sync(
+                                    ast3.Name(
+                                        id=Con.JAC_FEATURE.value,
+                                        ctx=ast3.Load(),
+                                    )
+                                ),
+                                attr="get_root",
+                                ctx=ast3.Load(),
+                            )
+                        ),
+                        args=[],
+                        keywords=[],
+                    )
+                )
+            ]
+
+        else:
+            node.gen.py_ast = [
+                self.sync(ast3.Name(id=node.sym_name, ctx=node.py_ctx_func()))
+            ]
 
     def exit_edge_ref_trailer(self, node: ast.EdgeRefTrailer) -> None:
         """Sub objects.
@@ -3577,7 +3632,7 @@ class PyastGenPass(Pass):
                         [
                             x.key.sym_name
                             for x in node.kw_patterns.items
-                            if isinstance(x.key, ast.NameSpec)
+                            if isinstance(x.key, ast.NameAtom)
                         ]
                         if node.kw_patterns
                         else []

jaclang/compiler/passes/main/pyast_load_pass.py

@@ -150,6 +150,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 node.name if node.name != "root" else "root_"
             ),  # root is a reserved keyword
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name),
             pos_start=0,
@@ -262,6 +263,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.name,
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name),
             pos_start=0,
@@ -272,6 +274,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.KW_CLASS,
             value="class",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -284,17 +287,18 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 and isinstance(body_stmt.name_ref, ast.Name)
                 and body_stmt.name_ref.value == "__init__"
             ):
-                tok = ast.Token(
+                tok = ast.Name(
                     file_path=self.mod_path,
                     name=Tok.KW_INIT,
                     value="init",
                     line=node.lineno,
+                    end_line=node.end_lineno if node.end_lineno else node.lineno,
                     col_start=node.col_offset,
                     col_end=node.col_offset + len("init"),
                     pos_start=0,
                     pos_end=0,
                 )
-                body_stmt.name_ref = ast.SpecialVarRef(var=tok, kid=[tok])
+                body_stmt.name_ref = ast.SpecialVarRef(var=tok)
             if (
                 isinstance(body_stmt, ast.Ability)
                 and body_stmt.signature
@@ -373,17 +377,18 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                         converted_stmt.expr, ast.String
                     ):
                         continue
-                    tok = ast.Token(
+                    pintok = ast.Token(
                         file_path=self.mod_path,
                         name=Tok.PYNLINE,
                         value=py_ast.unparse(class_body_stmt),
                         line=node.lineno,
+                        end_line=node.end_lineno if node.end_lineno else node.lineno,
                         col_start=node.col_offset,
                         col_end=node.col_offset + len(py_ast.unparse(class_body_stmt)),
                         pos_start=0,
                         pos_end=0,
                     )
-                    valid_enum_body.append(ast.PyInlineCode(code=tok, kid=[tok]))
+                    valid_enum_body.append(ast.PyInlineCode(code=pintok, kid=[pintok]))
 
             valid_enum_body2: list[ast.EnumBlockStmt] = [
                 i for i in valid_enum_body if isinstance(i, ast.EnumBlockStmt)
@@ -903,17 +908,18 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             and isinstance(value.target, ast.Name)
             and value.target.value == "super"
         ):
-            tok = ast.Token(
+            tok = ast.Name(
                 file_path=self.mod_path,
                 name=Tok.KW_SUPER,
                 value="super",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + len("super"),
                 pos_start=0,
                 pos_end=0,
             )
-            value = ast.SpecialVarRef(var=tok, kid=[tok])
+            value = ast.SpecialVarRef(var=tok)
             # exit()
         attribute = ast.Name(
             file_path=self.mod_path,
@@ -924,6 +930,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 else "init" if node.attr == "__init__" else node.attr
             ),
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.attr),
             pos_start=0,
@@ -1030,6 +1037,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.KW_BREAK,
             value="break",
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -1144,6 +1152,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     else str(node.value)
                 ),
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + len(str(node.value)),
                 pos_start=0,
@@ -1155,6 +1164,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.ELLIPSIS,
                 value="...",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + 3,
                 pos_start=0,
@@ -1170,6 +1180,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.KW_CONTINUE,
             value="continue",
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -1246,6 +1257,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value="Exception",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + 9,
                 pos_start=0,
@@ -1256,6 +1268,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value="e",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + 1,
                 pos_start=0,
@@ -1267,6 +1280,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             #     name=Tok.NAME,
             #     value=no,
             #     line=node.lineno,
+            #     end_line = (node.end_lineno if node.end_lineno else node.lineno,)
             #     col_start=node.col_offset,
             #     col_end=node.col_offset + 9,
             #     pos_start=0,
@@ -1278,6 +1292,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     name=Tok.NAME,
                     value=node.name,
                     line=node.lineno,
+                    end_line=node.end_lineno if node.end_lineno else node.lineno,
                     col_start=node.col_offset,
                     col_end=node.col_offset + len(node.name),
                     pos_start=0,
@@ -1369,7 +1384,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         class Global(stmt):
             names: list[_Identifier]
         """
-        names: list[ast.NameSpec] = []
+        names: list[ast.NameAtom] = []
         for id in node.names:
             names.append(
                 ast.Name(
@@ -1377,13 +1392,14 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     name=Tok.NAME,
                     value=id,
                     line=node.lineno,
+                    end_line=node.end_lineno if node.end_lineno else node.lineno,
                     col_start=node.col_offset,
                     col_end=node.col_offset + len(id),
                     pos_start=0,
                     pos_end=0,
                 )
             )
-        target = ast.SubNodeList[ast.NameSpec](items=names, delim=Tok.COMMA, kid=names)
+        target = ast.SubNodeList[ast.NameAtom](items=names, delim=Tok.COMMA, kid=names)
         return ast.GlobalStmt(target=target, kid=[target])
 
     def proc_if_exp(self, node: py_ast.IfExp) -> ast.IfElseExpr:
@@ -1439,6 +1455,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value="py",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=0,
             pos_start=0,
@@ -1468,6 +1485,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value="py",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=0,
             pos_start=0,
@@ -1482,6 +1500,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                         name=Tok.NAME,
                         value=i,
                         line=node.lineno,
+                        end_line=node.end_lineno if node.end_lineno else node.lineno,
                         col_start=0,
                         col_end=0,
                         pos_start=0,
@@ -1643,6 +1662,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.name if node.name else "_",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=(
                 (node.col_offset + len(node.name))
@@ -1696,6 +1716,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                         name=Tok.NAME,
                         value=kwd_attrs,
                         line=node.lineno,
+                        end_line=node.end_lineno if node.end_lineno else node.lineno,
                         col_start=node.col_offset,
                         col_end=node.col_offset + len(kwd_attrs),
                         pos_start=0,
@@ -1720,7 +1741,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             kid.append(kw_patterns)
         else:
             kw_patterns = None
-        if isinstance(cls, (ast.NameSpec, ast.AtomTrailer)):
+        if isinstance(cls, (ast.NameAtom, ast.AtomTrailer)):
             return ast.MatchArch(
                 name=cls, arg_patterns=patterns_sub, kw_patterns=kw_patterns, kid=kid
             )
@@ -1738,7 +1759,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         values: list[ast.MatchKVPair | ast.MatchStar] = []
         keys = [self.convert(i) for i in node.keys]
         valid_keys = [
-            i for i in keys if isinstance(i, (ast.MatchPattern, ast.NameSpec))
+            i for i in keys if isinstance(i, (ast.MatchPattern, ast.NameAtom))
         ]
         patterns = [self.convert(i) for i in node.patterns]
         valid_patterns = [i for i in patterns if isinstance(i, ast.MatchPattern)]
@@ -1755,6 +1776,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value=node.rest,
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + len(node.rest),
                 pos_start=0,
@@ -1799,6 +1821,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=type,
             value=str(node.value),
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(str(node.value)),
             pos_start=0,
@@ -1820,6 +1843,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.name if node.name else "_",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name if node.name else "_"),
             pos_start=0,
@@ -1853,6 +1877,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.id if node.id != "root" else "root_",  # reserved word
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.id),
             pos_start=0,
@@ -1885,7 +1910,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         class Nonlocal(stmt):
             names: list[_Identifier]
         """
-        names: list[ast.NameSpec] = []
+        names: list[ast.NameAtom] = []
         for name in node.names:
             names.append(
                 ast.Name(
@@ -1893,13 +1918,14 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     name=Tok.NAME,
                     value=name if name != "root" else "root_",
                     line=node.lineno,
+                    end_line=node.end_lineno if node.end_lineno else node.lineno,
                     col_start=node.col_offset,
                     col_end=node.col_offset + len(name),
                     pos_start=0,
                     pos_end=0,
                 )
             )
-        target = ast.SubNodeList[ast.NameSpec](items=names, delim=Tok.COMMA, kid=names)
+        target = ast.SubNodeList[ast.NameAtom](items=names, delim=Tok.COMMA, kid=names)
         return ast.NonLocalStmt(target=target, kid=names)
 
     def proc_pass(self, node: py_ast.Pass) -> ast.Semi:
@@ -1909,6 +1935,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.SEMI,
             value=";",
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -2176,6 +2203,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.name,
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name),
             pos_start=0,
@@ -2187,6 +2215,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value=node.asname,
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + len(node.asname),
                 pos_start=0,
@@ -2211,6 +2240,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.arg if node.arg != "root" else "root_",  # reserved word
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.arg),
             pos_start=0,
@@ -2224,6 +2254,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value="Any",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + 3,
                 pos_start=0,
@@ -2257,6 +2288,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.STAR_MUL,
                 value="*",
                 line=vararg.loc.first_line,
+                end_line=vararg.loc.last_line,
                 col_start=vararg.loc.col_start,
                 col_end=vararg.loc.col_end,
                 pos_start=0,
@@ -2282,6 +2314,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.STAR_POW,
                 value="**",
                 line=kwarg.loc.first_line,
+                end_line=kwarg.loc.last_line,
                 col_start=kwarg.loc.col_start,
                 col_end=kwarg.loc.col_end,
                 pos_start=0,
@@ -2327,6 +2360,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=tok,
             value=value,
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -2491,6 +2525,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.arg if node.arg else "_",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.arg if node.arg else "_"),
             pos_start=0,

jaclang/compiler/passes/main/pyjac_ast_link_pass.py

@@ -57,10 +57,13 @@ class PyJacAstLinkPass(Pass):
         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)
+            if i.name_spec.name_of.sym:
                 self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
+                    jac_node=i, py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast
+                )
+                self.link_jac_py_nodes(
+                    jac_node=i.name_spec,
+                    py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast,
                 )
 
     def exit_enum(self, node: ast.Enum) -> None:
@@ -85,10 +88,13 @@ class PyJacAstLinkPass(Pass):
         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)
+            if i.name_spec.name_of.sym:
+                self.link_jac_py_nodes(
+                    jac_node=i, py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast
+                )
                 self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
+                    jac_node=i.name_spec,
+                    py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast,
                 )
 
     def exit_ability(self, node: ast.Ability) -> None:
@@ -119,10 +125,13 @@ class PyJacAstLinkPass(Pass):
         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)
+            if i.name_spec.name_of.sym:
+                self.link_jac_py_nodes(
+                    jac_node=i, py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast
+                )
                 self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
+                    jac_node=i.name_spec,
+                    py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast,
                 )
 
         if isinstance(node.parent, ast.Ability) and node.parent.signature:
@@ -219,5 +228,5 @@ class PyJacAstLinkPass(Pass):
         """
         if node.is_attr and isinstance(node.right, ast.AstSymbolNode):
             self.link_jac_py_nodes(
-                jac_node=node.right.sym_name_node, py_nodes=node.gen.py_ast
+                jac_node=node.right.name_spec, py_nodes=node.gen.py_ast
             )