jaclang 0.4.6__py3-none-any.whl → 0.5.0__py3-none-any.whl

jaclang/compiler/parser.py

@@ -1,10 +1,11 @@
 """Lark parser for Jac Lang."""
+
 from __future__ import annotations
 
 
 import logging
 import os
-from typing import Callable, TypeAlias
+from typing import Callable, TypeAlias, cast
 
 
 import jaclang.compiler.absyntree as ast
@@ -281,26 +282,20 @@ class JacParser(Pass):
             """Grammar rule.
 
             import_stmt: KW_IMPORT sub_name KW_FROM import_path COMMA import_items SEMI
-                    | KW_IMPORT sub_name import_path SEMI
+                    | KW_IMPORT sub_name import_path (COMMA import_path)* SEMI
             """
             lang = kid[1]
-            path = kid[3] if isinstance(kid[3], ast.ModulePath) else kid[2]
+            paths = [i for i in kid if isinstance(i, ast.ModulePath)]
 
-            items = (
-                kid[-2]
-                if len(kid) > 4 and isinstance(kid[-2], ast.SubNodeList)
-                else None
-            )
+            items = kid[-2] if isinstance(kid[-2], ast.SubNodeList) else None
             is_absorb = False
-            if (
-                isinstance(lang, ast.SubTag)
-                and isinstance(path, ast.ModulePath)
-                and (isinstance(items, ast.SubNodeList) or items is None)
+            if isinstance(lang, ast.SubTag) and (
+                isinstance(items, ast.SubNodeList) or items is None
             ):
                 return self.nu(
                     ast.Import(
                         lang=lang,
-                        path=path,
+                        paths=paths,
                         items=items,
                         is_absorb=is_absorb,
                         kid=kid,
@@ -316,13 +311,13 @@ class JacParser(Pass):
             include_stmt: KW_INCLUDE sub_name import_path SEMI
             """
             lang = kid[1]
-            path = kid[3] if isinstance(kid[3], ast.ModulePath) else kid[2]
+            paths = [i for i in kid if isinstance(i, ast.ModulePath)]
             is_absorb = True
-            if isinstance(lang, ast.SubTag) and isinstance(path, ast.ModulePath):
+            if isinstance(lang, ast.SubTag):
                 return self.nu(
                     ast.Import(
                         lang=lang,
-                        path=path,
+                        paths=paths,
                         items=None,
                         is_absorb=is_absorb,
                         kid=kid,
@@ -418,16 +413,12 @@ class JacParser(Pass):
             semstr = (
                 kid[2]
                 if (access and isinstance(kid[2], ast.String))
-                else kid[1]
-                if isinstance(kid[1], ast.String)
-                else None
+                else kid[1] if isinstance(kid[1], ast.String) else None
             )
             name = (
                 kid[3]
                 if (access and semstr)
-                else kid[2]
-                if (access or semstr)
-                else kid[1]
+                else kid[2] if (access or semstr) else kid[1]
             )
             inh = kid[-2] if isinstance(kid[-2], ast.SubNodeList) else None
             body = kid[-1] if isinstance(kid[-1], ast.SubNodeList) else None
@@ -584,16 +575,12 @@ class JacParser(Pass):
             semstr = (
                 kid[2]
                 if (access and isinstance(kid[2], ast.String))
-                else kid[1]
-                if isinstance(kid[1], ast.String)
-                else None
+                else kid[1] if isinstance(kid[1], ast.String) else None
             )
             name = (
                 kid[3]
                 if (access and semstr)
-                else kid[2]
-                if (access or semstr)
-                else kid[1]
+                else kid[2] if (access or semstr) else kid[1]
             )
             inh = kid[-2] if isinstance(kid[-2], ast.SubNodeList) else None
             body = kid[-1] if isinstance(kid[-1], ast.SubNodeList) else None
@@ -673,37 +660,49 @@ class JacParser(Pass):
             """Grammar rule.
 
             ability: decorators? ability_def
-                    | decorators? KW_ASYNC ability_decl
-                    | decorators? ability_decl
+                    | decorators? KW_ASYNC? ability_decl
             """
-            if isinstance(kid[0], ast.SubNodeList):
-                if isinstance(kid[1], (ast.Ability, ast.AbilityDef)):
-                    for dec in kid[0].items:
-                        if (
-                            isinstance(dec, ast.NameSpec)
-                            and dec.sym_name == "staticmethod"
-                            and isinstance(kid[1], (ast.Ability))
-                        ):
-                            kid[1].is_static = True
-                            kid[0].items.remove(dec)  # noqa: B038
-                            break
-                    if len(kid[0].items):
-                        kid[1].decorators = kid[0]
-                        kid[1].add_kids_left([kid[0]])
-                    return self.nu(kid[1])
-                else:
-                    raise self.ice()
-            elif isinstance(kid[0], (ast.Ability, ast.AbilityDef)):
-                return self.nu(kid[0])
-            else:
-                raise self.ice()
+            chomp = [*kid]
+            decorators = chomp[0] if isinstance(chomp[0], ast.SubNodeList) else None
+            chomp = chomp[1:] if decorators else chomp
+            is_async = (
+                chomp[0]
+                if isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_ASYNC
+                else None
+            )
+            ability = chomp[1] if is_async else chomp[0]
+            if not isinstance(ability, (ast.Ability, ast.AbilityDef)):
+                raise self.ice()
+            if is_async and isinstance(ability, ast.Ability):
+                ability.is_async = True
+                ability.add_kids_left([is_async])
+            if isinstance(decorators, ast.SubNodeList):
+                for dec in decorators.items:
+                    if (
+                        isinstance(dec, ast.NameSpec)
+                        and dec.sym_name == "staticmethod"
+                        and isinstance(ability, (ast.Ability))
+                    ):
+                        ability.is_static = True
+                        decorators.items.remove(dec)  # noqa: B038
+                        break
+                if len(decorators.items):
+                    ability.decorators = decorators
+                    ability.add_kids_left([decorators])
+                return self.nu(ability)
+            return self.nu(ability)
 
         def ability_decl(self, kid: list[ast.AstNode]) -> ast.Ability:
             """Grammar rule.
 
-            ability_decl: KW_STATIC? KW_CAN access_tag? STRING? any_ref (func_decl | event_clause) (code_block | SEMI)
+            ability_decl: KW_OVERRIDE? KW_STATIC? KW_CAN access_tag? STRING?
+                any_ref (func_decl | event_clause) (code_block | SEMI)
             """
             chomp = [*kid]
+            is_override = (
+                isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_OVERRIDE
+            )
+            chomp = chomp[1:] if is_override else chomp
             is_static = (
                 isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_STATIC
             )
@@ -726,6 +725,7 @@ class JacParser(Pass):
                         name_ref=name,
                         is_func=is_func,
                         is_async=False,
+                        is_override=is_override,
                         is_static=is_static,
                         is_abstract=False,
                         access=access,
@@ -762,29 +762,23 @@ class JacParser(Pass):
         def abstract_ability(self, kid: list[ast.AstNode]) -> ast.Ability:
             """Grammar rule.
 
-            abstract_ability: KW_STATIC? KW_CAN access_tag? STRING?  any_ref (func_decl | event_clause) KW_ABSTRACT SEMI
+            abstract_ability: KW_OVERRIDE? KW_STATIC? KW_CAN access_tag? STRING?
+                any_ref (func_decl | event_clause) KW_ABSTRACT SEMI
             """
             chomp = [*kid]
+            is_override = (
+                isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_OVERRIDE
+            )
+            chomp = chomp[1:] if is_override else chomp
             is_static = (
                 isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_STATIC
             )
             chomp = chomp[1:] if is_static else chomp
             chomp = chomp[1:]
             access = chomp[0] if isinstance(chomp[0], ast.SubTag) else None
-            semstr = (
-                chomp[1]
-                if access and isinstance(chomp[1], ast.String)
-                else chomp[0]
-                if access or isinstance(chomp[1], ast.String)
-                else None
-            )
-            chomp = (
-                chomp[2:]
-                if access and semstr
-                else chomp[1:]
-                if access or semstr
-                else chomp
-            )
+            chomp = chomp[1:] if access else chomp
+            semstr = chomp[0] if isinstance(chomp[0], ast.String) else None
+            chomp = chomp[1:] if semstr else chomp
             name = chomp[0]
             chomp = chomp[1:]
             is_func = isinstance(chomp[0], ast.FuncSignature)
@@ -798,6 +792,7 @@ class JacParser(Pass):
                         name_ref=name,
                         is_func=is_func,
                         is_async=False,
+                        is_override=is_override,
                         is_static=is_static,
                         is_abstract=True,
                         access=access,
@@ -892,9 +887,7 @@ class JacParser(Pass):
             semstr = (
                 kid[1]
                 if (star and isinstance(kid[1], ast.String))
-                else kid[0]
-                if isinstance(kid[0], ast.String)
-                else None
+                else kid[0] if isinstance(kid[0], ast.String) else None
             )
             name = (
                 kid[2] if (star and semstr) else kid[1] if (star or semstr) else kid[0]
@@ -1182,10 +1175,12 @@ class JacParser(Pass):
                     ast.IfStmt(
                         condition=kid[1],
                         body=kid[2],
-                        else_body=kid[3]
-                        if len(kid) > 3
-                        and isinstance(kid[3], (ast.ElseStmt, ast.ElseIf))
-                        else None,
+                        else_body=(
+                            kid[3]
+                            if len(kid) > 3
+                            and isinstance(kid[3], (ast.ElseStmt, ast.ElseIf))
+                            else None
+                        ),
                         kid=kid,
                     )
                 )
@@ -1202,10 +1197,12 @@ class JacParser(Pass):
                     ast.ElseIf(
                         condition=kid[1],
                         body=kid[2],
-                        else_body=kid[3]
-                        if len(kid) > 3
-                        and isinstance(kid[3], (ast.ElseStmt, ast.ElseIf))
-                        else None,
+                        else_body=(
+                            kid[3]
+                            if len(kid) > 3
+                            and isinstance(kid[3], (ast.ElseStmt, ast.ElseIf))
+                            else None
+                        ),
                         kid=kid,
                     )
                 )
@@ -1339,9 +1336,11 @@ class JacParser(Pass):
                             condition=chomp[3],
                             count_by=chomp[5],
                             body=chomp[6],
-                            else_body=chomp[-1]
-                            if isinstance(chomp[-1], ast.ElseStmt)
-                            else None,
+                            else_body=(
+                                chomp[-1]
+                                if isinstance(chomp[-1], ast.ElseStmt)
+                                else None
+                            ),
                             kid=kid,
                         )
                     )
@@ -1357,9 +1356,11 @@ class JacParser(Pass):
                             target=chomp[1],
                             collection=chomp[3],
                             body=chomp[4],
-                            else_body=chomp[-1]
-                            if isinstance(chomp[-1], ast.ElseStmt)
-                            else None,
+                            else_body=(
+                                chomp[-1]
+                                if isinstance(chomp[-1], ast.ElseStmt)
+                                else None
+                            ),
                             kid=kid,
                         )
                     )
@@ -1471,9 +1472,9 @@ class JacParser(Pass):
                 return self.nu(
                     ast.AssertStmt(
                         condition=condition,
-                        error_msg=error_msg
-                        if isinstance(error_msg, ast.Expr)
-                        else None,
+                        error_msg=(
+                            error_msg if isinstance(error_msg, ast.Expr) else None
+                        ),
                         kid=kid,
                     )
                 )
@@ -2035,9 +2036,7 @@ class JacParser(Pass):
         def unpack(self, kid: list[ast.AstNode]) -> ast.Expr:
             """Grammar rule.
 
-            unpack: ref
-                | STAR_MUL unpack
-                | STAR_POW unpack
+            unpack: STAR_MUL? ref
             """
             if len(kid) == 2:
                 if isinstance(kid[0], ast.Token) and isinstance(kid[1], ast.Expr):
@@ -2203,7 +2202,8 @@ class JacParser(Pass):
                 elif len(kid[0].values.items) == 1:
                     expr = kid[0].values.items[0]  # TODO: Loses braces
                 else:
-                    expr = ast.TupleVal(values=kid[0].values, kid=kid[0].kid)
+                    vals = cast("ast.SubNodeList[ast.Expr|ast.KWPair]", kid[0].values)
+                    expr = ast.TupleVal(values=vals, kid=kid[0].kid)
                 if expr is None:
                     raise self.ice()
                 return self.nu(
@@ -2388,9 +2388,11 @@ class JacParser(Pass):
             fstr_parts: (FSTR_PIECE | FSTR_BESC | LBRACE expression RBRACE | fstring)*
             """
             valid_parts: list[ast.String | ast.ExprStmt] = [
-                i
-                if isinstance(i, ast.String)
-                else ast.ExprStmt(expr=i, in_fstring=True, kid=[i])
+                (
+                    i
+                    if isinstance(i, ast.String)
+                    else ast.ExprStmt(expr=i, in_fstring=True, kid=[i])
+                )
                 for i in kid
                 if isinstance(i, ast.Expr)
             ]
@@ -2409,9 +2411,11 @@ class JacParser(Pass):
             fstr_sq_parts: (FSTR_SQ_PIECE | FSTR_BESC | LBRACE expression RBRACE )*
             """
             valid_parts: list[ast.String | ast.ExprStmt] = [
-                i
-                if isinstance(i, ast.String)
-                else ast.ExprStmt(expr=i, in_fstring=True, kid=[i])
+                (
+                    i
+                    if isinstance(i, ast.String)
+                    else ast.ExprStmt(expr=i, in_fstring=True, kid=[i])
+                )
                 for i in kid
                 if isinstance(i, ast.Expr)
             ]
@@ -2539,9 +2543,13 @@ class JacParser(Pass):
         def kw_expr(self, kid: list[ast.AstNode]) -> ast.KWPair:
             """Grammar rule.
 
-            kw_expr: any_ref EQ expression
+            kw_expr: any_ref EQ expression | STAR_POW expression
             """
-            if isinstance(kid[0], ast.NameSpec) and isinstance(kid[2], ast.Expr):
+            if (
+                len(kid) == 3
+                and isinstance(kid[0], ast.NameSpec)
+                and isinstance(kid[2], ast.Expr)
+            ):
                 return self.nu(
                     ast.KWPair(
                         key=kid[0],
@@ -2549,6 +2557,14 @@ class JacParser(Pass):
                         kid=kid,
                     )
                 )
+            elif len(kid) == 2 and isinstance(kid[1], ast.Expr):
+                return self.nu(
+                    ast.KWPair(
+                        key=None,
+                        value=kid[1],
+                        kid=kid,
+                    )
+                )
             else:
                 raise self.ice()
 
@@ -2625,9 +2641,13 @@ class JacParser(Pass):
         def kv_pair(self, kid: list[ast.AstNode]) -> ast.KVPair:
             """Grammar rule.
 
-            kv_pair: expression COLON expression
+            kv_pair: expression COLON expression | STAR_POW expression
             """
-            if isinstance(kid[0], ast.Expr) and isinstance(kid[2], ast.Expr):
+            if (
+                len(kid) == 3
+                and isinstance(kid[0], ast.Expr)
+                and isinstance(kid[2], ast.Expr)
+            ):
                 return self.nu(
                     ast.KVPair(
                         key=kid[0],
@@ -2635,6 +2655,14 @@ class JacParser(Pass):
                         kid=kid,
                     )
                 )
+            elif len(kid) == 2 and isinstance(kid[1], ast.Expr):
+                return self.nu(
+                    ast.KVPair(
+                        key=None,
+                        value=kid[1],
+                        kid=kid,
+                    )
+                )
             else:
                 raise self.ice()
 
@@ -2723,9 +2751,11 @@ class JacParser(Pass):
                         is_async=is_async,
                         target=chomp[0],
                         collection=chomp[2],
-                        conditional=chomp[4]
-                        if len(chomp) > 4 and isinstance(chomp[4], ast.Expr)
-                        else None,
+                        conditional=(
+                            chomp[4]
+                            if len(chomp) > 4 and isinstance(chomp[4], ast.Expr)
+                            else None
+                        ),
                         kid=chomp,
                     )
                 )
@@ -2853,6 +2883,22 @@ class JacParser(Pass):
             else:
                 raise self.ice()
 
+        def class_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
+            """Grammar rule.
+
+            class_ref: CLASS_OP name_ref
+            """
+            if isinstance(kid[0], ast.Token) and isinstance(kid[1], ast.NameSpec):
+                return self.nu(
+                    ast.ArchRef(
+                        arch=kid[0],
+                        name_ref=kid[1],
+                        kid=kid,
+                    )
+                )
+            else:
+                raise self.ice()
+
         def object_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
             """Grammar rule.
 
@@ -3512,10 +3558,12 @@ class JacParser(Pass):
                 second
                 if isinstance(second, ast.SubNodeList)
                 and isinstance(second.items[0], ast.MatchKVPair)
-                else first
-                if isinstance(first, ast.SubNodeList)
-                and isinstance(first.items[0], ast.MatchKVPair)
-                else None
+                else (
+                    first
+                    if isinstance(first, ast.SubNodeList)
+                    and isinstance(first.items[0], ast.MatchKVPair)
+                    else None
+                )
             )
             if isinstance(name, ast.NameSpec):
                 return self.nu(

jaclang/compiler/passes/ir_pass.py

@@ -1,4 +1,5 @@
 """Abstract class for IR Passes for Jac."""
+
 from typing import Optional, Type
 
 import jaclang.compiler.absyntree as ast

jaclang/compiler/passes/main/__init__.py

@@ -1,11 +1,12 @@
 """Collection of passes for Jac IR."""
+
 from .sub_node_tab_pass import SubNodeTabPass
 from .import_pass import ImportPass  # noqa: I100
 from .sym_tab_build_pass import SymTabBuildPass  # noqa: I100
 from .def_impl_match_pass import DeclDefMatchPass  # noqa: I100
 from .def_use_pass import DefUsePass  # noqa: I100
 from .pyout_pass import PyOutPass  # noqa: I100
-from .pyast_load_pass import PyastBuildPass  # noqa: I100
+from .pyast_load_pass import PyastBuildPass  # type: ignore # noqa: I100
 from .pyast_gen_pass import PyastGenPass  # noqa: I100
 from .schedules import py_code_gen  # noqa: I100
 from .type_check_pass import JacTypeCheckPass  # noqa: I100

jaclang/compiler/passes/main/def_impl_match_pass.py

@@ -5,6 +5,7 @@ that are separate from their implementations (Defs). This pass creates a link
 in the ast between the Decls and Defs of Architypes and Abilities through the
 body field.
 """
+
 import jaclang.compiler.absyntree as ast
 from jaclang.compiler.passes import Pass
 from jaclang.compiler.passes.main import SubNodeTabPass

jaclang/compiler/passes/main/def_use_pass.py

@@ -5,6 +5,7 @@ symbol table. This includes assignments, parameters, arch ref chains,
 and more. This pass also links the symbols in the AST to their corresponding
 sybmols in the symbol table (including uses).
 """
+
 import ast as ast3
 
 import jaclang.compiler.absyntree as ast

jaclang/compiler/passes/main/import_pass.py

@@ -4,6 +4,7 @@ This pass statically imports all modules used in import statements in the
 current module. This pass is run before the def/decl pass to ensure that all
 symbols are available for matching.
 """
+
 import ast as py_ast
 import importlib.util
 import sys
@@ -32,9 +33,9 @@ class ImportPass(Pass):
         self.run_again = True
         while self.run_again:
             self.run_again = False
-            all_imports = self.get_all_sub_nodes(node, ast.Import)
+            all_imports = self.get_all_sub_nodes(node, ast.ModulePath)
             for i in all_imports:
-                if i.lang.tag.value == "jac" and not i.sub_module:
+                if i.parent.lang.tag.value == "jac" and not i.sub_module:
                     self.run_again = True
                     mod = self.import_module(
                         node=i,
@@ -48,7 +49,7 @@ class ImportPass(Pass):
                     i.add_kids_right([mod], pos_update=False)
                 # elif i.lang.tag.value == "py":
                 #     self.import_py_module(node=i, mod_path=node.loc.mod_path)
-                self.enter_import(i)
+                self.enter_module_path(i)
             SubNodeTabPass(prior=self, input_ir=node)
         self.annex_impl(node)
         node.mod_deps = self.import_table
@@ -74,34 +75,31 @@ class ImportPass(Pass):
                 node.add_kids_right([mod], pos_update=False)
                 mod.parent = node
 
-    def enter_import(self, node: ast.Import) -> None:
+    def enter_module_path(self, node: ast.ModulePath) -> None:
         """Sub objects.
 
-        lang: Name,
-        path: ModulePath,
+        path: Sequence[Token],
         alias: Optional[Name],
-        items: Optional[ModuleItems], # Items matched during def/decl pass
-        is_absorb: bool,
-        self.sub_module = None
+        sub_module: Optional[Module] = None,
         """
-        if node.path.alias and node.sub_module:
-            node.sub_module.name = node.path.alias.value
+        if node.alias and node.sub_module:
+            node.sub_module.name = node.alias.value
         # Items matched during def/decl pass
 
     # Utility functions
     # -----------------
 
-    def import_module(self, node: ast.Import, mod_path: str) -> ast.Module | None:
+    def import_module(self, node: ast.ModulePath, mod_path: str) -> ast.Module | None:
         """Import a module."""
         self.cur_node = node  # impacts error reporting
         target = import_target_to_relative_path(
-            node.path.path_str, path.dirname(node.loc.mod_path)
+            node.path_str, path.dirname(node.loc.mod_path)
         )
         return self.import_mod_from_file(target)
 
     def import_mod_from_file(self, target: str) -> ast.Module | None:
         """Import a module from a file."""
-        from jaclang.compiler.transpiler import jac_file_to_pass
+        from jaclang.compiler.compile import jac_file_to_pass
         from jaclang.compiler.passes.main import SubNodeTabPass
 
         if not path.exists(target):
@@ -125,7 +123,9 @@ class ImportPass(Pass):
             self.error(f"Module {target} is not a valid Jac module.")
             return None
 
-    def import_py_module(self, node: ast.Import, mod_path: str) -> Optional[ast.Module]:
+    def import_py_module(
+        self, node: ast.ModulePath, mod_path: str
+    ) -> Optional[ast.Module]:
         """Import a module."""
         from jaclang.compiler.passes.main import PyastBuildPass
 
@@ -134,7 +134,7 @@ class ImportPass(Pass):
 
         try:
             # Dynamically import the module
-            spec = importlib.util.find_spec(node.path.path_str)
+            spec = importlib.util.find_spec(node.path_str)
             sys.path.remove(base_dir)
             if spec and spec.origin and spec.origin not in {None, "built-in", "frozen"}:
                 if spec.origin in self.import_table:
@@ -150,11 +150,11 @@ class ImportPass(Pass):
                     return mod
                 else:
                     raise self.ice(
-                        f"Failed to import python module {node.path.path_str}: {spec.origin}"
+                        f"Failed to import python module {node.path_str}: {spec.origin}"
                     )
         except Exception as e:
             self.error(
-                f"Failed to import python module {node.path.path_str}: {e}",
+                f"Failed to import python module {node.path_str}: {e}",
                 node_override=node,
             )
         return None