jaclang 0.2.4__py3-none-any.whl → 0.3.0__py3-none-any.whl

jaclang/jac/absyntree.py

@@ -2,13 +2,13 @@
 from __future__ import annotations
 
 import ast as ast3
-import pprint
 from typing import Any, Callable, Generic, Optional, Sequence, Type, TypeVar
 
 from jaclang.jac.codeloc import CodeGenTarget, CodeLocInfo
 from jaclang.jac.constant import Constants as Con, EdgeDir
 from jaclang.jac.constant import Tokens as Tok
 from jaclang.jac.symtable import Symbol, SymbolAccess, SymbolTable, SymbolType
+from jaclang.utils.treeprinter import print_ast_tree
 
 
 class AstNode:
@@ -91,12 +91,9 @@ class AstNode:
             ret["value"] = self.value
         return ret
 
-    def print(self, use_pp: bool = False, depth: Optional[int] = None) -> None:
+    def pp(self, depth: Optional[int] = None) -> str:
         """Print ast."""
-        if use_pp:
-            pprint.PrettyPrinter(depth=depth).pprint(self.to_dict())
-        else:
-            print_tree(self)
+        return print_ast_tree(self, max_depth=depth)
 
 
 class AstSymbolNode(AstNode):
@@ -175,6 +172,10 @@ class WalkerStmtOnlyNode(AstNode):
 class AstImplOnlyNode(AstNode):
     """ImplOnly node type for Jac Ast."""
 
+    def __init__(self, decl_link: Optional[AstNode]) -> None:
+        """Initialize impl only node."""
+        self.decl_link = decl_link
+
 
 class Expr(AstNode):
     """Expr node type for Jac Ast."""
@@ -317,6 +318,7 @@ class Test(AstSymbolNode, ElementStmt):
                 kid=name.kid,
             )
         )
+        self.name.parent = self
         # kid[0] = self.name  # Index is 0 since Doc string is inserted after init
         self.body = body
         AstNode.__init__(self, kid=kid)
@@ -483,7 +485,6 @@ class ArchDef(ArchSpec, AstImplOnlyNode):
         """Initialize arch def node."""
         self.target = target
         self.body = body
-        self.decl_link = decl_link
         AstNode.__init__(self, kid=kid)
         AstSymbolNode.__init__(
             self,
@@ -493,6 +494,7 @@ class ArchDef(ArchSpec, AstImplOnlyNode):
         )
         AstDocNode.__init__(self, doc=doc)
         ArchSpec.__init__(self, decorators=decorators)
+        AstImplOnlyNode.__init__(self, decl_link=decl_link)
 
 
 class Enum(ArchSpec, AstAccessNode):
@@ -539,7 +541,6 @@ class EnumDef(ArchSpec, AstImplOnlyNode):
         """Initialize arch def node."""
         self.target = target
         self.body = body
-        self.decl_link = decl_link
         AstNode.__init__(self, kid=kid)
         AstSymbolNode.__init__(
             self,
@@ -549,6 +550,7 @@ class EnumDef(ArchSpec, AstImplOnlyNode):
         )
         AstDocNode.__init__(self, doc=doc)
         ArchSpec.__init__(self, decorators=decorators)
+        AstImplOnlyNode.__init__(self, decl_link=decl_link)
 
 
 class Ability(
@@ -632,7 +634,6 @@ class AbilityDef(AstSymbolNode, ElementStmt, AstImplOnlyNode, CodeBlockStmt):
         self.signature = signature
         self.body = body
         self.decorators = decorators
-        self.decl_link = decl_link
         AstNode.__init__(self, kid=kid)
         AstSymbolNode.__init__(
             self,
@@ -641,6 +642,15 @@ class AbilityDef(AstSymbolNode, ElementStmt, AstImplOnlyNode, CodeBlockStmt):
             sym_type=SymbolType.IMPL,
         )
         AstDocNode.__init__(self, doc=doc)
+        AstImplOnlyNode.__init__(self, decl_link=decl_link)
+
+    @property
+    def is_method(self) -> bool:
+        """Check if is method."""
+        return (
+            len(self.target.archs) > 1
+            and self.target.archs[-2].arch.name != Tok.ABILITY_OP
+        )
 
 
 class FuncSignature(AstNode):
@@ -660,13 +670,18 @@ class FuncSignature(AstNode):
     @property
     def is_method(self) -> bool:
         """Check if is method."""
-        if (isinstance(self.parent, Ability) and self.parent.is_method) or (
+        return (isinstance(self.parent, Ability) and self.parent.is_method) or (
+            isinstance(self.parent, AbilityDef) and self.parent.is_method
+        )
+
+    @property
+    def is_static(self) -> bool:
+        """Check if is static."""
+        return (isinstance(self.parent, Ability) and self.parent.is_static) or (
             isinstance(self.parent, AbilityDef)
             and isinstance(self.parent.decl_link, Ability)
-            and self.parent.decl_link.is_method
-        ):
-            return True
-        return False
+            and self.parent.decl_link.is_static
+        )
 
 
 class EventSignature(AstNode):
@@ -1632,6 +1647,8 @@ class SpecialVarRef(NameSpec):
             return Con.HERE.value
         elif self.var.name == Tok.INIT_OP:
             return "__init__"
+        elif self.var.name == Tok.POST_INIT_OP:
+            return "__post_init__"
         else:
             raise NotImplementedError("ICE: Special var reference not implemented")
 
@@ -2047,7 +2064,7 @@ class TokenSymbol(Token, AstSymbolNode):
         )
 
 
