jaclang 0.8.6__py3-none-any.whl → 0.8.8__py3-none-any.whl

jaclang/tests/test_language.py

@@ -3,7 +3,7 @@
 import io
 import os
 import sys
-import sysconfig
+import pytest
 import tempfile
 import subprocess
 from pathlib import Path
@@ -514,14 +514,13 @@ class JacLanguageTests(TestCase):
                 ),
                 prog=JacProgram(),
             ).ir_out.unparse()
-        self.assertIn("def greet2(**kwargs: Any)", output)
+        self.assertIn("def greet2( **kwargs: Any) {", output)
         self.assertEqual(output.count("with entry {"), 14)
         self.assertIn("assert (x == 5) , 'x should be equal to 5' ;", output)
         self.assertIn("if not (x == y) {", output)
-        self.assertIn("def greet2(**kwargs: Any) {", output)
-        self.assertIn("squares_dict = { x : (x ** 2) for x in numbers };", output)
+        self.assertIn("squares_dict = {x : (x ** 2) for x in numbers};", output)
         self.assertIn(
-            '\n\n"""Say hello"""\n@ my_decorator\n\n def say_hello() {', output
+            '\n\n"""Say hello"""\n@my_decorator\n\n def say_hello() {', output
         )
 
     def test_pyfunc_2(self) -> None:
@@ -589,6 +588,27 @@ class JacLanguageTests(TestCase):
         self.assertIn("case Container(inner = Inner(x = a, y = b)):\n", output)
         self.assertIn("case _:\n", output)
 
+    def test_py2jac_params(self) -> None:
+        """Test py ast to Jac ast conversion."""
+        from jaclang.compiler.passes.main import PyastBuildPass
+        import jaclang.compiler.unitree as ast
+        import ast as py_ast
+
+        py_out_path = os.path.join(self.fixture_abs_path("./"), "py2jac_params.py")
+        with open(py_out_path) as f:
+            file_source = f.read()
+            output = PyastBuildPass(
+                ir_in=ast.PythonModuleAst(
+                    py_ast.parse(file_source),
+                    orig_src=ast.Source(file_source, py_out_path),
+                ),
+                prog=None,
+            ).ir_out.unparse()
+        self.assertIn(
+            "def isinstance( <>obj: object , class_or_tuple: _ClassInfo , /)  -> bool {", output)
+        self.assertIn(
+            "def len(<>obj: Sized, astt: Any, /, z: int, j: str, a: Any = 90) -> int {", output)
+
     def test_refs_target(self) -> None:
         """Test py ast to Jac ast conversion output."""
         captured_output = io.StringIO()
@@ -712,6 +732,7 @@ class JacLanguageTests(TestCase):
         mypass = JacProgram().compile(self.fixture_abs_path("byllmissue.jac"))
         self.assertIn("2:5 - 4:8", mypass.pp())
 
+    @pytest.mark.xfail(reason="TODO: Support symtable for inheritance")
     def test_inherit_baseclass_sym(self) -> None:
         """Basic test for symtable support for inheritance."""
         mypass = JacProgram().compile(
@@ -746,6 +767,43 @@ class JacLanguageTests(TestCase):
         stdout_value = captured_output.getvalue()
         self.assertIn("i work", stdout_value)
 
+    def test_kwonly_params(self) -> None:
+        """Test importing python."""
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+        Jac.jac_import("test_kwonly_params", base_path=self.fixture_abs_path("./params"))
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue().split("\n")
+        self.assertEqual("KW_SIMPLE: 42", stdout_value[0])
+        self.assertEqual("KW_DEF: 10-def 20-def", stdout_value[1])
+        self.assertEqual("REG_KW: 10|test", stdout_value[2])
+        self.assertEqual("MIXED_KW: 1-def-2.5-True 2-custom-3.5-False", stdout_value[3])
+        self.assertEqual("ALL_KW: 100:test:1.0 200:hi:9.9", stdout_value[4])
+
+    def test_complex_params(self) -> None:
+        """Test importing python."""
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+        Jac.jac_import("test_complex_params", base_path=self.fixture_abs_path("./params"))
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue().split("\n")
+        self.assertEqual("ULTIMATE_MIN: 1|def|2.5|0|test|100|0", stdout_value[0])
+        self.assertEqual("ULTIMATE_FULL: 1|custom|3.14|3|req|200|1", stdout_value[1])
+        self.assertEqual("SEPARATORS: 42", stdout_value[2])
+        self.assertEqual("EDGE_MIX: 1-test-2-True-1", stdout_value[3])
+        self.assertEqual("RECURSIVE: 7 11", stdout_value[4])
+        self.assertEqual("VALIDATION: x:1,y:2.5,z:10,args:1,w:True,kwargs:1", stdout_value[5])
+
+    def test_param_failing(self) -> None:
+        """Test importing python."""
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+        for i in ["test_failing_posonly", "test_failing_kwonly", "test_failing_varargs"]:
+            Jac.jac_import(i, base_path=self.fixture_abs_path("./params"))
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue()
+        self.assertNotIn('FAILED', stdout_value)
+
     def test_double_import_exec(self) -> None:
         """Test importing python."""
         captured_output = io.StringIO()
@@ -1238,9 +1296,9 @@ class JacLanguageTests(TestCase):
             ).ir_out.unparse()
         self.assertIn("(prev_token_index is None)", output)
         self.assertIn("(next_token_index is None)", output)
