jaclang 0.7.23__py3-none-any.whl → 0.7.26__py3-none-any.whl

jaclang/compiler/absyntree.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import ast as ast3
 import builtins
 import os
+from dataclasses import dataclass
 from hashlib import md5
 from types import EllipsisType
 from typing import (
@@ -139,7 +140,7 @@ class AstNode:
         return Token(
             name=name,
             value=value,
-            file_path=self.loc.mod_path,
+            orig_src=self.loc.orig_src,
             col_start=self.loc.col_start,
             col_end=0,
             line=self.loc.first_line,
@@ -248,9 +249,9 @@ class AstSymbolNode(AstNode):
         return self.name_spec.py_ctx_func
 
     @property
-    def sym_type(self) -> str:
+    def expr_type(self) -> str:
         """Get symbol type."""
-        return self.name_spec.sym_type
+        return self.name_spec.expr_type
 
     @property
     def type_sym_tab(self) -> Optional[SymbolTable]:
@@ -346,6 +347,32 @@ class WalkerStmtOnlyNode(AstNode):
 class Expr(AstNode):
     """Expr node type for Jac Ast."""
 
+    def __init__(self, type_src: Optional[Expr] = None) -> None:
+        """Initialize expression node."""
+        self.type_src = type_src or self  # Only used for ArchRef
+        self._sym_type: str = "NoType"
+        self._type_sym_tab: Optional[SymbolTable] = None
+
+    @property
+    def expr_type(self) -> str:
+        """Get symbol type."""
+        return self.type_src._sym_type
+
+    @expr_type.setter
+    def expr_type(self, sym_type: str) -> None:
+        """Set symbol type."""
+        self.type_src._sym_type = sym_type
+
+    @property
+    def type_sym_tab(self) -> Optional[SymbolTable]:
+        """Get type symbol table."""
+        return self.type_src._type_sym_tab
+
+    @type_sym_tab.setter
+    def type_sym_tab(self, type_sym_tab: SymbolTable) -> None:
+        """Set type symbol table."""
+        self.type_src._type_sym_tab = type_sym_tab
+
 
 class AtomExpr(Expr, AstSymbolStubNode):
     """AtomExpr node type for Jac Ast."""
@@ -398,7 +425,7 @@ class AstImplOnlyNode(CodeBlockStmt, ElementStmt, AstSymbolNode):
     def create_impl_name_node(self) -> Name:
         """Create impl name."""
         ret = Name(
-            file_path=self.target.archs[-1].loc.mod_path,
+            orig_src=self.target.archs[-1].loc.orig_src,
             name=Tok.NAME.value,
             value=self.target.py_resolve_name(),
             col_start=self.target.archs[0].loc.col_start,
@@ -435,8 +462,7 @@ class NameAtom(AtomExpr, EnumBlockStmt):
         self._sym_name: str = ""
         self._sym_category: SymbolType = SymbolType.UNKNOWN
         self._py_ctx_func: Type[ast3.AST] = ast3.Load
-        self._sym_type: str = "NoType"
-        self._type_sym_tab: Optional[SymbolTable] = None
+        AtomExpr.__init__(self)
 
     @property
     def sym(self) -> Optional[Symbol]:
@@ -461,7 +487,7 @@ class NameAtom(AtomExpr, EnumBlockStmt):
     @property
     def clean_type(self) -> str:
         """Get clean type."""
-        ret_type = self.sym_type.replace("builtins.", "").replace("NoType", "")
+        ret_type = self.expr_type.replace("builtins.", "").replace("NoType", "")
         return ret_type
 
     @property
@@ -474,26 +500,6 @@ class NameAtom(AtomExpr, EnumBlockStmt):
         """Set python context function."""
         self._py_ctx_func = py_ctx_func
 
-    @property
-    def sym_type(self) -> str:
-        """Get symbol type."""
-        return self._sym_type
-
-    @sym_type.setter
-    def sym_type(self, sym_type: str) -> None:
-        """Set symbol type."""
-        self._sym_type = sym_type
-
-    @property
-    def type_sym_tab(self) -> Optional[SymbolTable]:
-        """Get type symbol table."""
-        return self._type_sym_tab
-
-    @type_sym_tab.setter
-    def type_sym_tab(self, type_sym_tab: SymbolTable) -> None:
-        """Set type symbol table."""
-        self._type_sym_tab = type_sym_tab
-
     @property
     def sem_token(self) -> Optional[tuple[SemTokType, SemTokMod]]:
         """Resolve semantic token."""
@@ -745,7 +751,7 @@ class Test(AstSymbolNode, ElementStmt):
             name
             if isinstance(name, Name)
             else Name(
-                file_path=name.file_path,
+                orig_src=name.orig_src,
                 name=Tok.NAME.value,
                 value=f"_jac_gen_{Test.TEST_COUNT}",
                 col_start=name.loc.col_start,
@@ -1261,6 +1267,9 @@ class Enum(ArchSpec, AstAccessNode, AstImplNeedingNode, ArchBlockStmt):
             res = res and self.semstr.normalize(deep) if self.semstr else res
             res = res and self.decorators.normalize(deep) if self.decorators else res
         new_kid: list[AstNode] = []
+        if self.decorators:
+            new_kid.append(self.gen_token(Tok.DECOR_OP))
+            new_kid.append(self.decorators)
         if self.doc:
             new_kid.append(self.doc)
         new_kid.append(self.gen_token(Tok.KW_ENUM))
@@ -2527,6 +2536,7 @@ class AwaitExpr(Expr):
         """Initialize sync statement node."""
         self.target = target
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize sync statement node."""
@@ -2655,6 +2665,7 @@ class BinaryExpr(Expr):
         self.right = right
         self.op = op
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2689,6 +2700,7 @@ class CompareExpr(Expr):
         self.rights = rights
         self.ops = ops
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2720,6 +2732,7 @@ class BoolExpr(Expr):
         self.values = values
         self.op = op
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2750,6 +2763,7 @@ class LambdaExpr(Expr):
         self.signature = signature
         self.body = body
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2782,6 +2796,7 @@ class UnaryExpr(Expr):
         self.operand = operand
         self.op = op
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2809,6 +2824,7 @@ class IfElseExpr(Expr):
         self.value = value
         self.else_value = else_value
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2839,6 +2855,7 @@ class MultiString(AtomExpr):
         """Initialize multi string expression node."""
         self.strings = strings
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.STRING)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -2865,6 +2882,7 @@ class FString(AtomExpr):
         """Initialize fstring expression node."""
         self.parts = parts
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.STRING)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -2906,6 +2924,7 @@ class ListVal(AtomExpr):
         """Initialize value node."""
         self.values = values
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -2934,6 +2953,7 @@ class SetVal(AtomExpr):
         """Initialize value node."""
         self.values = values
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -2962,6 +2982,7 @@ class TupleVal(AtomExpr):
         """Initialize tuple value node."""
         self.values = values
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -3005,6 +3026,7 @@ class DictVal(AtomExpr):
         """Initialize dict expression node."""
         self.kv_pairs = kv_pairs
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -3138,6 +3160,7 @@ class ListCompr(AtomExpr):
         self.out_expr = out_expr
         self.compr = compr
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -3213,6 +3236,7 @@ class DictCompr(AtomExpr):
         self.kv_pair = kv_pair
         self.compr = compr
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -3251,6 +3275,7 @@ class AtomTrailer(Expr):
         self.is_null_ok = is_null_ok
         self.is_genai = is_genai
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = True) -> bool:
         """Normalize ast node."""
@@ -3296,6 +3321,7 @@ class AtomUnit(Expr):
         """Initialize atom unit expression node."""
         self.value = value
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = True) -> bool:
         """Normalize ast node."""
@@ -3323,6 +3349,7 @@ class YieldExpr(Expr):
         self.expr = expr
         self.with_from = with_from
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize yield statement node."""
@@ -3354,6 +3381,7 @@ class FuncCall(Expr):
         self.params = params
         self.genai_call = genai_call
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = True) -> bool:
         """Normalize ast node."""
@@ -3374,42 +3402,51 @@ class FuncCall(Expr):
 class IndexSlice(AtomExpr):
     """IndexSlice node type for Jac Ast."""
 
+    @dataclass
+    class Slice:
+        """Slice node for index slice."""
+
+        start: Optional[Expr]
+        stop: Optional[Expr]
+        step: Optional[Expr]
+
     def __init__(
         self,
-        start: Optional[Expr],
-        stop: Optional[Expr],
-        step: Optional[Expr],
+        slices: list[Slice],
         is_range: bool,
         kid: Sequence[AstNode],
     ) -> None:
         """Initialize index slice expression node."""
-        self.start = start
-        self.stop = stop
-        self.step = step
+        self.slices = slices
         self.is_range = is_range
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = True) -> bool:
         """Normalize ast node."""
         res = True
         if deep:
-            res = self.start.normalize(deep) if self.start else res
-            res = res and self.stop.normalize(deep) if self.stop else res
-            res = res and self.step.normalize(deep) if self.step else res
+            for slice in self.slices:
+                res = slice.start.normalize(deep) if slice.start else res
+                res = res and slice.stop.normalize(deep) if slice.stop else res
+                res = res and slice.step.normalize(deep) if slice.step else res
         new_kid: list[AstNode] = []
         new_kid.append(self.gen_token(Tok.LSQUARE))
         if self.is_range:
-            if self.start:
-                new_kid.append(self.start)
-            if self.stop:
-                new_kid.append(self.gen_token(Tok.COLON))
-                new_kid.append(self.stop)
-            if self.step:
+            for i, slice in enumerate(self.slices):
+                if i > 0:
+                    new_kid.append(self.gen_token(Tok.COMMA))
+                if slice.start:
+                    new_kid.append(slice.start)
                 new_kid.append(self.gen_token(Tok.COLON))
-                new_kid.append(self.step)
-        elif self.start:
-            new_kid.append(self.start)
+                if slice.stop:
+                    new_kid.append(slice.stop)
+                if slice.step:
+                    new_kid.append(self.gen_token(Tok.COLON))
+                    new_kid.append(slice.step)
+        elif len(self.slices) == 1 and self.slices[0].start:
+            new_kid.append(self.slices[0].start)
         else:
             res = False
         new_kid.append(self.gen_token(Tok.RSQUARE))
@@ -3430,6 +3467,7 @@ class ArchRef(AtomExpr):
         self.arch_name = arch_name
         self.arch_type = arch_type
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self, type_src=arch_name)
         AstSymbolNode.__init__(
             self,
             sym_name=arch_name.sym_name,
@@ -3460,6 +3498,7 @@ class EdgeRefTrailer(Expr):
         self.chain = chain
         self.edges_only = edges_only
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
 
     def normalize(self, deep: bool = True) -> bool:
         """Normalize ast node."""
@@ -3489,6 +3528,7 @@ class EdgeOpRef(WalkerStmtOnlyNode, AtomExpr):
         self.filter_cond = filter_cond
         self.edge_dir = edge_dir
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         WalkerStmtOnlyNode.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
@@ -3619,6 +3659,7 @@ class FilterCompr(AtomExpr):
         self.f_type = f_type
         self.compares = compares
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -3656,6 +3697,7 @@ class AssignCompr(AtomExpr):
         """Initialize assign compr expression node."""
         self.assigns = assigns
         AstNode.__init__(self, kid=kid)
+        Expr.__init__(self)
         AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -3813,7 +3855,7 @@ class MatchWild(MatchPattern):
             self,
             nodes=[
                 Name(
-                    file_path=self.loc.mod_path,
+                    orig_src=self.loc.orig_src,
                     name=Tok.NAME,
                     value="_",
                     col_start=self.loc.col_start,
@@ -4023,7 +4065,7 @@ class Token(AstNode):
 
     def __init__(
         self,
-        file_path: str,
+        orig_src: JacSource,
         name: str,
         value: str,
         line: int,
@@ -4034,7 +4076,7 @@ class Token(AstNode):
         pos_end: int,
     ) -> None:
         """Initialize token."""
-        self.file_path = file_path
+        self.orig_src = orig_src
         self.name = name
         self.value = value
         self.line_no = line
@@ -4059,7 +4101,7 @@ class Name(Token, NameAtom):
 
     def __init__(
         self,
-        file_path: str,
+        orig_src: JacSource,
         name: str,
         value: str,
         line: int,
@@ -4076,7 +4118,7 @@ class Name(Token, NameAtom):
         self.is_kwesc = is_kwesc
         Token.__init__(
             self,
-            file_path=file_path,
+            orig_src=orig_src,
             name=name,
             value=value,
             line=line,
@@ -4107,7 +4149,7 @@ class Name(Token, NameAtom):
     ) -> Name:
         """Generate name from node."""
         ret = Name(
-            file_path=node.loc.mod_path,
+            orig_src=node.loc.orig_src,
             name=Tok.NAME.value,
             value=name_str,
             col_start=node.loc.col_start,
@@ -4134,7 +4176,7 @@ class SpecialVarRef(Name):
         self.orig = var
         Name.__init__(
             self,
-            file_path=var.file_path,
+            orig_src=var.orig_src,
             name=var.name,
             value=self.py_resolve_name(),  # TODO: This shouldnt be necessary
             line=var.line_no,
@@ -4190,7 +4232,7 @@ class Literal(Token, AtomExpr):
 
     def __init__(
         self,
-        file_path: str,
+        orig_src: JacSource,
         name: str,
         value: str,
         line: int,
@@ -4203,7 +4245,7 @@ class Literal(Token, AtomExpr):
         """Initialize token."""
         Token.__init__(
             self,
-            file_path=file_path,
+            orig_src=orig_src,
             name=name,
             value=value,
             line=line,
@@ -4214,6 +4256,7 @@ class Literal(Token, AtomExpr):
             pos_end=pos_end,
         )
         AstSymbolStubNode.__init__(self, sym_type=self.SYMBOL_TYPE)
+        Expr.__init__(self)
 
     @property
     def lit_value(
@@ -4278,10 +4321,9 @@ class String(Literal):
         elif self.value.startswith(("'", '"')):
             repr_str = self.value.encode().decode("unicode_escape")
             if (
-                self.value.startswith('"""')
-                and self.value.endswith('"""')
-                and not self.find_parent_of_type(FString)
-            ):
+                (self.value.startswith('"""') and self.value.endswith('"""'))
+                or (self.value.startswith("'''") and self.value.endswith("'''"))
+            ) and not self.find_parent_of_type(FString):
                 return repr_str[3:-3]
             if (not self.find_parent_of_type(FString)) or (
                 not (
@@ -4343,11 +4385,11 @@ class Ellipsis(Literal):
 class EmptyToken(Token):
     """EmptyToken node type for Jac Ast."""
 
-    def __init__(self, file_path: str = "") -> None:
+    def __init__(self, orig_src: JacSource | None = None) -> None:
         """Initialize empty token."""
         super().__init__(
             name="EmptyToken",
-            file_path=file_path,
+            orig_src=orig_src or JacSource("", ""),
             value="",
             line=0,
             end_line=0,
@@ -4367,7 +4409,7 @@ class CommentToken(Token):
 
     def __init__(
         self,
-        file_path: str,
+        orig_src: JacSource,
         name: str,
         value: str,
         line: int,
@@ -4384,7 +4426,7 @@ class CommentToken(Token):
 
         Token.__init__(
             self,
-            file_path=file_path,
+            orig_src=orig_src,
             name=name,
             value=value,
             line=line,
@@ -4404,7 +4446,7 @@ class JacSource(EmptyToken):
 
     def __init__(self, source: str, mod_path: str) -> None:
         """Initialize source string."""
-        super().__init__()
+        super().__init__(self)
         self.value = source
         self.hash = md5(source.encode()).hexdigest()
         self.file_path = mod_path
@@ -4419,8 +4461,14 @@ class JacSource(EmptyToken):
 class PythonModuleAst(EmptyToken):
     """SourceString node type for Jac Ast."""
 
-    def __init__(self, ast: ast3.Module, mod_path: str) -> None:
+    def __init__(self, ast: ast3.Module, orig_src: JacSource) -> None:
         """Initialize source string."""
         super().__init__()
         self.ast = ast
-        self.file_path = mod_path
+        self.orig_src = orig_src
+
+        # This bellow attribute is un-necessary since it already exists in the orig_src
+        # however I'm keeping it here not to break existing code trying to access file_path.
+        # We can remove this in the future once we safley remove all references to it and
+        # use orig_src.
+        self.file_path = orig_src.file_path

jaclang/compiler/codeloc.py

@@ -9,7 +9,7 @@ from typing import Optional, TYPE_CHECKING
 from jaclang.vendor.mypy.nodes import Node as MypyNode
 
 if TYPE_CHECKING:
-    from jaclang.compiler.absyntree import Token
+    from jaclang.compiler.absyntree import JacSource, Token
 
 
 @dataclass
@@ -42,10 +42,15 @@ class CodeLocInfo:
         self.first_tok = first_tok
         self.last_tok = last_tok
 
+    @property
+    def orig_src(self) -> JacSource:
+        """Get file source."""
+        return self.first_tok.orig_src
+
     @property
     def mod_path(self) -> str:
         """Get line number."""
-        return self.first_tok.file_path
+        return self.first_tok.orig_src.file_path
 
     @property
     def first_line(self) -> int:

jaclang/compiler/compile.py

@@ -16,11 +16,13 @@ def compile_jac(file_path: str, cache_result: bool = False) -> Pass:
         file_path=file_path,
         schedule=pass_schedule,
     )
-    if cache_result and isinstance(code.ir, ast.Module):
+    # If there is syntax error, the code will be an instance of JacParser as there is
+    # no more passes were processed, in that case we can ignore it.
+    had_syntax_error = isinstance(code, JacParser) and len(code.errors_had) != 0
+    if cache_result and (not had_syntax_error) and isinstance(code.ir, ast.Module):
         print_pass = PyOutPass(input_ir=code.ir, prior=code)
         return print_pass
-    else:
-        return code
+    return code
 
 
 def jac_file_to_pass(
@@ -49,6 +51,11 @@ def jac_str_to_pass(
         target = schedule[-1] if schedule else None
     source = ast.JacSource(jac_str, mod_path=file_path)
     ast_ret: Pass = JacParser(input_ir=source)
+
+    # If there is syntax error, no point in processing in further passes.
+    if len(ast_ret.errors_had) != 0:
+        return ast_ret
+
     for i in schedule:
         if i == target:
             break

jaclang/compiler/jac.lark

@@ -358,7 +358,10 @@ atomic_chain: atomic_chain NULL_OK? (filter_compr | assign_compr | index_slice)
             | atomic_chain NULL_OK? (DOT_BKWD | DOT_FWD | DOT) named_ref
             | (atomic_call | atom | edge_ref_chain)
 
-index_slice: LSQUARE expression? COLON expression? (COLON expression?)? RSQUARE
+index_slice: LSQUARE                                                             \
+                     expression? COLON expression? (COLON expression?)?          \
+                     (COMMA expression? COLON expression? (COLON expression?)?)* \
+              RSQUARE
            | list_val
 
 // Function calls