jaclang 0.5.16__py3-none-any.whl → 0.5.18__py3-none-any.whl

jaclang/compiler/jac.lark

@@ -317,9 +317,9 @@ cmp_op: KW_ISN
 
 // Arithmetic expressions
 arithmetic: (arithmetic (MINUS | PLUS))? term
-term: (term (MOD | DIV | FLOOR_DIV | STAR_MUL | DECOR_OP))? factor
-factor: (BW_NOT | MINUS | PLUS) factor | power
-power: (power STAR_POW)? connect
+term: (term (MOD | DIV | FLOOR_DIV | STAR_MUL | DECOR_OP))? power
+power: (power STAR_POW)? factor
+factor: (BW_NOT | MINUS | PLUS) factor | connect
 
 // Connect expressions
 connect: (connect (connect_op | disconnect_op))? atomic_pipe
@@ -539,16 +539,16 @@ KW_POST_INIT: "postinit"
 KW_SUPER: "super"
 KW_ROOT: "root"
 
-FLOAT: /(\d+(\.\d*)|\.\d+)([eE][+-]?\d+)?/
+FLOAT: /(\d+(\.\d*)|\.\d+)([eE][+-]?\d+)?|\d+([eE][-+]?\d+)/
 DOC_STRING.1: /"""(.|\n|\r)*?"""|'''(.|\n|\r)*?'''/
 PYNLINE: /::py::(.|\n|\r)*?::py::/
 STRING: /(r?b?|b?r?)"[^"\r\n]*"|(r?b?|b?r?)'[^'\r\n]*'/
 BOOL.1: /True|False/
 KW_NIN.1: /\bnot\s+in\b/
 KW_ISN.1: /\bis\s+not\b/
-HEX: /0[xX][0-9a-fA-F_]+/
-BIN: /0[bB][01_]+/
-OCT: /0[oO][0-7_]+/
+HEX.1: /0[xX][0-9a-fA-F_]+/
+BIN.1: /0[bB][01_]+/
+OCT.1: /0[oO][0-7_]+/
 INT: /[0-9][0-9_]*/
 NULL.1: /None/
 KWESC_NAME: /<>[a-zA-Z_][a-zA-Z0-9_]*/

jaclang/compiler/parser.py

@@ -287,17 +287,22 @@ class JacParser(Pass):
             if len(kid) == 1 and isinstance(kid[0], ast.Import):
                 return self.nu(kid[0])
             lang = kid[1]
-            paths = [i for i in kid if isinstance(i, ast.ModulePath)]
+            from_path = kid[3] if isinstance(kid[3], ast.ModulePath) else None
+            if from_path:
+                items = kid[-2] if isinstance(kid[-2], ast.SubNodeList) else None
+            else:
+                paths = [i for i in kid if isinstance(i, ast.ModulePath)]
+                items = ast.SubNodeList[ast.ModulePath](
+                    items=paths, delim=Tok.COMMA, kid=kid[2:-1]
+                )
+                kid = kid[:2] + [items] + kid[-1:]
 
-            items = kid[-2] if isinstance(kid[-2], ast.SubNodeList) else None
             is_absorb = False
