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

jaclang/cli/cli.py

@@ -6,6 +6,7 @@ import marshal
 import os
 import pickle
 import shutil
+import sys
 import types
 from typing import Optional
 
@@ -38,7 +39,10 @@ def format(path: str, outfile: str = "", debug: bool = False) -> None:
     def format_file(filename: str) -> None:
         code_gen_format = jac_file_to_pass(filename, schedule=format_pass)
         if code_gen_format.errors_had:
-            print(f"Errors occurred while formatting the file {filename}.")
+            print(
+                f"Errors occurred while formatting the file {filename}.",
+                file=sys.stderr,
+            )
         elif debug:
             print(code_gen_format.ir.gen.jac)
         elif outfile:
@@ -52,7 +56,7 @@ def format(path: str, outfile: str = "", debug: bool = False) -> None:
         if os.path.exists(path):
             format_file(path)
         else:
-            print("File does not exist.")
+            print("File does not exist.", file=sys.stderr)
     elif os.path.isdir(path):
         count = 0
         for root, _, files in os.walk(path):
@@ -61,9 +65,9 @@ def format(path: str, outfile: str = "", debug: bool = False) -> None:
                     file_path = os.path.join(root, file)
                     format_file(file_path)
                     count += 1
-        print(f"Formatted {count} '.jac' files.")
+        print(f"Formatted {count} '.jac' files.", file=sys.stderr)
     else:
-        print("Not a .jac file or directory.")
+        print("Not a .jac file or directory.", file=sys.stderr)
 
 
 @cmd_registry.register
