jaclang 0.7.18__py3-none-any.whl → 0.7.22__py3-none-any.whl

jaclang/compiler/passes/main/pyast_load_pass.py

@@ -1148,14 +1148,16 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             else:
                 token_type = f"{value_type.__name__.upper()}"
 
+            if value_type == str:
+                raw_repr = repr(node.value)
+                quote = "'" if raw_repr.startswith("'") else '"'
+                value = f"{quote}{raw_repr[1:-1]}{quote}"
+            else:
+                value = str(node.value)
             return type_mapping[value_type](
                 file_path=self.mod_path,
                 name=token_type,
-                value=(
-                    f'"{repr(node.value)[1:-1]}"'
-                    if value_type == str
-                    else str(node.value)
-                ),
+                value=value,
                 line=node.lineno,
                 end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
@@ -2625,7 +2627,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
 
     def convert_to_doc(self, string: ast.String) -> None:
         """Convert a string to a docstring."""
-        string.value = f'""{string.value}""'
+        string.value = f'"""{string.value[1:-1]}"""'
 
     def aug_op_map(self, tok_dict: dict, op: ast.Token) -> str:
         """aug_mapper."""

jaclang/compiler/passes/main/registry_pass.py

@@ -14,6 +14,7 @@ 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
+from jaclang.settings import settings
 
 
 class RegistryPass(Pass):
@@ -23,6 +24,9 @@ class RegistryPass(Pass):
 
     def enter_module(self, node: ast.Module) -> None:
         """Create registry for each module."""
+        if settings.disable_mtllm:
+            self.terminate()
+            return None
         node.registry = SemRegistry()
         self.modules_visited.append(node)
 

jaclang/compiler/passes/main/sym_tab_build_pass.py

@@ -4,10 +4,7 @@ This pass builds the symbol table tree for the Jaseci Ast. It also adds symbols
 for globals, imports, architypes, and abilities declarations and definitions.
 """
 
-import builtins
-
 import jaclang.compiler.absyntree as ast
-from jaclang.compiler.constant import Tokens as Tok
 from jaclang.compiler.passes import Pass
 from jaclang.compiler.symtable import SymbolTable
 
@@ -54,21 +51,6 @@ class SymTabBuildPass(Pass):
         """
         self.push_scope(node.name, node)
         self.sync_node_to_scope(node)
-        for obj in dir(builtins):
-            builtin = ast.Name(
-                file_path=node.loc.mod_path,
-                name=Tok.NAME,
-                value=str(obj),
-                line=0,
-                end_line=0,
-                col_start=0,
-                col_end=0,
-                pos_start=0,
-                pos_end=0,
-            )
-            self.sync_node_to_scope(builtin)
-            builtin.sym_tab.def_insert(builtin)
-        # self.def_insert(ast.Name.gen_stub_from_node(node.name, "root"))
 
     def exit_module(self, node: ast.Module) -> None:
         """Sub objects.

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

@@ -1,4 +1,47 @@
 """Small test for fstrings."""
 
+glob apple = 2;
+glob a=f"hello {40 + 2}   wor{apple}ld  ";
 
-glob a=f"hello {40 + 2}   wor{apple}ld  ";
+with entry {
+    a = 9;
+    s_2 = "'''hello'''";
+    s_3 = "'''hello  '''";
+    s_4 = "''' hello'''";
+    s_5 = '""" hello"""';
+    s_6 = '"""hello"""';
+    s_7 = '"""hello"" "';
+    s_8 = '"""hello""" ';
+    print(
+        len(s_2),
+        len(s_3),
+        len(s_4),
+        len(s_5),
+        len(s_6),
+        len(s_7),
+        len(s_8)
+    ) ;
+    b1 = f"{"'''hello''' "}";
+    b_2 = f"{'"""hello""" '}";
+    f_1 = f"{'hello '}{a}{'"""hello"""'}";
+    f_2 = f"{'hello '}{a}{"'''hello'''"}";
+    print(len(b1),len(b_2), b_2,len(f_1), len(f_2)) ;
+    f_3 = f"{'"""again"""'}";
+    f_4 = f"{'"""again""" '}";
+    f_5 = f"{"'''again'''"}";
+    f_6 = f"{"'''again''' "}";
+    f_7 = f"{'"""again"""'}";
+    f_s1 = f"{'hello '}{a}{'"""hello"""'}";
+    f_s2 = f"{'hello '}{a}{"'''hello'''"}{'kklkl'}";
+    print(
+        len(f_3),
+        len(f_4),
+        len(f_5),
+        len(f_6),
+        len(f_7),
+        len(f_s1), len(f_s2)
+    ) ;
+    """sdfsdf\nsdfsdfsdfsd dffgdfgd.""" ;
+}
+can func() {;
+}

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

@@ -0,0 +1,7 @@
+import:jac blip;
+
+
+with entry{
+    kl = blip;
+    l1 = l2 = blip;
+}

jaclang/compiler/passes/main/tests/fixtures/pygame_mock/__init__.pyi

@@ -0,0 +1,3 @@
+from .display import *
+from .color import *
+from .constants import *

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

@@ -70,19 +70,19 @@ class ImportPassPassTests(TestCase):
         )
         assert isinstance(build.ir, ast.Module)
         p = {
-            "math": "jaclang/jaclang/vendor/mypy/typeshed/stdlib/math.pyi",
-            "pygame_mock": "pygame_mock/__init__.py",
-            "pygame_mock.color": "pygame_mock/color.py",
-            "pygame_mock.constants": "pygame_mock/constants.py",
-            "argparse": "jaclang/vendor/mypy/typeshed/stdlib/argparse.pyi",
-            "builtins": "jaclang/vendor/mypy/typeshed/stdlib/builtins.pyi",
-            "pygame_mock.display": "pygame_mock/display.py",
-            "os": "jaclang/vendor/mypy/typeshed/stdlib/os/__init__.pyi",
-            "genericpath": "jaclang/vendor/mypy/typeshed/stdlib/genericpath.pyi",
+            "math": r"jaclang/vendor/mypy/typeshed/stdlib/math.pyi$",
+            "pygame_mock": r"pygame_mock/__init__.pyi$",
+            "pygame_mock.color": r"pygame_mock/color.py$",
+            "pygame_mock.constants": r"pygame_mock/constants.py$",
+            "argparse": r"jaclang/vendor/mypy/typeshed/stdlib/argparse.pyi$",
+            "builtins": r"jaclang/vendor/mypy/typeshed/stdlib/builtins.pyi$",
+            "pygame_mock.display": r"pygame_mock/display.py$",
+            "os": r"jaclang/vendor/mypy/typeshed/stdlib/os/__init__.pyi$",
+            "genericpath": r"jaclang/vendor/mypy/typeshed/stdlib/genericpath.pyi$",
         }
         for i in p:
             self.assertIn(i, build.ir.py_raise_map)
-            self.assertIn(p[i], re.sub(r".*fixtures/", "", build.ir.py_raise_map[i]))
+            self.assertRegex(re.sub(r".*fixtures/", "", build.ir.py_raise_map[i]), p[i])
 
     def test_py_raised_mods(self) -> None:
         """Basic test for pass."""

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"), 28)
+        self.assertEqual(out.count("Type: builtins.str"), 34)
         for i in lis:
             self.assertNotIn(i, out)

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

@@ -1,7 +1,29 @@
 """Test pass module."""
 
+from jaclang.compiler.compile import jac_file_to_pass
+from jaclang.compiler.passes.main.fuse_typeinfo_pass import FuseTypeInfoPass
+from jaclang.compiler.passes.main.schedules import py_code_gen_typed
 from jaclang.utils.test import TestCase
 
 
 class TestFuseTypeInfo(TestCase):
-    """Test pass module."""
+    """Test FuseTypeInfoPass module."""
+
+    def setUp(self) -> None:
+        """Set up test."""
+        return super().setUp()
+
+    def test_mod_type_assign(self) -> None:
+        """Test module type assignment."""
+        gen_ast = jac_file_to_pass(
+            self.fixture_abs_path("mod_type_assign.jac"),
+            FuseTypeInfoPass,
+            schedule=py_code_gen_typed,
+        ).ir.pp()
+        type_info_list = [
+            "kl - Type: types.ModuleType,  SymbolTable: blip",
+            "l1 - Type: types.ModuleType,  SymbolTable: blip",
+            "l2 - Type: types.ModuleType,  SymbolTable: blip",
+        ]
+        for type_info in type_info_list:
+            self.assertIn(type_info, str(gen_ast))

jaclang/compiler/passes/main/type_check_pass.py

@@ -51,10 +51,10 @@ class JacTypeCheckPass(Pass):
         options.ignore_missing_imports = True
         options.cache_dir = Con.JAC_MYPY_CACHE
         options.mypy_path = [
-            str(
-                pathlib.Path(os.path.dirname(__file__)).parent.parent.parent.parent
-                / "stubs"
-            )
+            # str( # TODO: Remove me, this was the wrong way to point to stubs
+            #     pathlib.Path(os.path.dirname(__file__)).parent.parent.parent.parent
+            #     / "stubs"
+            # )
         ]
         if top_module_path != "":
             options.mypy_path.append(top_module_path)

jaclang/compiler/passes/tool/jac_formatter_pass.py

@@ -126,11 +126,14 @@ class JacFormatPass(Pass):
         last_element = None
         for counter, i in enumerate(node.body):
             counter += 1
+            if last_element and (
+                i.loc.first_line - last_element.loc.last_line > 1
+                and not last_element.gen.jac.endswith("\n\n")
+            ):
+                self.emit_ln(node, "")
             if isinstance(i, ast.Import):
                 self.emit_ln(node, i.gen.jac)
             else:
-                if isinstance(last_element, ast.Import):
-                    self.emit_ln(node, "")
                 if last_element and (
                     isinstance(i, ast.Architype)
                     and isinstance(last_element, ast.Architype)
@@ -140,21 +143,6 @@ class JacFormatPass(Pass):
                     self.emit_ln(node, "")
                 self.emit_ln(node, i.gen.jac)
 
-                if counter <= len(node.body) - 1:
-                    if (
-                        isinstance(i, ast.Ability)
-                        and isinstance(node.body[counter], ast.Ability)
-                        and i.gen.jac.endswith(";")
-                        or (
-                            isinstance(i, ast.Architype)
-                            and len(node.body[counter].kid[-1].kid) == 2
-                            and len(node.body[counter - 1].kid[-1].kid) == 2
-                        )
-                        and node.gen.jac.endswith("\n")
-                    ):
-                        self.emit(node, "")
-                    else:
-                        self.emit_ln(node, "")
             last_element = i
 
     def exit_global_vars(self, node: ast.GlobalVars) -> None:
@@ -222,6 +210,20 @@ class JacFormatPass(Pass):
         """
         prev_token = None
         for stmt in node.kid:
+            line_emiited = False
+            if prev_token and stmt.loc.first_line - prev_token.loc.last_line > 1:
+                if (
+                    stmt.kid
+                    and isinstance(stmt.kid[-1], ast.SubNodeList)
+                    and not isinstance(stmt.kid[-1].kid[-1], ast.CommentToken)
+                ):
+                    self.emit(node, "")
+
+                else:
+                    line_emiited = True
+                    self.indent_level -= 1
+                    self.emit_ln(node, "")
+                    self.indent_level += 1
             if isinstance(node.parent, (ast.EnumDef, ast.Enum)) and stmt.gen.jac == ",":
                 self.indent_level -= 1
                 self.emit_ln(node, f"{stmt.gen.jac}")
@@ -266,9 +268,10 @@ class JacFormatPass(Pass):
                             self.indent_level += 1
                         else:
                             self.emit(node, f" {stmt.gen.jac}")
-                        self.indent_level -= 1
-                        self.emit_ln(node, "")
-                        self.indent_level += 1
+                        if not line_emiited:
+                            self.indent_level -= 1
+                            self.emit_ln(node, "")
+                            self.indent_level += 1
                     else:
                         if not node.gen.jac.endswith("\n"):
                             self.indent_level -= 1
@@ -279,12 +282,21 @@ class JacFormatPass(Pass):
                         if prev_token and isinstance(prev_token, ast.Ability):
                             self.emit(node, f"{stmt.gen.jac}")
                         else:
-                            self.emit(node, stmt.gen.jac)
-                            if not stmt.gen.jac.endswith("postinit;"):
+                            token_before = self.token_before(stmt)
+                            if (
+                                token_before is not None
+                                and isinstance(token_before, ast.Token)
+                                and token_before.name == Tok.LBRACE
+                                and stmt.loc.first_line - token_before.loc.last_line > 1
+                            ):
                                 self.indent_level -= 1
-                                self.emit_ln(stmt, "")
                                 self.emit_ln(node, "")
                                 self.indent_level += 1
+                            self.emit(node, stmt.gen.jac)
+                            self.indent_level -= 1
+                            self.emit_ln(stmt, "")
+                            self.emit_ln(node, "")
+                            self.indent_level += 1
                 elif stmt.gen.jac == ",":
                     self.emit(node, f"{stmt.value} ")
                 elif stmt.value == "=":
@@ -304,10 +316,29 @@ class JacFormatPass(Pass):
                 isinstance(prev_token, ast.Ability)
                 and isinstance(stmt, (ast.Ability, ast.AbilityDef))
             ):