-class BuiltinType(Name, Literal):
+class BuiltinType(Name, Literal, NameSpec):
     """Type node type for Jac Ast."""
 
     SYMBOL_TYPE = SymbolType.VAR
@@ -2206,50 +2223,3 @@ class PythonModuleAst(EmptyToken):
         super().__init__()
         self.ast = ast
         self.file_path = mod_path
-
-
-# ----------------
-
-
-def print_tree(
-    root: AstNode,
-    marker: str = "+-- ",
-    level_markers: Optional[list[bool]] = None,
-    output_file: Optional[str] = None,
-) -> None:
-    """Recursive function that prints the hierarchical structure of a tree."""
-
-    def __node_repr_in_tree(node: AstNode) -> str:
-        if isinstance(node, Token):
-            return f"{node.__class__.__name__} - {node.value}"
-            # return f"{node.__class__.__name__}({node.name}, {node.value})"
-        else:
-            return node.__class__.__name__
-
-    if root is None:
-        return
-
-    empty_str = " " * len(marker)
-    connection_str = "|" + empty_str[:-1]
-    if not level_markers:
-        level_markers = []
-    level = len(level_markers)  # recursion level
-
-    def mapper(draw: bool) -> str:
-        return connection_str if draw else empty_str
-
-    markers = "".join(map(mapper, level_markers[:-1]))
-    markers += marker if level > 0 else ""
-    if output_file:
-        with open(output_file, "a+") as f:
-            print(f"{markers}{__node_repr_in_tree(root)}", file=f)
-    else:
-        print(f"{markers}{__node_repr_in_tree(root)}")
-    # After root has been printed, recurse down (depth-first) the child nodes.
-    for i, child in enumerate(root.kid):
-        # The last child will not need connection markers on the current level
-        # (see example above)
-        is_last = i == len(root.kid) - 1
-        print_tree(
-            child, marker, [*level_markers, not is_last], output_file=output_file
-        )

jaclang/jac/constant.py

@@ -6,14 +6,9 @@ class Constants(str, Enum):
     """Token constants for Jac."""
 
     JAC_LANG_IMP = "jac"
-    JAC_DEBUG_SPLITTER = "JAC DEBUG INFO"
-    JAC_ERROR_PREAMBLE = "Jac error originates from..."
-    PATCH = "PATCH"
-
-    JAC_TMP = "_jac_tmp"
-    EXEC_CONTEXT = "_jac_exec_ctx_"
     HERE = "_jac_here_"
-    ROOT = f"{EXEC_CONTEXT}.get_root()"
+    JAC_FEATURE = "_JacFeature"
+    ROOT = f"{JAC_FEATURE}.get_root()"
     EDGES_TO_NODE = "_jac_.edges_to_nodes"
     EDGE_REF = "_jac_.edge_ref"
     CONNECT_NODE = "_jac_.connect_node"
@@ -204,6 +199,7 @@ class Tokens(str, Enum):
     HERE_OP = "HERE_OP"
     SELF_OP = "SELF_OP"
     INIT_OP = "INIT_OP"
+    POST_INIT_OP = "POST_INIT_OP"
     SUPER_OP = "SUPER_OP"
     ROOT_OP = "ROOT_OP"
     WALKER_OP = "WALKER_OP"

jaclang/jac/importer.py

@@ -62,6 +62,7 @@ def jac_import(
         with open(pyc_file_path, "rb") as f:
             codeobj = marshal.load(f)
 
+    module_name = override_name if override_name else module_name
     module = types.ModuleType(module_name)
     module.__file__ = full_target
     module.__name__ = module_name
@@ -78,7 +79,6 @@ def jac_import(
     else:
         sys.modules[module_name] = module
 
-    module.__name__ = override_name if override_name else module.__name__
     exec(codeobj, module.__dict__)
 
     return module

jaclang/jac/parser.py

@@ -4,11 +4,11 @@ from __future__ import annotations
 
 import logging
 import os
-from typing import Callable
+from typing import Callable, TypeAlias
 
 
 import jaclang.jac.absyntree as ast
-from jaclang.jac import jac_lark as jl
+from jaclang.jac import jac_lark as jl  # type: ignore
 from jaclang.jac.constant import EdgeDir, Tokens as Tok
 from jaclang.jac.passes.ir_pass import Pass
 from jaclang.vendor.lark import Lark, Transformer, Tree, logger
@@ -98,7 +98,7 @@ class JacParser(Pass):
     comment_cache: list[jl.Token] = []
 
     parser = jl.Lark_StandAlone(lexer_callbacks={"COMMENT": _comment_callback})  # type: ignore
-    JacTransformer = jl.Transformer[jl.Tree[str], ast.AstNode]
+    JacTransformer: TypeAlias = jl.Transformer[jl.Tree[str], ast.AstNode]
 
     class TreeToAST(JacTransformer):
         """Transform parse tree to AST."""
@@ -509,21 +509,22 @@ class JacParser(Pass):
         def any_ref(self, kid: list[ast.AstNode]) -> ast.NameSpec:
             """Grammar rule.
 
-            any_ref: special_ref
-                    | named_ref
+            any_ref: named_ref
+                    | arch_ref
             """
             if isinstance(kid[0], ast.NameSpec):
                 return self.nu(kid[0])
             else:
                 raise self.ice()
 
-        def named_ref(self, kid: list[ast.AstNode]) -> ast.Name:
+        def named_ref(self, kid: list[ast.AstNode]) -> ast.NameSpec:
             """Grammar rule.
 
-            named_ref: KWESC_NAME
+            named_ref: special_ref
+                    | KWESC_NAME
                     | NAME
             """
-            if isinstance(kid[0], ast.Name):
+            if isinstance(kid[0], ast.NameSpec):
                 return self.nu(kid[0])
             else:
                 raise self.ice()
@@ -722,8 +723,11 @@ class JacParser(Pass):
             abstract_ability: KW_STATIC? KW_CAN access_tag? any_ref (func_decl | event_clause) KW_ABSTRACT SEMI
             """
             chomp = [*kid]
-            is_static = isinstance(chomp[0], ast.Token)
+            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
             chomp = chomp[1:] if access else chomp
             name = chomp[0]
@@ -2735,7 +2739,7 @@ class JacParser(Pass):
         def type_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
             """Grammar rule.
 
-            object_ref: OBJECT_OP name_ref
+            type_ref: TYPE_OP name_ref
             """
             if isinstance(kid[0], ast.Token) and isinstance(kid[1], ast.NameSpec):
                 return self.nu(

jaclang/jac/passes/main/__init__.py

@@ -8,6 +8,7 @@ from .pyout_pass import PyOutPass  # noqa: I100
 from .pyast_load_pass import PyastBuildPass  # 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
 
 
 pass_schedule = py_code_gen
@@ -21,4 +22,5 @@ __all__ = [
     "PyOutPass",
     "PyastBuildPass",
     "PyastGenPass",
+    "JacTypeCheckPass",
 ]

jaclang/jac/passes/main/def_use_pass.py

@@ -66,12 +66,7 @@ class DefUsePass(SymTabPass):
         type_tag: SubTag[ExprType],
         value: Optional[ExprType],
         """
-        if (
-            node.parent
-            and node.parent.parent
-            and isinstance(node.parent.parent, ast.Ability)
-        ):
-            self.def_insert(node, single_use="func param")
+        self.def_insert(node)
 
     def enter_has_var(self, node: ast.HasVar) -> None:
         """Sub objects.
@@ -130,7 +125,8 @@ class DefUsePass(SymTabPass):
         right: AtomType,
         is_scope_contained: bool,
         """
-        self.chain_use_lookup(self.unwind_atom_trailer(node))
+        chain = self.unwind_atom_trailer(node)
+        self.chain_use_lookup(chain)
 
     def unwind_atom_trailer(self, node: ast.AtomTrailer) -> list[ast.AstSymbolNode]:
         """Sub objects.
@@ -176,6 +172,7 @@ class DefUsePass(SymTabPass):
 
         var: Token,
         """
+        self.use_lookup(node)
 
     def enter_edge_op_ref(self, node: ast.EdgeOpRef) -> None:
         """Sub objects.