@@ -89,23 +93,30 @@ def run(
     jctx = ExecutionContext.create(session=session)
 
     if filename.endswith(".jac"):
-        jac_import(
-            target=mod,
-            base_path=base,
-            cachable=cache,
-            override_name="__main__" if main else None,
-        )
-    elif filename.endswith(".jir"):
-        with open(filename, "rb") as f:
-            JacMachine(base).attach_program(
-                JacProgram(mod_bundle=pickle.load(f), bytecode=None)
-            )
+        try:
             jac_import(
                 target=mod,
                 base_path=base,
                 cachable=cache,
                 override_name="__main__" if main else None,
             )
+        except Exception as e:
+            print(e, file=sys.stderr)
+    elif filename.endswith(".jir"):
+        try:
+            with open(filename, "rb") as f:
+                JacMachine(base).attach_program(
+                    JacProgram(mod_bundle=pickle.load(f), bytecode=None, sem_ir=None)
+                )
+                jac_import(
+                    target=mod,
+                    base_path=base,
+                    cachable=cache,
+                    override_name="__main__" if main else None,
+                )
+        except Exception as e:
+            print(e, file=sys.stderr)
+
     else:
         jctx.close()
         JacMachine.detach()
@@ -145,7 +156,7 @@ def get_object(
     elif filename.endswith(".jir"):
         with open(filename, "rb") as f:
             JacMachine(base).attach_program(
-                JacProgram(mod_bundle=pickle.load(f), bytecode=None)
+                JacProgram(mod_bundle=pickle.load(f), bytecode=None, sem_ir=None)
             )
             jac_import(
                 target=mod,
@@ -163,7 +174,7 @@ def get_object(
     if obj:
         data = obj.__jac__.__getstate__()
     else:
-        print(f"Object with id {id} not found.")
+        print(f"Object with id {id} not found.", file=sys.stderr)
 
     jctx.close()
     JacMachine.detach()
@@ -183,7 +194,7 @@ def build(filename: str) -> None:
         with open(filename[:-4] + ".jir", "wb") as f:
             pickle.dump(out.ir, f)
     else:
-        print("Not a .jac file.")
+        print("Not a .jac file.", file=sys.stderr)
 
 
 @cmd_registry.register
@@ -202,10 +213,10 @@ def check(filename: str, print_errs: bool = True) -> None:
         warnings = len(out.warnings_had)
         if print_errs:
             for e in out.errors_had:
-                print("Error:", e)
+                print("Error:", e, file=sys.stderr)
         print(f"Errors: {errs}, Warnings: {warnings}")
     else:
-        print("Not a .jac file.")
+        print("Not a .jac file.", file=sys.stderr)
 
 
 @cmd_registry.register
@@ -262,7 +273,7 @@ def enter(
     elif filename.endswith(".jir"):
         with open(filename, "rb") as f:
             JacMachine(base).attach_program(
-                JacProgram(mod_bundle=pickle.load(f), bytecode=None)
+                JacProgram(mod_bundle=pickle.load(f), bytecode=None, sem_ir=None)
             )
             ret_module = jac_import(
                 target=mod,
@@ -278,7 +289,7 @@ def enter(
     if ret_module:
         (loaded_mod,) = ret_module
         if not loaded_mod:
-            print("Errors occurred while importing the module.")
+            print("Errors occurred while importing the module.", file=sys.stderr)
         else:
             architype = getattr(loaded_mod, entrypoint)(*args)
 
@@ -344,10 +355,12 @@ def tool(tool: str, args: Optional[list] = None) -> None:
             else:
                 print(getattr(AstTool(), tool)())
         except Exception as e:
-            print(f"Error while running ast tool {tool}, check args: {e}")
+            print(
+                f"Error while running ast tool {tool}, check args: {e}", file=sys.stderr
+            )
             raise e
     else:
-        print(f"Ast tool {tool} not found.")
+        print(f"Ast tool {tool} not found.", file=sys.stderr)
 
 
 @cmd_registry.register
@@ -385,9 +398,9 @@ def debug(filename: str, main: bool = True, cache: bool = False) -> None:
                 db.runcall(func)
                 print("Done debugging.")
         else:
-            print(f"Error while generating bytecode in {filename}.")
+            print(f"Error while generating bytecode in {filename}.", file=sys.stderr)
     else:
-        print("Not a .jac file.")
+        print("Not a .jac file.", file=sys.stderr)
 
 
 @cmd_registry.register
@@ -458,7 +471,7 @@ def dot(
             file.write(graph)
         print(f">>> Graph content saved to {os.path.join(os.getcwd(), file_name)}")
     else:
-        print("Not a .jac file.")
+        print("Not a .jac file.", file=sys.stderr)
 
     jctx.close()
 
@@ -471,8 +484,12 @@ def py2jac(filename: str) -> None:
     """
     if filename.endswith(".py"):
         with open(filename, "r") as f:
+            file_source = f.read()
             code = PyastBuildPass(
-                input_ir=ast.PythonModuleAst(ast3.parse(f.read()), mod_path=filename),
+                input_ir=ast.PythonModuleAst(
+                    ast3.parse(file_source),
+                    orig_src=ast.JacSource(file_source, filename),
+                ),
             ).ir.unparse()
         print(code)
     else:
@@ -490,7 +507,7 @@ def jac2py(filename: str) -> None:
             code = jac_file_to_pass(file_path=filename).ir.gen.py
         print(code)
     else:
-        print("Not a .jac file.")
+        print("Not a .jac file.", file=sys.stderr)
 
 
 def start_cli() -> None:

jaclang/compiler/__init__.py

@@ -59,7 +59,7 @@ TOKEN_MAP.update(
         "KW_OR": "|", "ARROW_BI": "<-->", "ARROW_L": "<--",
         "ARROW_R": "-->", "ARROW_L_P1": "<-:", "ARROW_R_P2": ":->",
         "ARROW_L_P2": ":-", "ARROW_R_P1": "-:", "CARROW_BI": "<++>",
-        "CARROW_L": "<++", "CARROW_R": "++>", "CARROW_L_P1": "<+:",
+        "CARROW_L_P1": "<+:", "RSHIFT_EQ": ">>=", "ELLIPSIS": "...",
         "CARROW_R_P2": ":+>", "CARROW_L_P2": ":+", "CARROW_R_P1": "+:",
         "PIPE_FWD": "|>", "PIPE_BKWD": "<|", "A_PIPE_FWD": ":>",
         "A_PIPE_BKWD": "<:", "DOT_FWD": ".>", "STAR_POW": "**",
@@ -68,7 +68,7 @@ TOKEN_MAP.update(
         "STAR_POW_EQ": "**=", "MUL_EQ": "*=", "FLOOR_DIV_EQ": "//=",
         "DIV_EQ": "/=", "MOD_EQ": "%=", "BW_AND_EQ": "&=",
         "BW_OR_EQ": "|=", "BW_XOR_EQ": "^=", "BW_NOT_EQ": "~=",
-        "LSHIFT_EQ": "<<=", "RSHIFT_EQ": ">>=", "ELLIPSIS": "...",
+        "LSHIFT_EQ": "<<=",
     }
 )
 # fmt: on

jaclang/compiler/absyntree.py

@@ -139,7 +139,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 +248,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 +346,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 +424,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 +461,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 +486,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 +499,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 +750,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 +1266,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 +2535,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 +2664,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 +2699,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 +2731,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 +2762,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 +2795,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 +2823,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 +2854,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 +2881,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 +2923,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 +2952,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 +2981,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 +3025,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 +3159,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 +3235,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 +3274,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 +3320,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 +3348,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 +3380,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."""
@@ -3388,6 +3415,7 @@ class IndexSlice(AtomExpr):
         self.step = step
         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:
@@ -3430,6 +3458,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 +3489,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 +3519,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 +3650,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 +3688,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 +3846,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 +4056,7 @@ class Token(AstNode):
 
     def __init__(
         self,
-        file_path: str,
+        orig_src: JacSource,
         name: str,
         value: str,
         line: int,
@@ -4034,7 +4067,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 +4092,7 @@ class Name(Token, NameAtom):
 
     def __init__(
         self,
-        file_path: str,
+        orig_src: JacSource,
         name: str,
         value: str,
         line: int,
@@ -4076,7 +4109,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 +4140,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 +4167,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 +4223,7 @@ class Literal(Token, AtomExpr):
 
     def __init__(
         self,
-        file_path: str,
+        orig_src: JacSource,
         name: str,
         value: str,
         line: int,
@@ -4203,7 +4236,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 +4247,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 +4312,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 +4376,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 +4400,7 @@ class CommentToken(Token):
 
     def __init__(
         self,
-        file_path: str,
+        orig_src: JacSource,
         name: str,
         value: str,
         line: int,
@@ -4384,7 +4417,7 @@ class CommentToken(Token):
 
         Token.__init__(
             self,
-            file_path=file_path,
+            orig_src=orig_src,
             name=name,
             value=value,
             line=line,
@@ -4404,7 +4437,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 +4452,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