-            if isinstance(lang, ast.SubTag) and (
-                isinstance(items, ast.SubNodeList) or items is None
-            ):
+            if isinstance(lang, ast.SubTag) and (isinstance(items, ast.SubNodeList)):
                 return self.nu(
                     ast.Import(
-                        lang=lang,
-                        paths=paths,
+                        hint=lang,
+                        from_loc=from_path,
                         items=items,
                         is_absorb=is_absorb,
                         kid=kid,
@@ -342,14 +347,20 @@ class JacParser(Pass):
             include_stmt: KW_INCLUDE sub_name import_path SEMI
             """
             lang = kid[1]
-            paths = [i for i in kid if isinstance(i, ast.ModulePath)]
+            from_path = kid[2]
+            if not isinstance(from_path, ast.ModulePath):
+                raise self.ice()
+            items = ast.SubNodeList[ast.ModulePath](
+                items=[from_path], delim=Tok.COMMA, kid=[from_path]
+            )
+            kid = kid[:2] + [items] + kid[3:]
             is_absorb = True
             if isinstance(lang, ast.SubTag):
                 return self.nu(
                     ast.Import(
-                        lang=lang,
-                        paths=paths,
-                        items=None,
+                        hint=lang,
+                        from_loc=None,
+                        items=items,
                         is_absorb=is_absorb,
                         kid=kid,
                     )
@@ -1919,13 +1930,17 @@ class JacParser(Pass):
                 sig_kid.append(params)
             if return_type:
                 sig_kid.append(return_type)
-            signature = ast.FuncSignature(
-                params=params,
-                return_type=return_type,
-                kid=sig_kid,
+            signature = (
+                ast.FuncSignature(
+                    params=params,
+                    return_type=return_type,
+                    kid=sig_kid,
+                )
+                if params or return_type
+                else None
             )
             new_kid = [i for i in kid if i != params and i != return_type]
-            new_kid.insert(1, signature)
+            new_kid.insert(1, signature) if signature else None
             if isinstance(chomp[0], ast.Expr):
                 return self.nu(
                     ast.LambdaExpr(

jaclang/compiler/passes/ir_pass.py

@@ -1,16 +1,18 @@
 """Abstract class for IR Passes for Jac."""
 
-from typing import Optional, Type
+from typing import Optional, Type, TypeVar
 
 import jaclang.compiler.absyntree as ast
 from jaclang.compiler.passes.transform import Transform
 from jaclang.utils.helpers import pascal_to_snake
 
+T = TypeVar("T", bound=ast.AstNode)
 
-class Pass(Transform[ast.T]):
+
+class Pass(Transform[T]):
     """Abstract class for IR passes."""
 
-    def __init__(self, input_ir: ast.T, prior: Optional[Transform]) -> None:
+    def __init__(self, input_ir: T, prior: Optional[Transform]) -> None:
         """Initialize parser."""
         self.term_signal = False
         self.prune_signal = False
@@ -45,10 +47,10 @@ class Pass(Transform[ast.T]):
 
     @staticmethod
     def get_all_sub_nodes(
-        node: ast.AstNode, typ: Type[ast.T], brute_force: bool = False
-    ) -> list[ast.T]:
+        node: ast.AstNode, typ: Type[T], brute_force: bool = False
+    ) -> list[T]:
         """Get all sub nodes of type."""
-        result: list[ast.T] = []
+        result: list[T] = []
         # Assumes pass built the sub node table
         if not node:
             return result
@@ -69,7 +71,7 @@ class Pass(Transform[ast.T]):
         return result
 
     @staticmethod
-    def has_parent_of_type(node: ast.AstNode, typ: Type[ast.T]) -> Optional[ast.T]:
+    def has_parent_of_type(node: ast.AstNode, typ: Type[T]) -> Optional[T]:
         """Check if node has parent of type."""
         while node.parent:
             if isinstance(node.parent, typ):
@@ -97,7 +99,7 @@ class Pass(Transform[ast.T]):
 
     # Transform Implementations
     # -------------------------
-    def transform(self, ir: ast.T) -> ast.AstNode:
+    def transform(self, ir: T) -> ast.AstNode:
         """Run pass."""
         # Only performs passes on proper ASTs
         if not isinstance(ir, ast.AstNode):

jaclang/compiler/passes/main/fuse_typeinfo_pass.py

@@ -6,15 +6,16 @@ mypy apis into Jac and use jac py ast in it.
 
 from __future__ import annotations
 
-import os
 import traceback
 from typing import Callable, TypeVar
 
 import jaclang.compiler.absyntree as ast
 from jaclang.compiler.passes import Pass
+from jaclang.settings import settings
 from jaclang.utils.helpers import pascal_to_snake
 from jaclang.vendor.mypy.nodes import Node as VNode  # bit of a hack
 
+
 import mypy.nodes as MypyNodes  # noqa N812
 import mypy.types as MypyTypes  # noqa N812
 from mypy.checkexpr import Type as MyType
@@ -29,7 +30,7 @@ class FuseTypeInfoPass(Pass):
     node_type_hash: dict[MypyNodes.Node | VNode, MyType] = {}
 
     def __debug_print(self, *argv: object) -> None:
-        if "FuseTypeInfoDebug" in os.environ:
+        if settings.fuse_type_info_debug:
             print("FuseTypeInfo::", *argv)
 
     def __call_type_handler(

jaclang/compiler/passes/main/import_pass.py

@@ -7,7 +7,6 @@ symbols are available for matching.
 
 import ast as py_ast
 import importlib.util
-import os
 import sys
 from os import path
 from typing import Optional
@@ -16,6 +15,7 @@ from typing import Optional
 import jaclang.compiler.absyntree as ast
 from jaclang.compiler.passes import Pass
 from jaclang.compiler.passes.main import SubNodeTabPass
+from jaclang.settings import settings
 from jaclang.utils.helpers import import_target_to_relative_path
 
 
@@ -36,7 +36,8 @@ class ImportPass(Pass):
             self.run_again = False
             all_imports = self.get_all_sub_nodes(node, ast.ModulePath)
             for i in all_imports:
-                if i.parent.lang.tag.value == "jac" and not i.sub_module:
+                lang = i.parent_of_type(ast.Import).hint.tag.value
+                if lang == "jac" and not i.sub_module:
                     self.run_again = True
                     mod = self.import_module(
                         node=i,
@@ -48,9 +49,7 @@ class ImportPass(Pass):
                     self.annex_impl(mod)
                     i.sub_module = mod
                     i.add_kids_right([mod], pos_update=False)
-                elif i.parent.lang.tag.value == "py" and os.environ.get(
-                    "JAC_PROC_DEBUG", False
-                ):
+                elif lang == "py" and settings.jac_proc_debug:
                     mod = self.import_py_module(node=i, mod_path=node.loc.mod_path)
                     i.sub_module = mod
                     i.add_kids_right([mod], pos_update=False)

jaclang/compiler/passes/main/pyast_gen_pass.py

@@ -492,17 +492,20 @@ class PyastGenPass(Pass):
             py_nodes.append(
                 self.sync(ast3.Expr(value=node.doc.gen.py_ast[0]), jac_node=node.doc)
             )
-        py_compat_path_str = []
-        path_alias = {}
-        for path in node.paths:
-            py_compat_path_str.append(path.path_str.lstrip("."))
-            path_alias[path.path_str] = path.alias.sym_name if path.alias else None
+        path_alias: dict[str, Optional[str]] = (
+            {node.from_loc.path_str: None} if node.from_loc else {}
+        )
         imp_from = {}
         if node.items:
             for item in node.items.items:
-                imp_from[item.name.sym_name] = (
-                    item.alias.sym_name if item.alias else False
-                )
+                if isinstance(item, ast.ModuleItem):
+                    imp_from[item.name.sym_name] = (
+                        item.alias.sym_name if item.alias else False
+                    )
+                elif isinstance(item, ast.ModulePath):
+                    path_alias[item.path_str] = (
+                        item.alias.sym_name if item.alias else None
+                    )
 
         keys = []
         values = []
@@ -557,9 +560,9 @@ class PyastGenPass(Pass):
                                             arg="lng",
                                             value=self.sync(
                                                 ast3.Constant(
-                                                    value=node.lang.tag.value
+                                                    value=node.hint.tag.value
                                                 ),
-                                                node.lang,
+                                                node.hint,
                                             ),
                                         )
                                     ),
@@ -594,10 +597,13 @@ class PyastGenPass(Pass):
                 )
             )
         if node.is_absorb:
+            source = node.items.items[0]
+            if not isinstance(source, ast.ModulePath):
+                raise self.ice()
             py_nodes.append(
                 self.sync(
                     py_node=ast3.ImportFrom(
-                        module=py_compat_path_str[0] if py_compat_path_str[0] else None,
+                        module=(source.path_str.lstrip(".") if source else None),
                         names=[self.sync(ast3.alias(name="*"), node)],
                         level=0,
                     ),
@@ -608,15 +614,17 @@ class PyastGenPass(Pass):
                 self.warning(
                     "Includes import * in target module into current namespace."
                 )
-        if not node.items:
-            py_nodes.append(
-                self.sync(ast3.Import(names=[i.gen.py_ast[0] for i in node.paths]))
-            )
+        if not node.from_loc:
+            py_nodes.append(self.sync(ast3.Import(names=node.items.gen.py_ast)))
         else:
             py_nodes.append(
                 self.sync(
                     ast3.ImportFrom(
-                        module=py_compat_path_str[0] if py_compat_path_str[0] else None,
+                        module=(
+                            node.from_loc.path_str.lstrip(".")
+                            if node.from_loc
+                            else None
+                        ),
                         names=node.items.gen.py_ast,
                         level=0,
                     )
@@ -1674,7 +1682,7 @@ class PyastGenPass(Pass):
             self.sync(
                 ast3.Try(
                     body=self.resolve_stmt_block(node.body),
-                    handlers=node.excepts.gen.py_ast if node.excepts else None,
+                    handlers=node.excepts.gen.py_ast if node.excepts else [],
                     orelse=node.else_body.gen.py_ast if node.else_body else [],
                     finalbody=node.finally_body.gen.py_ast if node.finally_body else [],
                 )
@@ -2376,7 +2384,19 @@ class PyastGenPass(Pass):
         node.gen.py_ast = [
             self.sync(
                 ast3.Lambda(
-                    args=node.signature.gen.py_ast[0],
+                    args=(
+                        node.signature.gen.py_ast[0]
+                        if node.signature
+                        else self.sync(
+                            ast3.arguments(
+                                posonlyargs=[],
+                                args=[],
+                                kwonlyargs=[],
+                                kw_defaults=[],
+                                defaults=[],
+                            )
+                        )
+                    ),
                     body=node.body.gen.py_ast[0],
                 )
             )
@@ -2435,11 +2455,16 @@ class PyastGenPass(Pass):
                 )
             ]
         elif node.op.name in [Tok.STAR_MUL]:
+            ctx_val = (
+                node.operand.py_ctx_func()
+                if isinstance(node.operand, ast.AstSymbolNode)
+                else ast3.Load()
+            )
             node.gen.py_ast = [
                 self.sync(
                     ast3.Starred(
                         value=node.operand.gen.py_ast[0],
-                        ctx=ast3.Load(),
+                        ctx=ctx_val,
                     )
                 )
             ]
@@ -3648,7 +3673,22 @@ class PyastGenPass(Pass):
         pos_start: int,
         pos_end: int,
         """
-        node.gen.py_ast = [self.sync(ast3.Constant(value=int(node.value)))]
+
+        def handle_node_value(value: str) -> int:
+            if value.startswith(("0x", "0X")):
+                return int(value, 16)
+            elif value.startswith(("0b", "0B")):
+                return int(value, 2)
+            elif value.startswith(("0o", "0O")):
+                return int(value, 8)
+            else:
+                return int(value)
+
+        node.gen.py_ast = [
+            self.sync(
+                ast3.Constant(value=handle_node_value(str(node.value)), kind=None)
+            )
+        ]
 
     def exit_string(self, node: ast.String) -> None:
         """Sub objects.

jaclang/compiler/passes/main/pyast_load_pass.py

@@ -1372,12 +1372,13 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             pos_end=0,
         )
         pytag = ast.SubTag[ast.Name](tag=lang, kid=[lang])
+        items = ast.SubNodeList[ast.ModulePath](items=paths, delim=Tok.COMMA, kid=paths)
         ret = ast.Import(
-            lang=pytag,
-            paths=paths,
-            items=None,
+            hint=pytag,
+            from_loc=None,
+            items=items,
             is_absorb=False,
-            kid=[pytag, *paths],
+            kid=[pytag, items],
         )
         return ret
 
@@ -1448,8 +1449,8 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             raise self.ice("No valid names in import from")
         pytag = ast.SubTag[ast.Name](tag=lang, kid=[lang])
         ret = ast.Import(
-            lang=pytag,
-            paths=[path],
+            hint=pytag,
+            from_loc=path,
             items=items,
             is_absorb=False,
             kid=[pytag, path, items],

jaclang/compiler/passes/main/sym_tab_build_pass.py

@@ -61,14 +61,21 @@ class SymTabPass(Pass):
             node.sym_name_node.py_ctx_func = ast3.Store
         if isinstance(node, (ast.TupleVal, ast.ListVal)) and node.values:
 
-            def fix(item: ast.TupleVal | ast.ListVal) -> None:
-                for i in item.values.items if item.values else []:
-                    if isinstance(i, ast.AstSymbolNode):
-                        i.py_ctx_func = ast3.Store
-                    elif isinstance(i, ast.AtomTrailer):
-                        self.chain_def_insert(self.unwind_atom_trailer(i))
-                    if isinstance(i, (ast.TupleVal, ast.ListVal)):
-                        fix(i)
+            # Handling of UnaryExpr case for item is only necessary for
+            # the generation of Starred nodes in the AST for examples
+            # like `(a, *b) = (1, 2, 3, 4)`.
+            def fix(item: ast.TupleVal | ast.ListVal | ast.UnaryExpr) -> None:
+                if isinstance(item, ast.UnaryExpr):
+                    if isinstance(item.operand, ast.AstSymbolNode):
+                        item.operand.py_ctx_func = ast3.Store
+                elif isinstance(item, (ast.TupleVal, ast.ListVal)):
+                    for i in item.values.items if item.values else []:
+                        if isinstance(i, ast.AstSymbolNode):
+                            i.py_ctx_func = ast3.Store
+                        elif isinstance(i, ast.AtomTrailer):
+                            self.chain_def_insert(self.unwind_atom_trailer(i))
+                        if isinstance(i, (ast.TupleVal, ast.ListVal, ast.UnaryExpr)):
+                            fix(i)
 
             fix(node)
         self.handle_hit_outcome(node)
@@ -381,16 +388,22 @@ class SymTabBuildPass(SymTabPass):
         is_absorb: bool,
         sub_module: Optional[Module],
         """
-        if node.items:
+        if not node.is_absorb:
             for i in node.items.items:
                 self.def_insert(i, single_decl="import item")
-        elif node.is_absorb and node.lang.tag.value == "jac":
-            if not node.paths[0].sub_module or not node.paths[0].sub_module.sym_tab:
+        elif node.is_absorb and node.hint.tag.value == "jac":
+            source = node.items.items[0]
+            if (
+                not isinstance(source, ast.ModulePath)
+                or not source.sub_module
+                or not source.sub_module.sym_tab
+            ):
                 self.error(
-                    f"Module {node.paths[0].path_str} not found to include *, or ICE occurred!"
+                    f"Module {node.from_loc.path_str if node.from_loc else 'from location'}"
+                    f" not found to include *, or ICE occurred!"
                 )
             else:
-                for v in node.paths[0].sub_module.sym_tab.tab.values():
+                for v in source.sub_module.sym_tab.tab.values():
                     self.def_insert(v.decl, table_override=self.cur_scope())
 
     def enter_module_path(self, node: ast.ModulePath) -> None: