jaclang 0.7.23__py3-none-any.whl → 0.7.25__py3-none-any.whl

jaclang/compiler/passes/main/pyast_load_pass.py

@@ -22,6 +22,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
     def __init__(self, input_ir: ast.PythonModuleAst) -> None:
         """Initialize parser."""
         self.mod_path = input_ir.loc.mod_path
+        self.orig_src = input_ir.loc.orig_src
         Pass.__init__(self, input_ir=input_ir, prior=None)
 
     def nu(self, node: T) -> T:
@@ -151,7 +152,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
 
         value = node.name if node.name not in reserved_keywords else f"<>{node.name}"
         name = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=value,
             line=node.lineno,
@@ -264,7 +265,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             type_params: list[type_param]
         """
         name = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=node.name,
             line=node.lineno,
@@ -275,7 +276,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             pos_end=0,
         )
         arch_type = ast.Token(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.KW_CLASS,
             value="class",
             line=node.lineno,
@@ -293,7 +294,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 and body_stmt.name_ref.value == "__init__"
             ):
                 tok = ast.Name(
-                    file_path=self.mod_path,
+                    orig_src=self.orig_src,
                     name=Tok.KW_INIT,
                     value="init",
                     line=node.lineno,
@@ -383,7 +384,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     ):
                         continue
                     pintok = ast.Token(
-                        file_path=self.mod_path,
+                        orig_src=self.orig_src,
                         name=Tok.PYNLINE,
                         value=py_ast.unparse(class_body_stmt),
                         line=node.lineno,
@@ -914,7 +915,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             and value.target.value == "super"
         ):
             tok = ast.Name(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.KW_SUPER,
                 value="super",
                 line=node.lineno,
@@ -927,7 +928,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             value = ast.SpecialVarRef(var=tok)
             # exit()
         attribute = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=(
                 ("<>" + node.attr)
@@ -1038,7 +1039,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
     def proc_break(self, node: py_ast.Break) -> ast.CtrlStmt:
         """Process python node."""
         break_tok = ast.Token(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.KW_BREAK,
             value="break",
             line=0,
@@ -1155,7 +1156,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             else:
                 value = str(node.value)
             return type_mapping[value_type](
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=token_type,
                 value=value,
                 line=node.lineno,
@@ -1167,7 +1168,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             )
         elif node.value == Ellipsis:
             return ast.Ellipsis(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.ELLIPSIS,
                 value="...",
                 line=node.lineno,
@@ -1183,7 +1184,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
     def proc_continue(self, node: py_ast.Continue) -> ast.CtrlStmt:
         """Process python node."""
         continue_tok = ast.Token(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.KW_CONTINUE,
             value="continue",
             line=0,
@@ -1260,7 +1261,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         name: ast.Name | None = None
         if not type and not node.name:
             type = ast.Name(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.NAME,
                 value="Exception",
                 line=node.lineno,
@@ -1271,7 +1272,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 pos_end=0,
             )
             name = ast.Name(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.NAME,
                 value="e",
                 line=node.lineno,
@@ -1283,7 +1284,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             )
         else:
             # type = ast.Name(
-            #     file_path=self.mod_path,
+            #     orig_src=self.orig_src,
             #     name=Tok.NAME,
             #     value=no,
             #     line=node.lineno,
@@ -1295,7 +1296,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             # )
             name = (
                 ast.Name(
-                    file_path=self.mod_path,
+                    orig_src=self.orig_src,
                     name=Tok.NAME,
                     value=node.name,
                     line=node.lineno,
@@ -1395,7 +1396,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         for id in node.names:
             names.append(
                 ast.Name(
-                    file_path=self.mod_path,
+                    orig_src=self.orig_src,
                     name=Tok.NAME,
                     value=id,
                     line=node.lineno,
@@ -1458,7 +1459,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             else:
                 raise self.ice()
         lang = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value="py",
             line=node.lineno,
@@ -1488,7 +1489,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             level: int
         """
         lang = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value="py",
             line=node.lineno,