-                if not isinstance(prev_token.kid[-1], ast.CommentToken):
-                    self.indent_level -= 1
-                    self.emit_ln(node, "")
-                    self.indent_level += 1
+                if (
+                    not isinstance(prev_token.kid[-1], ast.CommentToken)
+                    and not line_emiited
+                ):
+                    if (
+                        prev_token.kid
+                        and isinstance(prev_token.kid[-1], ast.SubNodeList)
+                        and isinstance(prev_token.kid[-1].kid[-1], ast.CommentToken)
+                    ):
+                        if (
+                            prev_token
+                            and stmt.loc.first_line - prev_token.kid[-1].kid[-1].line_no
+                            > 1
+                        ):
+                            self.indent_level -= 1
+                            self.emit_ln(node, "")
+                            self.indent_level += 1
+                        else:
+                            self.emit(node, "")
+                    else:
+                        self.indent_level -= 1
+                        self.emit_ln(node, "")
+                        self.indent_level += 1
                 self.emit(node, stmt.gen.jac)
             else:
                 if prev_token and prev_token.gen.jac.strip() == "{":
@@ -373,7 +404,9 @@ class JacFormatPass(Pass):
                     indented = True
                 for count, j in enumerate(i.kid):
                     if j.gen.jac == ",":
-                        if i.kid[count + 1].gen.jac.startswith("#"):
+                        if len(i.kid) > count + 1 and i.kid[
+                            count + 1
+                        ].gen.jac.startswith("#"):
                             self.indent_level -= 1
                             self.emit(node, f"{j.gen.jac} ")
                             self.indent_level += 1
@@ -907,8 +940,6 @@ class JacFormatPass(Pass):
         """Check if the length of the current generated code exceeds the max line length."""
         if max_line_length == 0:
             max_line_length = self.MAX_LINE_LENGTH
-        # print(content)
-        # print(len(content))
         return len(content) > max_line_length
 
     def exit_binary_expr(self, node: ast.BinaryExpr) -> None:
@@ -958,7 +989,6 @@ class JacFormatPass(Pass):
                 self.error(
                     f"Binary operator {node.op.value} not supported in bootstrap Jac"
                 )
-        # print(node.gen)
         if isinstance(
             node.kid[-1], (ast.Semi, ast.CommentToken)
         ) and not node.gen.jac.endswith("\n"):

jaclang/compiler/passes/tool/tests/fixtures/general_format_checks/line_spacing.jac

@@ -0,0 +1,57 @@
+import:py math;
+
+glob RAD = 5;
+
+glob DIA = 10;
+
+# this comment is for walker
+
+walker decorator_walk {
+    can hash(func: Any) {
+        can inner(a: Any) {
+            print(("#" * 20));
+            func(a);
+            print(("#" * 20));
+        }
+        return inner;
+    }
+
+    can exclaim(func: Any) {
+        can inner(b: Any) {
+            print(("!" * 20));
+            func(b);
+            print(("!" * 20));
+        }
+        return inner;
+    }
+
+    can tilde(func: Any) {
+        can inner(c: Any) {
+            print(("~" * 20));
+            func(c);
+            print(("~" * 20));
+        }
+        return inner;
+    }
+
+    can greeter(name: Any) {
+        print("Hello, " + name + "!");
+    }
+
+    # Entry point for the walker
+
+    can start with entry {
+
+        # Apply decorators to greeter
+        decorated_greeter = hash(exclaim(tilde(greeter)));
+
+        # Call the decorated greeter function
+        decorated_greeter("World");
+
+        # this is another comment
+    }
+}
+
+with entry {
+    root spawn decorator_walk();
+}

