jaclang 0.7.27__py3-none-any.whl → 0.7.30__py3-none-any.whl

jaclang/plugin/spec.py

@@ -345,6 +345,7 @@ class JacFeatureSpec(
     @hookspec(firstresult=True)
     def run_test(
         filepath: str,
+        func_name: Optional[str],
         filter: Optional[str],
         xit: bool,
         maxfail: Optional[int],
@@ -354,12 +355,6 @@ class JacFeatureSpec(
         """Run the test suite in the specified .jac file."""
         raise NotImplementedError
 
-    @staticmethod
-    @hookspec(firstresult=True)
-    def elvis(op1: Optional[T], op2: T) -> T:
-        """Jac's elvis operator feature."""
-        raise NotImplementedError
-
     @staticmethod
     @hookspec(firstresult=True)
     def has_instance_default(gen_func: Callable[[], T]) -> T:

jaclang/runtimelib/architype.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import inspect
 from dataclasses import asdict, dataclass, field, fields, is_dataclass
 from enum import IntEnum
+from functools import cached_property
 from logging import getLogger
 from pickle import dumps
 from types import UnionType
@@ -43,9 +44,9 @@ class Access:
 
     anchors: dict[str, AccessLevel] = field(default_factory=dict)
 
-    def check(self, anchor: str) -> AccessLevel:
+    def check(self, anchor: str) -> AccessLevel | None:
         """Validate access."""
-        return self.anchors.get(anchor, AccessLevel.NO_ACCESS)
+        return self.anchors.get(anchor)
 
 
 @dataclass
@@ -220,9 +221,9 @@ class WalkerAnchor(Anchor):
     """Walker Anchor."""
 
     architype: WalkerArchitype
-    path: list[Anchor] = field(default_factory=list)
-    next: list[Anchor] = field(default_factory=list)
-    ignores: list[Anchor] = field(default_factory=list)
+    path: list[NodeAnchor] = field(default_factory=list)
+    next: list[NodeAnchor] = field(default_factory=list)
+    ignores: list[NodeAnchor] = field(default_factory=list)
     disengaged: bool = False
 
 
@@ -311,17 +312,20 @@ class DSFunc:
     name: str
     func: Callable[[Any, Any], Any] | None = None
 
+    @cached_property
+    def trigger(self) -> type | UnionType | tuple[type | UnionType, ...] | None:
+        """Get function parameter annotations."""
+        t = (
+            (
+                inspect.signature(self.func, eval_str=True)
+                .parameters["_jac_here_"]
+                .annotation
+            )
+            if self.func
+            else None
+        )
+        return None if t is inspect._empty else t
+
     def resolve(self, cls: type) -> None:
         """Resolve the function."""
         self.func = getattr(cls, self.name)
-
-    def get_funcparam_annotations(
-        self, func: Callable[[Any, Any], Any] | None
-    ) -> type | UnionType | tuple[type | UnionType, ...] | None:
-        """Get function parameter annotations."""
-        if not func:
-            return None
-        annotation = (
-            inspect.signature(func, eval_str=True).parameters["_jac_here_"].annotation
-        )
-        return annotation if annotation != inspect._empty else None

jaclang/runtimelib/importer.py

@@ -158,9 +158,6 @@ class ImportReturn:
             return getattr(new_module, name, new_module)
         except ImportError as e:
             logger.error(dump_traceback(e))
-            # logger.error(
-            #     f"Failed to load {name} from {jac_file_path} in {module.__name__}: {str(e)}"
-            # )
             return None
 
 
@@ -319,6 +316,32 @@ class JacImporter(Importer):
         """Run the import process for Jac modules."""
         unique_loaded_items: list[types.ModuleType] = []
         module = None
+        # Gather all possible search paths
+        jacpaths = os.environ.get("JACPATH", "")
+        search_paths = [spec.caller_dir]
+        if jacpaths:
+            for p in jacpaths.split(os.pathsep):
+                p = p.strip()
+                if p and p not in search_paths:
+                    search_paths.append(p)
+
+            # Attempt to locate the module file or directory
+            found_path = None
+            target_path_components = spec.target.split(".")
+            for search_path in search_paths:
+                candidate = os.path.join(search_path, "/".join(target_path_components))
+                # Check if the candidate is a directory or a .jac file
+                if (os.path.isdir(candidate)) or (os.path.isfile(candidate + ".jac")):
+                    found_path = candidate
+                    break
+
+            # If a suitable path was found, update spec.full_target; otherwise, raise an error
+            if found_path:
+                spec.full_target = os.path.abspath(found_path)
+            else:
+                raise ImportError(
+                    f"Unable to locate module '{spec.target}' in {search_paths}"
+                )
         if os.path.isfile(spec.full_target + ".jac"):
             module_name = self.get_sys_mod_name(spec.full_target + ".jac")
             module_name = spec.override_name if spec.override_name else module_name

jaclang/runtimelib/machine.py

@@ -38,6 +38,7 @@ class JacMachine:
         self.loaded_modules: dict[str, types.ModuleType] = {}
         if not base_path:
             base_path = os.getcwd()
+        # Ensure the base_path is a list rather than a string
         self.base_path = base_path
         self.base_path_dir = (
             os.path.dirname(base_path)
@@ -306,12 +307,11 @@ class JacProgram:
                 return marshal.load(f)
 
         result = compile_jac(full_target, cache_result=cachable)
-        if result.errors_had or not result.ir.gen.py_bytecode:
+        if result.errors_had:
             for alrt in result.errors_had:
                 # We're not logging here, it already gets logged as the errors were added to the errors_had list.
                 # Regardless of the logging, this needs to be sent to the end user, so we'll printing it to stderr.
                 logger.error(alrt.pretty_print())
-            return None
         if result.ir.gen.py_bytecode is not None:
             return marshal.loads(result.ir.gen.py_bytecode)
         else:

jaclang/runtimelib/test.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import unittest
+from dataclasses import dataclass
 from typing import Callable, Optional
 
 
@@ -56,6 +57,16 @@ class JacTestCheck:
 
     test_case = unittest.TestCase()
     test_suite = unittest.TestSuite()
+
+    @dataclass
+    class TestSuite:
+        """Test Suite."""
+
+        test_case: unittest.FunctionTestCase
+        func_name: str
+
+    test_suite_path: dict[str, list[TestSuite]] = {}
+
     breaker = False
     failcount = 0
 
@@ -64,13 +75,45 @@ class JacTestCheck:
         """Clear the test suite."""
         JacTestCheck.test_case = unittest.TestCase()
         JacTestCheck.test_suite = unittest.TestSuite()
+        JacTestCheck.test_suite_path = {}
 
     @staticmethod
-    def run_test(xit: bool, maxfail: int | None, verbose: bool) -> None:
+    def run_test(
+        xit: bool,
+        maxfail: int | None,
+        verbose: bool,
+        filepath: str | None,
+        func_name: str | None,
+    ) -> None:
         """Run the test suite."""
         verb = 2 if verbose else 1
+        test_suite = JacTestCheck.test_suite
+
+        if filepath and filepath.endswith(".test.jac"):
+            filepath = filepath[:-9]
+        elif filepath and filepath.endswith(".jac"):
+            filepath = filepath[:-4]
+
+        if filepath:
+            test_cases = JacTestCheck.test_suite_path.get(filepath)
+            if test_cases is not None:
+                test_suite = unittest.TestSuite()
+                for test_case in test_cases:
+                    if func_name:
+                        if test_case.func_name == func_name:
+                            test_suite.addTest(test_case.test_case)
+                    else:
+                        test_suite.addTest(test_case.test_case)
+
+        elif func_name:
+            test_suite = unittest.TestSuite()
+            for test_cases in JacTestCheck.test_suite_path.values():
+                for test_case in test_cases:
+                    if test_case.func_name == func_name:
+                        test_suite.addTest(test_case.test_case)
+
         runner = JacTextTestRunner(max_failures=maxfail, failfast=xit, verbosity=verb)
-        result = runner.run(JacTestCheck.test_suite)
+        result = runner.run(test_suite)
         if result.wasSuccessful():
             print("Passed successfully.")
         else:
@@ -81,9 +124,21 @@ class JacTestCheck:
             )
 
     @staticmethod
-    def add_test(test_fun: Callable) -> None:
+    def add_test(filepath: str, func_name: str, test_func: Callable) -> None:
         """Create a new test."""
-        JacTestCheck.test_suite.addTest(unittest.FunctionTestCase(test_fun))
+        if filepath and filepath.endswith(".test.jac"):
+            filepath = filepath[:-9]
+        elif filepath and filepath.endswith(".jac"):
+            filepath = filepath[:-4]
+
+        if filepath not in JacTestCheck.test_suite_path:
+            JacTestCheck.test_suite_path[filepath] = []
+
+        test_case = unittest.FunctionTestCase(test_func)
+        JacTestCheck.test_suite_path[filepath].append(
+            JacTestCheck.TestSuite(test_case=test_case, func_name=func_name)
+        )
+        JacTestCheck.test_suite.addTest(test_case)
 
     def __getattr__(self, name: str) -> object:
         """Make convenient check.Equal(...) etc."""

jaclang/runtimelib/utils.py

@@ -231,3 +231,18 @@ def is_instance(
             return isinstance(obj, target)
         case _:
             return False
+
+
+def all_issubclass(
+    classes: type | UnionType | tuple[type | UnionType, ...], target: type
+) -> bool:
+    """Check if all classes is subclass of target type."""
+    match classes:
+        case type():
+            return issubclass(classes, target)
+        case UnionType():
+            return all((all_issubclass(cls, target) for cls in classes.__args__))
+        case tuple():
+            return all((all_issubclass(cls, target) for cls in classes))
+        case _:
+            return False

jaclang/settings.py

@@ -16,10 +16,13 @@ class Settings:
     pass_timer: bool = False
     collect_py_dep_debug: bool = False
     print_py_raised_ast: bool = False
+    py_import_pass_debug: bool = False
+    inherit_pass_debug: bool = False
 
     # Compiler configuration
     disable_mtllm: bool = False
     ignore_test_annex: bool = False
+    allow_import_from: bool = False
 
     # Formatter configuration
     max_line_length: int = 88

jaclang/tests/fixtures/base_class1.jac

@@ -0,0 +1,11 @@
+import:py test_py;
+
+class B :test_py.A: {}
+
+with entry {
+    a = test_py.A();
+    b = B();
+
+    a.start();
+    b.start();
+}

jaclang/tests/fixtures/base_class2.jac

@@ -0,0 +1,11 @@
+import:py from test_py { A }
+
+class B :A: {}
+
+with entry {
+    a = A();
+    b = B();
+
+    a.start();
+    b.start();
+}

jaclang/tests/fixtures/import_all.jac

@@ -0,0 +1,7 @@
+import:py import_all_py;
+
+with entry {
+    print(import_all_py.custom_func(11));
+    print(import_all_py.pi);
+    print(import_all_py.floor(0.5));
+}

jaclang/tests/fixtures/import_all_py.py

@@ -0,0 +1,8 @@
+"""Module used for testing from x import * in jac."""
+
+from math import *  # noqa
+
+
+def custom_func(x: int) -> str:
+    """Dummy custom function for testing purposes."""  # noqa
+    return str(x)

jaclang/tests/fixtures/jactest_imported.jac

@@ -0,0 +1,6 @@
+
+
+test this_should_not_run {
+    print("This test should not run after import.");
+    assert False;
+}

jaclang/tests/fixtures/jactest_main.jac

@@ -0,0 +1,22 @@
+import jactest_imported;
+
+can fib(n: int) -> int {
+    if n <= 1 {
+        return n;
+    }
+    return fib(n - 1) + fib(n - 2);
+}
+
+
+test first_two {
+    print("Testing first 2 fibonacci numbers.");
+    assert fib(0) == 0;
+    assert fib(1) == 0;
+}
+
+test from_2_to_10 {
+    print("Testing fibonacci numbers from 2 to 10.");
+    for i in range(2, 10) {
+        assert fib(i) == fib(i - 1) + fib(i - 2);
+    }
+}

jaclang/tests/fixtures/multi_dim_array_split.jac

@@ -1,13 +1,9 @@
-import:py numpy as np;
-
 with entry {
-    arr = np.array(
-        [[1,   2,  3,  4,  5],
+    arr = [[1,   2,  3,  4,  5],
          [6,   7,  8,  9, 10],
          [11, 12, 13, 14, 15],
          [16, 17, 18, 19, 20],
-         [21, 22, 23, 24, 25]]
-    );
+         [21, 22, 23, 24, 25]];
 
     print('Original Array:');
     print(arr);

jaclang/tests/fixtures/test_py.py

@@ -0,0 +1,12 @@
+"""Test file for subclass issue."""
+
+p = 5
+g = 6
+
+
+class A:
+    """Dummy class to test the base class issue."""
+
+    def start(self) -> int:
+        """Return 0."""
+        return 0

jaclang/tests/fixtures/visit_sequence.jac

@@ -0,0 +1,50 @@
+node Node {
+    has val: str;
+
+    can entry1 with entry {
+        print(f"{self.val}-2");
+    }
+
+    can entry2 with Walker entry {
+        print(f"{self.val}-3");
+    }
+
+    can exit1 with Walker exit {
+        print(f"{self.val}-4");
+    }
+
+    can exit2 with exit {
+        print(f"{self.val}-5");
+    }
+}
+
+walker Walker {
+    can entry1 with entry {
+        print("walker entry");
+    }
+
+    can entry2 with `root entry {
+        print("walker enter to root");
+        visit [-->];
+    }
+
+    can entry3 with Node entry {
+        print(f"{here.val}-1");
+    }
+
+    can exit1 with Node exit {
+        print(f"{here.val}-6");
+    }
+
+    can exit2 with exit {
+        print("walker exit");
+    }
+}
+
+with entry{
+    root ++> Node(val = "a");
+    root ++> Node(val = "b");
+    root ++> Node(val = "c");
+
+    Walker() spawn root;
+}

jaclang/tests/test_cli.py

@@ -168,7 +168,7 @@ class JacCliTests(TestCase):
         cli.tool("ir", ["ast", f"{self.fixture_abs_path('import.jac')}"])
 
         sys.stdout = sys.__stdout__
-        stdout_value = captured_output.getvalue()
+        stdout_value = captured_output.getvalue().replace("\\", "/")
         self.assertRegex(
             stdout_value,
             r"1\:11 \- 1\:13.*ModulePath - os - abs_path\:.*typeshed/stdlib/os/__init__.pyi",
@@ -233,6 +233,67 @@ class JacCliTests(TestCase):
             r"13\:12 \- 13\:18.*Name - append - .*SymbolPath: builtins_test.builtins.list.append",
         )
 
+    def test_import_all(self) -> None:
+        """Testing for print AstTool."""
+        from jaclang.settings import settings
+
+        settings.ast_symbol_info_detailed = True
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+
+        cli.tool("ir", ["ast", f"{self.fixture_abs_path('import_all.jac')}"])
+
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue()
+        settings.ast_symbol_info_detailed = False
+
+        self.assertRegex(
+            stdout_value,
+            r"6\:25 - 6\:30.*Name - floor -.*SymbolPath: import_all.import_all_py.floor",
+        )
+        self.assertRegex(
+            stdout_value,
+            r"5\:25 - 5\:27.*Name - pi -.*SymbolPath: import_all.import_all_py.pi",
+        )
+
+    def test_sub_class_symbol_table_fix_1(self) -> None:
+        """Testing for print AstTool."""
+        from jaclang.settings import settings
+
+        settings.ast_symbol_info_detailed = True
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+
+        cli.tool("ir", ["ast", f"{self.fixture_abs_path('base_class1.jac')}"])
+
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue()
+        settings.ast_symbol_info_detailed = False
+
+        self.assertRegex(
+            stdout_value,
+            r"10:7 - 10:12.*Name - start - Type.*SymbolPath: base_class1.B.start",
+        )
+
+    def test_sub_class_symbol_table_fix_2(self) -> None:
+        """Testing for print AstTool."""
+        from jaclang.settings import settings
+
+        settings.ast_symbol_info_detailed = True
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+
+        cli.tool("ir", ["ast", f"{self.fixture_abs_path('base_class2.jac')}"])
+
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue()
+        settings.ast_symbol_info_detailed = False
+
+        self.assertRegex(
+            stdout_value,
+            r"10:7 - 10:12.*Name - start - Type.*SymbolPath: base_class2.B.start",
+        )
+
     def test_expr_types(self) -> None:
         """Testing for print AstTool."""
         captured_output = io.StringIO()
@@ -393,6 +454,27 @@ class JacCliTests(TestCase):
         self.assertIn("...F", stderr)
         self.assertIn("F.F", stderr)
 
+    def test_run_specific_test_only(self) -> None:
+        """Test a specific test case."""
+        process = subprocess.Popen(
+            [
+                "jac",
+                "test",
+                "-t",
+                "from_2_to_10",
+                self.fixture_abs_path("jactest_main.jac"),
+            ],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+        )
+        stdout, stderr = process.communicate()
+        self.assertIn("Ran 1 test", stderr)
+        self.assertIn("Testing fibonacci numbers from 2 to 10.", stdout)
+        self.assertNotIn("Testing first 2 fibonacci numbers.", stdout)
+        self.assertNotIn("This test should not run after import.", stdout)
+
     def test_graph_coverage(self) -> None:
         """Test for coverage of graph cmd."""
         graph_params = set(inspect.signature(cli.dot).parameters.keys())

jaclang/tests/test_language.py

@@ -118,9 +118,9 @@ class JacLanguageTests(TestCase):
         stdout_value = captured_output.getvalue()
 
         expected_outputs = [
-            "+-- AtomTrailer - Type: numpy.ndarray[Any, numpy.dtype[Any]]",
-            "    +-- Name - arr - Type: numpy.ndarray[Any, numpy.dtype[Any]],  SymbolTable: None",
-            "    +-- IndexSlice - [IndexSlice] - Type: builtins.slice,  SymbolTable: None",
+            "+-- AtomTrailer - Type: builtins.list[builtins.int]",
+            "    +-- Name - arr - Type: builtins.list[builtins.list[builtins.int]],  SymbolTable: list",
+            "    +-- IndexSlice - [IndexSlice] - Type: builtins.list[builtins.list[builtins.int]],  SymbolTable: None",
             "        +-- Token - [,",
             "        +-- Int - 1 - Type: Literal[1]?,  SymbolTable: None",
             "        +-- Token - :,",
@@ -548,7 +548,7 @@ class JacLanguageTests(TestCase):
                 return f"Error While Jac to Py AST conversion: {e}"
 
         ir = jac_pass_to_pass(py_ast_build_pass, schedule=py_code_gen_typed).ir
-        self.assertEqual(len(ir.get_all_sub_nodes(ast.Architype)), 7)
+        self.assertEqual(len(ir.get_all_sub_nodes(ast.Architype)), 21)
         captured_output = io.StringIO()
         sys.stdout = captured_output
         jac_import("needs_import_1", base_path=self.fixture_abs_path("./"))
@@ -611,7 +611,7 @@ class JacLanguageTests(TestCase):
 
         ir = jac_pass_to_pass(py_ast_build_pass, schedule=py_code_gen_typed).ir
         self.assertEqual(
-            len(ir.get_all_sub_nodes(ast.Architype)), 8
+            len(ir.get_all_sub_nodes(ast.Architype)), 27
         )  # Because of the Architype from math
         captured_output = io.StringIO()
         sys.stdout = captured_output
@@ -665,7 +665,7 @@ class JacLanguageTests(TestCase):
 
         ir = jac_pass_to_pass(py_ast_build_pass, schedule=py_code_gen_typed).ir
         self.assertEqual(
-            len(ir.get_all_sub_nodes(ast.Architype)), 38
+            len(ir.get_all_sub_nodes(ast.Architype)), 75
         )  # Because of the Architype from other imports
         captured_output = io.StringIO()
         sys.stdout = captured_output
@@ -873,7 +873,7 @@ class JacLanguageTests(TestCase):
         ir = jac_pass_to_pass(py_ast_build_pass, schedule=py_code_gen_typed).ir
         jac_ast = ir.pp()
         self.assertIn(" |   +-- String - 'Loop completed normally{}'", jac_ast)
-        self.assertEqual(len(ir.get_all_sub_nodes(ast.SubNodeList)), 269)
+        self.assertEqual(len(ir.get_all_sub_nodes(ast.SubNodeList)), 586)
         captured_output = io.StringIO()
         sys.stdout = captured_output
         jac_import("deep_convert", base_path=self.fixture_abs_path("./"))
@@ -1230,5 +1230,20 @@ class JacLanguageTests(TestCase):
         jac_import("architype_def_bug", base_path=self.fixture_abs_path("./"))
         sys.stdout = sys.__stdout__
         stdout_value = captured_output.getvalue().split("\n")
-        self.assertIn("MyNode", stdout_value[0])
-        self.assertIn("MyWalker", stdout_value[1])
+        self.assertIn("MyWalker", stdout_value[0])
+        self.assertIn("MyNode", stdout_value[1])
+
+    def test_visit_sequence(self) -> None:
+        """Test conn assign on edges."""
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+        jac_import("visit_sequence", base_path=self.fixture_abs_path("./"))
+        sys.stdout = sys.__stdout__
+        self.assertEqual(
+            "walker entry\nwalker enter to root\n"
+            "a-1\na-2\na-3\na-4\na-5\na-6\n"
+            "b-1\nb-2\nb-3\nb-4\nb-5\nb-6\n"
+            "c-1\nc-2\nc-3\nc-4\nc-5\nc-6\n"
+            "walker exit\n",
+            captured_output.getvalue(),
+        )

jaclang/utils/helpers.py

@@ -165,7 +165,15 @@ def dump_traceback(e: Exception) -> str:
             (frame.lineno is not None) and frame.line and frame.line.strip() != ""
         ):
 
-            line_o = frame._original_line.rstrip()  # type: ignore [attr-defined]
+            # Note: This is CPython internals we're trying to get since python doesn't provide
+            # the frames original line but the stripped version so we had to do this.
+            line_o = frame.line  # Fallback line.
+            if hasattr(frame, "_original_line"):
+                line_o = frame._original_line.rstrip()  # type: ignore [attr-defined]
+            elif hasattr(frame, "_original_lines"):
+                # https://github.com/python/cpython/issues/106922
+                line_o = frame._original_lines.split("\n")[0].rstrip()  # type: ignore [attr-defined]
+
             if frame.colno is not None and frame.end_colno is not None:
                 off_start = byte_offset_to_char_offset(line_o, frame.colno) - 1
                 off_end = byte_offset_to_char_offset(line_o, frame.end_colno) - 1

jaclang/utils/test.py

@@ -41,12 +41,12 @@ class TestCase(_TestCase):
             raise ValueError("Unable to determine the file of the module.")
         fixture_src = module.__file__
         fixture_path = os.path.join(os.path.dirname(fixture_src), "fixtures", fixture)
-        with open(fixture_path, "r") as f:
+        with open(fixture_path, "r", encoding="utf-8") as f:
             return f.read()
 
     def file_to_str(self, file_path: str) -> str:
         """Load fixture from fixtures directory."""
-        with open(file_path, "r") as f:
+        with open(file_path, "r", encoding="utf-8") as f:
             return f.read()
 
     def fixture_abs_path(self, fixture: str) -> str:

jaclang/utils/tests/test_lang_tools.py

@@ -107,8 +107,10 @@ class JacFormatPassTests(TestCase):
 
     def test_sym_sym_dot(self) -> None:
         """Testing for sym, sym. AstTool."""
-        jac_file = os.path.join(
-            os.path.dirname(jaclang.__file__), "../examples/reference/atom.jac"
+        jac_file = os.path.normpath(
+            os.path.join(
+                os.path.dirname(jaclang.__file__), "../examples/reference/atom.jac"
+            )
         )
         out = AstTool().ir(["sym", jac_file])
         self.assertNotIn(