-        self.assertIn("(tok[ 0 ] > change_end_line)", output)
-        self.assertIn("(tok[ 0 ] == change_end_line)", output)
-        self.assertIn("(tok[ 1 ] > change_end_char)", output)
+        self.assertIn("(tok[0] > change_end_line)", output)
+        self.assertIn("(tok[0] == change_end_line)", output)
+        self.assertIn("(tok[1] > change_end_char)", output)
 
     def test_here_visitor_usage(self) -> None:
         """Test visitor, here keyword usage in jaclang."""
@@ -1378,7 +1436,7 @@ class JacLanguageTests(TestCase):
             test_content = "Hello, 世界! 🌍 Testing UTF-8 encoding."
             f.write(test_content)
             temp_path = f.name
-        
+
         try:
             result = read_file_with_encoding(temp_path)
             self.assertEqual(result, test_content)
@@ -1391,7 +1449,7 @@ class JacLanguageTests(TestCase):
             test_content = "Hello, 世界! UTF-16 encoding test."
             f.write(test_content)
             temp_path = f.name
-        
+
         try:
             result = read_file_with_encoding(temp_path)
             self.assertEqual(result, test_content)
@@ -1404,7 +1462,7 @@ class JacLanguageTests(TestCase):
             test_content = "Hello, UTF-8 BOM test! 🚀"
             f.write(test_content)
             temp_path = f.name
-        
+
         try:
             result = read_file_with_encoding(temp_path)
             self.assertEqual(result, test_content)
@@ -1431,9 +1489,9 @@ class JacLanguageTests(TestCase):
         with tempfile.NamedTemporaryFile(delete=False) as f:
             binary_data = bytes([0xFF, 0xFE, 0x00, 0x48, 0x65, 0x6C, 0x6C, 0x6F])
             f.write(binary_data)
-            f.flush()  
+            f.flush()
             temp_path = f.name
-        
+
         try:
             result = read_file_with_encoding(temp_path)
             self.assertIsInstance(result, str)
@@ -1446,15 +1504,15 @@ class JacLanguageTests(TestCase):
         with tempfile.NamedTemporaryFile(mode='w', encoding='utf-8', delete=False) as f:
             test_content = (
                 "Special chars: åäö ñ ü ç é\n"
-                "Symbols: ©®™ §¶†‡•\n" 
+                "Symbols: ©®™ §¶†‡•\n"
                 "Math: ∑∏∫√±≤≥≠\n"
                 "Arrows: ←→↑↓↔\n"
                 "Emoji: 😀😍🎉🔥💯\n"
             )
             f.write(test_content)
-            f.flush()  
+            f.flush()
             temp_path = f.name
-        
+
         try:
             result = read_file_with_encoding(temp_path)
 

jaclang/utils/helpers.py

@@ -192,6 +192,37 @@ def dump_traceback(e: Exception) -> str:
     return trace_dump
 
 
+# FIXME: Use a proper color library and/or move this somewhere common to jac stack and use it everywhere.
+# Reference: https://gist.github.com/rene-d/9e584a7dd2935d0f461904b9f2950007
+class ANSIColors:
+    """ANSI color codes."""
+
+    BLACK = "\033[0;30m"
+    RED = "\033[0;31m"
+    GREEN = "\033[0;32m"
+    BROWN = "\033[0;33m"
+    BLUE = "\033[0;34m"
+    PURPLE = "\033[0;35m"
+    CYAN = "\033[0;36m"
+    LIGHT_GRAY = "\033[0;37m"
+    DARK_GRAY = "\033[1;30m"
+    LIGHT_RED = "\033[1;31m"
+    LIGHT_GREEN = "\033[1;32m"
+    YELLOW = "\033[1;33m"
+    LIGHT_BLUE = "\033[1;34m"
+    LIGHT_PURPLE = "\033[1;35m"
+    LIGHT_CYAN = "\033[1;36m"
+    LIGHT_WHITE = "\033[1;37m"
+    BOLD = "\033[1m"
+    FAINT = "\033[2m"
+    ITALIC = "\033[3m"
+    UNDERLINE = "\033[4m"
+    BLINK = "\033[5m"
+    NEGATIVE = "\033[7m"
+    CROSSED = "\033[9m"
+    END = "\033[0m"
+
+
 # TODO: After implementing the TextRange (or simillar named) class to mark a text range
 # refactor the parameter to accept an instace of that text range object.
 def pretty_print_source_location(
@@ -200,6 +231,8 @@ def pretty_print_source_location(
     error_line: int,
     pos_start: int,
     pos_end: int,
+    *,
+    colors: bool = False,
 ) -> str:
     """Pretty print internal method for the pretty_print method."""
     # NOTE: The Line numbers and the column numbers are starts with 1.
@@ -241,7 +274,16 @@ def pretty_print_source_location(
         idx_line_start = idx
         while idx < len(file_source) and file_source[idx] != "\n":
             idx += 1  # Run to the line end.
-        pretty_dump += file_source[idx_line_start:idx]
+
+        if colors and (curr_line == error_line):
+            pretty_dump += (
+                file_source[idx_line_start:pos_start]
+                + f"{ANSIColors.RED}{file_source[pos_start:pos_end]}{ANSIColors.END}"
+                + file_source[pos_end:idx]
+            )
+        else:
+            pretty_dump += file_source[idx_line_start:idx]
+
         pretty_dump += "\n"
 
         if curr_line == error_line:  # Print the current line with indicator.
@@ -252,7 +294,10 @@ def pretty_print_source_location(
                 spaces += "\t" if file_source[idx_pre] == "\t" else " "
 
             err_token_len = pos_end - pos_start
-            pretty_dump += spaces + ("^" * err_token_len) + "\n"
+            underline = "^" * err_token_len
+            if colors:
+                underline = f"{ANSIColors.RED}{underline}{ANSIColors.END}"
+            pretty_dump += spaces + underline + "\n"
 
         if idx == len(file_source):
             break

jaclang/utils/module_resolver.py

@@ -30,6 +30,16 @@ def get_jac_search_paths(base_path: Optional[str] = None) -> list[str]:
     return list(dict.fromkeys(filter(None, paths)))
 
 
+# TODO: need to be removed once python modules are fully supported in jac
+def get_py_search_paths(base_path: Optional[str] = None) -> list[str]:
+    """Construct a list of paths to search for Python modules."""
+    paths = []
+    if base_path:
+        paths.append(base_path)
+    paths.append(os.getcwd())
+    return list(dict.fromkeys(filter(None, paths)))
+
+
 def _candidate_from(base: str, parts: list[str]) -> Optional[Tuple[str, str]]:
     candidate = os.path.join(base, *parts)
     if os.path.isdir(candidate):
@@ -52,7 +62,7 @@ def resolve_module(target: str, base_path: str) -> Tuple[str, str]:
         level += 1
     actual_parts = parts[level:]
 
-    for sp in site.getsitepackages():
+    for sp in get_jac_search_paths(base_path):
         res = _candidate_from(sp, actual_parts)
         if res:
             return res

jaclang/utils/test.py

@@ -68,6 +68,14 @@ class TestCase(_TestCase):
         )
         return os.path.abspath(file_path)
 
+    def lang_fixture_abs_path(self, file: str) -> str:
+        """Language fixture abs path."""
+        fixture_src = jaclang.__file__
+        file_path = os.path.join(
+            os.path.dirname(fixture_src), "tests", "fixtures", file
+        )
+        return os.path.abspath(file_path)
+
 
 class TestCaseMicroSuite(TestCase):
     """Base test case for Jaseci."""

jaclang/utils/treeprinter.py

@@ -391,20 +391,6 @@ def _build_symbol_tree_common(
     children = SymbolTree(node_name="Sub Tables", parent=root)
 
     syms_to_iterate = set(node.names_in_scope.values())
-    for inhrited_symtab in node.inherited_scope:
-        for inhrited_sym in inhrited_symtab.symbols:
-            sym = inhrited_symtab.lookup(inhrited_sym)
-            assert sym is not None
-            syms_to_iterate.add(sym)
-
-    for stab in node.inherited_scope:
-        if stab.load_all_symbols:
-            syms_to_iterate.update(list(stab.base_symbol_table.names_in_scope.values()))
-        else:
-            for sname in stab.symbols:
-                sym = stab.base_symbol_table.lookup(sname)
-                assert sym is not None
-                syms_to_iterate.add(sym)
 
     for sym in syms_to_iterate:
         symbol_node = SymbolTree(node_name=f"{sym.sym_name}", parent=symbols)
@@ -437,10 +423,6 @@ def _build_symbol_tree_common(
             continue
         _build_symbol_tree_common(k, children)
 
-    for k2 in node.inherited_scope:
-        if k2.base_symbol_table.scope_name == "builtins":
-            continue
-        _build_symbol_tree_common(k2.base_symbol_table, children)
     return root
 
 

{jaclang-0.8.6.dist-info → jaclang-0.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: jaclang
-Version: 0.8.6
+Version: 0.8.8
 Summary: Jac is a unique and powerful programming language that runs on top of Python, offering an unprecedented level of intelligence and intuitive understanding.
 License: MIT
 Keywords: jac,jaclang,jaseci,python,programming-language,machine-learning,artificial-intelligence
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: all
 Provides-Extra: cloud
 Provides-Extra: llm
 Provides-Extra: streamlit
-Requires-Dist: mypy (>=1.15.0,<2.0.0)
 Project-URL: Documentation, https://jac-lang.org
 Project-URL: Homepage, https://jaseci.org
 Project-URL: Repository, https://github.com/Jaseci-Labs/jaclang