@@ -1503,7 +1504,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             for i in node.module.split("."):
                 modpaths.append(
                     ast.Name(
-                        file_path=self.mod_path,
+                        orig_src=self.orig_src,
                         name=Tok.NAME,
                         value=i,
                         line=node.lineno,
@@ -1667,7 +1668,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         """
         pattern = self.convert(node.pattern) if node.pattern else None
         name = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=node.name if node.name else "_",
             line=node.lineno,
@@ -1721,7 +1722,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             for kwd_attrs in node.kwd_attrs:
                 names.append(
                     ast.Name(
-                        file_path=self.mod_path,
+                        orig_src=self.orig_src,
                         name=Tok.NAME,
                         value=kwd_attrs,
                         line=node.lineno,
@@ -1781,7 +1782,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             values.append(kv_pair)
         if node.rest:
             name = ast.Name(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.NAME,
                 value=node.rest,
                 line=node.lineno,
@@ -1826,7 +1827,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         type = Tok.NULL if node.value is None else Tok.BOOL
         ret_type = ast.Null if node.value is None else ast.Bool
         value = ret_type(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=type,
             value=str(node.value),
             line=node.lineno,
@@ -1848,7 +1849,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name: _Identifier | None
         """
         name = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=node.name if node.name else "_",
             line=node.lineno,
@@ -1891,7 +1892,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
 
         value = node.id if node.id not in reserved_keywords else f"<>{node.id}"
         ret = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=value,
             line=node.lineno,
@@ -1937,7 +1938,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             value = name if name not in reserved_keywords else f"<>{name}"
             names.append(
                 ast.Name(
-                    file_path=self.mod_path,
+                    orig_src=self.orig_src,
                     name=Tok.NAME,
                     value=value,
                     line=node.lineno,
@@ -1954,7 +1955,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
     def proc_pass(self, node: py_ast.Pass) -> ast.Semi:
         """Process python node."""
         return ast.Semi(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.SEMI,
             value=";",
             line=0,
@@ -2222,7 +2223,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             asname: _Identifier | None
         """
         name = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=node.name,
             line=node.lineno,
@@ -2234,7 +2235,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         )
         asname = (
             ast.Name(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.NAME,
                 value=node.asname,
                 line=node.lineno,
@@ -2268,7 +2269,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
 
         value = node.arg if node.arg not in reserved_keywords else f"<>{node.arg}"
         name = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=value,
             line=node.lineno,
@@ -2282,7 +2283,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             self.convert(node.annotation)
             if node.annotation
             else ast.Name(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.NAME,
                 value="Any",
                 line=node.lineno,
@@ -2316,7 +2317,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         vararg = self.convert(node.vararg) if node.vararg else None
         if vararg and isinstance(vararg, ast.ParamVar):
             vararg.unpack = ast.Token(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.STAR_MUL,
                 value="*",
                 line=vararg.loc.first_line,
@@ -2342,7 +2343,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         kwarg = self.convert(node.kwarg) if node.kwarg else None
         if kwarg and isinstance(kwarg, ast.ParamVar):
             kwarg.unpack = ast.Token(
-                file_path=self.mod_path,
+                orig_src=self.orig_src,
                 name=Tok.STAR_POW,
                 value="**",
                 line=kwarg.loc.first_line,
@@ -2388,7 +2389,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
     def operator(self, tok: Tok, value: str) -> ast.Token:
         """Create an operator token."""
         return ast.Token(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=tok,
             value=value,
             line=0,
@@ -2553,7 +2554,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         value: expr
         """
         arg = ast.Name(
-            file_path=self.mod_path,
+            orig_src=self.orig_src,
             name=Tok.NAME,
             value=node.arg if node.arg else "_",
             line=node.lineno,

jaclang/compiler/passes/main/pyjac_ast_link_pass.py

@@ -134,14 +134,14 @@ class PyJacAstLinkPass(Pass):
                     py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast,
                 )
 
-        if isinstance(node.parent, ast.Ability) and node.parent.signature:
+        if isinstance(node.decl_link, ast.Ability) and node.decl_link.signature:
             if isinstance(node.signature, ast.FuncSignature) and node.signature.params:
                 for src_prm in node.signature.params.items:
                     if (
-                        isinstance(node.parent.signature, ast.FuncSignature)
-                        and node.parent.signature.params
+                        isinstance(node.decl_link.signature, ast.FuncSignature)
+                        and node.decl_link.signature.params
                     ):
-                        for trg_prm in node.parent.signature.params.items:
+                        for trg_prm in node.decl_link.signature.params.items:
                             if src_prm.name.sym_name == trg_prm.name.sym_name:
                                 self.link_jac_py_nodes(
                                     jac_node=src_prm, py_nodes=trg_prm.gen.py_ast
@@ -154,12 +154,12 @@ class PyJacAstLinkPass(Pass):
                 isinstance(node.signature, ast.FuncSignature)
                 and node.signature.return_type
             ) and (
-                isinstance(node.parent.signature, ast.FuncSignature)
-                and node.parent.signature.return_type
+                isinstance(node.decl_link.signature, ast.FuncSignature)
+                and node.decl_link.signature.return_type
             ):
                 self.link_jac_py_nodes(
                     jac_node=node.signature.return_type,
-                    py_nodes=node.parent.signature.return_type.gen.py_ast,
+                    py_nodes=node.decl_link.signature.return_type.gen.py_ast,
                 )
 
         if isinstance(node.decl_link, ast.Ability) and isinstance(

jaclang/compiler/passes/main/registry_pass.py

@@ -6,11 +6,7 @@ semstrings after PyASTGen pass. So we create those as a pickled file for
 each module
 """
 
-import os
-import pickle
-
 import jaclang.compiler.absyntree as ast
-from jaclang.compiler.constant import Constants as Con
 from jaclang.compiler.passes import Pass
 from jaclang.compiler.semtable import SemInfo, SemRegistry
 from jaclang.runtimelib.utils import get_sem_scope
@@ -33,15 +29,10 @@ class RegistryPass(Pass):
     def exit_module(self, node: ast.Module) -> None:
         """Save registry for each module."""
         module_name = node.name
-        module_dir = os.path.join(
-            os.path.abspath(os.path.dirname(node.source.file_path)), Con.JAC_GEN_DIR
-        )
         try:
-            os.makedirs(module_dir, exist_ok=True)
-            with open(
-                os.path.join(module_dir, f"{module_name}.registry.pkl"), "wb"
-            ) as f:
-                pickle.dump(node.registry, f)
+            from jaclang.runtimelib.machine import JacMachine
+
+            JacMachine.get().get_sem_ir(node.registry)
         except Exception as e:
             self.warning(f"Can't save registry for {module_name}: {e}")
         self.modules_visited.pop()

jaclang/compiler/passes/main/tests/fixtures/defn_decl_mismatch.jac

@@ -0,0 +1,19 @@
+
+
+obj SomeObj {
+    can foo(param1: str, param2:int) -> str;
+    can bar(param1: str, param2:int) -> str;
+}
+
+
+# Miss match parameter count.
+:obj:SomeObj:can:foo(param1: str) -> str {
+    return "foo";
+}
+
+
+# Mis matching parameter name.
+:obj:SomeObj:can:bar(param1: str, praam2:int) -> str {
+    return "bar";
+}
+

jaclang/compiler/passes/main/tests/fixtures/fstrings.jac

@@ -42,6 +42,8 @@ with entry {
         len(f_s1), len(f_s2)
     ) ;
     """sdfsdf\nsdfsdfsdfsd dffgdfgd.""" ;
+    c1 = '''hello klkl"""''';
+    print(c1) ;
 }
 can func() {;
 }

jaclang/compiler/passes/main/tests/test_decl_def_match_pass.py

@@ -13,6 +13,65 @@ class DeclImplMatchPassTests(TestCase):
         """Set up test."""
         return super().setUp()
 
+    def test_parameter_count_mismatch(self) -> None:
+        """Basic test for pass."""
+        state = jac_file_to_pass(
+            self.fixture_abs_path("defn_decl_mismatch.jac"), DeclImplMatchPass
+        )
+
+        expected_stdout_values = (
+            "Parameter count mismatch for ability (o)SomeObj.(c)foo.",
+            "    8 |",
+            "    9 | # Miss match parameter count.",
+            "   10 | :obj:SomeObj:can:foo(param1: str) -> str {",
+            "      | ^^^^^^^^^^^^^^^^^^^^",
+            '   11 |     return "foo";',
+            "   12 | }",
+            "From the declaration of foo.",
+            "    2 |",
+            "    3 | obj SomeObj {",
+            "    4 |     can foo(param1: str, param2:int) -> str;",
+            "      |         ^^^",
+            "    5 |     can bar(param1: str, param2:int) -> str;",
+            "    6 | }",
+        )
+
+        errors_output = ""
+        for error in state.errors_had:
+            errors_output += error.pretty_print() + "\n"
+
+        for exp in expected_stdout_values:
+            self.assertIn(exp, errors_output)
+
+    def test_parameter_name_mismatch(self) -> None:
+        """Basic test for pass."""
+        state = jac_file_to_pass(
+            self.fixture_abs_path("defn_decl_mismatch.jac"), DeclImplMatchPass
+        )
+
+        expected_stdout_values = (
+            "Parameter name mismatch for ability (o)SomeObj.(c)bar.",
+            "   14 |",
+            "   15 | # Mis matching parameter name.",
+            "   16 | :obj:SomeObj:can:bar(param1: str, praam2:int) -> str {",
+            "      |                                   ^^^^^^",
+            '   17 |     return "bar";',
+            "   18 | }",
+            "From the declaration of bar.",
+            "    3 | obj SomeObj {",
+            "    4 |     can foo(param1: str, param2:int) -> str;",
+            "    5 |     can bar(param1: str, param2:int) -> str;",
+            "      |                          ^^^^^^",
+            "    6 | }",
+        )
+
+        errors_output = ""
+        for error in state.errors_had:
+            errors_output += error.pretty_print() + "\n"
+
+        for exp in expected_stdout_values:
+            self.assertIn(exp, errors_output)
+
     def test_ability_connected_to_decl(self) -> None:
         """Basic test for pass."""
         state = jac_file_to_pass(self.fixture_abs_path("base.jac"), DeclImplMatchPass)

jaclang/compiler/passes/main/tests/test_registry_pass.py

@@ -10,6 +10,7 @@ from jaclang.utils.test import TestCase
 class RegistryPassTests(TestCase):
     """Test pass module."""
 
+    # Need change
     def setUp(self) -> None:
         """Set up test."""
         return super().setUp()
@@ -18,7 +19,7 @@ class RegistryPassTests(TestCase):
         """Basic test for pass."""
         state = jac_file_to_pass(self.fixture_abs_path("registry.jac"), RegistryPass)
         self.assertFalse(state.errors_had)
-        self.assertTrue(
+        self.assertFalse(
             os.path.exists(
                 os.path.join(
                     os.path.dirname(self.fixture_abs_path("registry.jac")),
@@ -27,13 +28,4 @@ class RegistryPassTests(TestCase):
                 )
             )
         )
-        self.assertTrue(
-            os.path.exists(
-                os.path.join(
-                    os.path.dirname(self.fixture_abs_path("registry.jac")),
-                    "__jac_gen__",
-                    "fstrings.registry.pkl",
-                )
-            )
-        )
         self.assertIn("109", str(state.ir.to_dict()))

jaclang/compiler/passes/main/tests/test_type_check_pass.py

@@ -59,6 +59,6 @@ class MypyTypeCheckPassTests(TestCase):
         self.assertIn("HasVar - species - Type: builtins.str", out)
         self.assertIn("myDog - Type: type_info.Dog", out)
         self.assertIn("Body - Type: type_info.Dog.Body", out)
-        self.assertEqual(out.count("Type: builtins.str"), 34)
+        self.assertEqual(out.count("Type: builtins.str"), 35)
         for i in lis:
             self.assertNotIn(i, out)

jaclang/compiler/passes/transform.py

@@ -7,6 +7,7 @@ from typing import Generic, Optional, Type
 
 from jaclang.compiler.absyntree import AstNode, T
 from jaclang.compiler.codeloc import CodeLocInfo
+from jaclang.utils.helpers import pretty_print_source_location
 from jaclang.utils.log import logging
 
 
@@ -28,7 +29,30 @@ class Alert:
 
     def __repr__(self) -> str:
         """Return string representation of alert."""
-        return self.__str__()
+        return self.as_log()
+
+    def as_log(self) -> str:
+        """Return the alert as a single line log as opposed to the pretty print."""
+        file_path: str = self.loc.mod_path
+        if file_path == "":
+            return self.msg  # There are error messages without file references.
+
+        line: int = self.loc.first_line
+        column: int = self.loc.col_start
+        return f"{file_path}:{line}:{column} {self.msg}"
+
+    def pretty_print(self) -> str:
+        """Pretty pritns the Alert to show the alert with source location."""
+        pretty_dump = pretty_print_source_location(
+            self.loc.mod_path,
+            self.loc.orig_src.code,
+            self.loc.first_line,
+            self.loc.pos_start,
+            self.loc.pos_end,
+        )
+        if pretty_dump != "":
+            pretty_dump = "\n" + pretty_dump
+        return self.as_log() + pretty_dump
 
 
 class Transform(ABC, Generic[T]):
@@ -59,7 +83,7 @@ class Transform(ABC, Generic[T]):
             self.__class__,
         )
         self.errors_had.append(alrt)
-        self.logger.error(str(alrt))
+        self.logger.error(alrt.as_log())
 
     def log_warning(self, msg: str, node_override: Optional[AstNode] = None) -> None:
         """Pass Error."""
@@ -69,7 +93,7 @@ class Transform(ABC, Generic[T]):
             self.__class__,
         )
         self.warnings_had.append(alrt)
-        self.logger.warning(str(alrt))
+        self.logger.warning(alrt.as_log())
 
     def log_info(self, msg: str) -> None:
         """Log info."""