jaclang/compiler/semtable.py

@@ -19,13 +19,13 @@ class SemInfo:
         self,
         node: ast.AstNode,
         name: str,
-        type: Optional[str] = None,
+        type_str: Optional[str] = None,
         semstr: str = "",
     ) -> None:
         """Initialize the class."""
-        self.node = node
+        self.node_type = type(node)
         self.name = name
-        self.type = type
+        self.type = type_str
         self.semstr = semstr
 
     def __repr__(self) -> str:
@@ -40,7 +40,7 @@ class SemInfo:
         self_scope = str(scope) + f".{self.name}({self.type})"
         _, children = sem_registry.lookup(scope=SemScope.get_scope_from_str(self_scope))
         if filter and children and isinstance(children, list):
-            return [i for i in children if isinstance(i.node, filter)]
+            return [i for i in children if i.node_type == filter]
         return children if children and isinstance(children, list) else []
 
 

jaclang/compiler/symtable.py

@@ -54,6 +54,11 @@ class Symbol:
         out.reverse()
         return ".".join(out)
 
+    @property
+    def fetch_sym_tab(self) -> Optional[SymbolTable]:
+        """Get symbol table."""
+        return self.parent_tab.find_scope(self.sym_name)
+
     def add_defn(self, node: ast.NameAtom) -> None:
         """Add defn."""
         self.defn.append(node)

jaclang/langserve/engine.py

@@ -25,7 +25,6 @@ from jaclang.langserve.utils import (
     get_location_range,
     get_symbols_for_outline,
     parse_symbol_path,
-    resolve_completion_symbol_table,
 )
 from jaclang.vendor.pygls import uris
 from jaclang.vendor.pygls.server import LanguageServer
@@ -188,14 +187,73 @@ class JacLangServer(LanguageServer):
             if not node_selected
             else node_selected.sym_tab
         )
-        current_tab = self.modules[file_path].ir._sym_tab
         current_symbol_table = mod_tab
 
         if completion_trigger == ".":
             if current_symbol_path:
-                completion_items = resolve_completion_symbol_table(
-                    mod_tab, current_symbol_path, current_tab
-                )
+                temp_tab = mod_tab
+                for symbol in current_symbol_path:
+                    if symbol == "self":
+                        is_ability_def = (
+                            temp_tab.owner
+                            if isinstance(temp_tab.owner, ast.AbilityDef)
+                            else temp_tab.owner.find_parent_of_type(ast.AbilityDef)
+                        )
+                        if not is_ability_def:
+                            archi_owner = mod_tab.owner.find_parent_of_type(
+                                ast.Architype
+                            )
+                            temp_tab = (
+                                archi_owner._sym_tab
+                                if archi_owner and archi_owner._sym_tab
+                                else mod_tab
+                            )
+                            continue
+                        else:
+                            archi_owner = (
+                                (
+                                    is_ability_def.decl_link.find_parent_of_type(
+                                        ast.Architype
+                                    )
+                                )
+                                if is_ability_def.decl_link
+                                else None
+                            )
+                            temp_tab = (
+                                archi_owner.sym_tab
+                                if archi_owner and archi_owner.sym_tab
+                                else temp_tab
+                            )
+                            continue
+                    symb = temp_tab.lookup(symbol)
+                    if symb:
+                        fetc_tab = symb.fetch_sym_tab
+                        if fetc_tab:
+                            temp_tab = fetc_tab
+                        else:
+                            temp_tab = (
+                                symb.defn[0].type_sym_tab
+                                if symb.defn[0].type_sym_tab
+                                else temp_tab
+                            )
+                    else:
+                        break
+                completion_items = collect_all_symbols_in_scope(temp_tab, up_tree=False)
+                if (
+                    isinstance(temp_tab.owner, ast.Architype)
+                    and temp_tab.owner.base_classes
+                ):
+                    base = []
+                    for base_name in temp_tab.owner.base_classes.items:
+                        if isinstance(base_name, ast.Name) and base_name.sym:
+                            base.append(base_name.sym)
+                    for base_class_symbol in base:
+                        if base_class_symbol.fetch_sym_tab:
+                            completion_items += collect_all_symbols_in_scope(
+                                base_class_symbol.fetch_sym_tab,
+                                up_tree=False,
+                            )
+
             else:
                 completion_items = []
         else:
@@ -349,7 +407,10 @@ class JacLangServer(LanguageServer):
             elif node_selected.parent and isinstance(
                 node_selected.parent, ast.ModuleItem
             ):
-                path = node_selected.parent.from_mod_path.abs_path
+                path = (
+                    node_selected.parent.abs_path
+                    or node_selected.parent.from_mod_path.abs_path
+                )
                 try:  # TODO: Get rid of this when 'from' import is fixed
                     loc_range = tuple(
                         loc - 1 if loc > 0 else loc
@@ -371,7 +432,7 @@ class JacLangServer(LanguageServer):
                             ),
                         ),
                     )
-            elif isinstance(node_selected, (ast.ElementStmt, ast.BuiltinType)):
+            elif isinstance(node_selected, ast.ElementStmt):
                 return None
             decl_node = (
                 node_selected.parent.body.target

jaclang/langserve/tests/test_server.py

@@ -218,9 +218,9 @@ class TestJacLangServer(TestCase):
         )
         lsp.deep_check(import_file)
         positions = [
-            (6, 39, "/pygame_mock/__init__.py:2:0-2:0"),
+            (6, 39, "/pygame_mock/__init__.pyi:2:0-2:0"),
             (6, 45, "/pygame_mock/constants.py:3:0-4:1"),
-            (7, 31, "/pygame_mock/__init__.py:2:0-2:0"),
+            (7, 31, "/pygame_mock/__init__.pyi:2:0-2:0"),
             (7, 35, "/pygame_mock/constants.py:3:0-4:1"),
             (20, 51, "/py_imp_test.jac:6:4-6:11"),
             (20, 64, "/pygame_mock/constants.py:4:3-4:15"),
@@ -282,7 +282,7 @@ class TestJacLangServer(TestCase):
             ),
             (
                 "<JacSemTokenType.FUNCTION: 12>, <JacSemTokenModifier.DECLARATION: 1>,",
-                6,
+                8,
             ),
             ("<JacSemTokenType.METHOD: 13>, <JacSemTokenModifier.DECLARATION: 1>", 6),
             ("<JacSemTokenType.ENUM: 3>, <JacSemTokenModifier.DECLARATION: 1>,", 4),