jaclang 0.8.4__py3-none-any.whl → 0.8.5__py3-none-any.whl

jaclang/cli/cli.py

@@ -21,6 +21,7 @@ from jaclang.runtimelib.machine import (
     JacMachine as Jac,
     JacMachineInterface as JacInterface,
 )
+from jaclang.runtimelib.utils import read_file_with_encoding
 from jaclang.utils.helpers import debugger as db
 from jaclang.utils.lang_tools import AstTool
 
@@ -98,7 +99,15 @@ def proc_file_sess(
         )
     base, mod = os.path.split(filename)
     base = base if base else "./"
-    mod = mod[:-4]
+    if filename.endswith(".jac") or filename.endswith(".jir"):
+        mod = mod[:-4]
+    elif filename.endswith(".py"):
+        mod = mod[:-3]
+    else:
+        print(
+            "Not a valid file!\nOnly supports `.jac`, `.jir`, and `.py`",
+            file=sys.stderr,
+        )
     mach = ExecutionContext(session=session, root=root)
     Jac.set_context(mach)
     return base, mod, mach
@@ -111,19 +120,20 @@ def run(
     main: bool = True,
     cache: bool = True,
 ) -> None:
-    """Run the specified .jac file.
+    """Run the specified .jac, .jir, or .py file.
 
-    Executes a Jac program file, loading it into the Jac runtime environment
-    and running its code. This is the primary way to execute Jac programs.
+    Executes a Jac program file or Python file, loading it into the Jac runtime environment
+    and running its code. Python files are converted to Jac AST for execution.
 
     Args:
-        filename: Path to the .jac or .jir file to run
+        filename: Path to the .jac, .jir, or .py file to run
         session: Optional session identifier for persistent state
         main: Treat the module as __main__ (default: True)
         cache: Use cached compilation if available (default: True)
 
     Examples:
         jac run myprogram.jac
+        jac run myscript.py
         jac run myprogram.jac --session mysession
         jac run myprogram.jac --no-main
     """
@@ -132,7 +142,7 @@ def run(
     base, mod, mach = proc_file_sess(filename, session)
     Jac.set_base_path(base)
 
-    if filename.endswith(".jac"):
+    if filename.endswith((".jac", ".py")):
         try:
             Jac.jac_import(
                 target=mod,
@@ -140,7 +150,7 @@ def run(
                 override_name="__main__" if main else None,
             )
         except Exception as e:
-            print(e, file=sys.stderr)
+            print(f"Error running {filename}: {e}", file=sys.stderr)
     elif filename.endswith(".jir"):
         try:
             with open(filename, "rb") as f:
@@ -151,10 +161,13 @@ def run(
                     override_name="__main__" if main else None,
                 )
         except Exception as e:
-            print(e, file=sys.stderr)
-
+            print(f"Error running {filename}: {e}", file=sys.stderr)
     else:
-        print("Not a valid file!\nOnly supports `.jac` and `.jir`")
+        print(
+            "Not a valid file!\nOnly supports `.jac`, `.jir`, and `.py`",
+            file=sys.stderr,
+        )
+
     mach.close()
 
 
@@ -231,6 +244,41 @@ def build(filename: str) -> None:
         print("Not a .jac file.", file=sys.stderr)
 
 
+@cmd_registry.register
+def bind(filename: str, typecheck: bool = False) -> None:
+    """Bind the specified .jac file.
+
+    Parses and binds a Jac source file, resolving symbols and preparing it for execution.
+    This step is necessary before running the program, as it ensures all references
+    are correctly linked and the program structure is validated.
+    TODO: performs type checking.
+
+    Args:
+        filename: Path to the .jac file to bind
+        typecheck: Print the symbol table after binding (default: False)
+
+    Examples:
+        jac bind myprogram.jac
+        jac bind myprogram.jac -t
+    """
+    if filename.endswith((".jac", ".py")):
+        (out := JacProgram()).bind(file_path=filename)
+        errs = len(out.errors_had)
+        warnings = len(out.warnings_had)
+        if typecheck:
+            for mods in out.mod.hub.values():
+                if mods.name == "builtins":
+                    continue
+                header = (
+                    f"{'=' * 6} SymTable({mods.name}) {'=' * (22 - len(mods.name))}"
+                )
+                divider = "=" * 40
+                print(f"{divider}\n{header}\n{divider}\n{mods.sym_tab.sym_pp()}")
+        print(f"Errors: {errs}, Warnings: {warnings}")
+    else:
+        print("Not a .jac/.py file.", file=sys.stderr)
+
+
 @cmd_registry.register
 def check(filename: str, print_errs: bool = True) -> None:
     """Run type checker for a specified .jac file.
@@ -546,16 +594,21 @@ def py2jac(filename: str) -> None:
         jac py2jac myscript.py > converted.jac
     """
     if filename.endswith(".py"):
-        with open(filename, "r") as f:
-            file_source = f.read()
-            code = PyastBuildPass(
-                ir_in=uni.PythonModuleAst(
-                    ast3.parse(file_source),
-                    orig_src=uni.Source(file_source, filename),
-                ),
-                prog=JacProgram(),
-            ).ir_out.unparse()
-        print(code)
+        file_source = read_file_with_encoding(filename)
+        code = PyastBuildPass(
+            ir_in=uni.PythonModuleAst(
+                ast3.parse(file_source),
+                orig_src=uni.Source(file_source, filename),
+            ),
+            prog=JacProgram(),
+        ).ir_out.unparse(requires_format=False)
+        formatted_code = JacProgram().jac_str_formatter(
+            source_str=code, file_path=filename
+        )
+        if formatted_code:
+            print(formatted_code)
+        else:
+            print("Error converting Python code to Jac.", file=sys.stderr)
     else:
         print("Not a .py file.")
 
@@ -575,8 +628,7 @@ def jac2py(filename: str) -> None:
         jac jac2py myprogram.jac > converted.py
     """
     if filename.endswith(".jac"):
-        with open(filename, "r"):
-            code = JacProgram().compile(file_path=filename).gen.py
+        code = JacProgram().compile(file_path=filename).gen.py
         print(code)
     else:
         print("Not a .jac file.", file=sys.stderr)

jaclang/compiler/jac.lark

@@ -62,7 +62,7 @@ ability: decorators? KW_ASYNC? (ability_decl | function_decl)
 
 function_decl: KW_OVERRIDE? KW_STATIC? KW_DEF access_tag? named_ref func_decl? (block_tail | KW_ABSTRACT? SEMI)
 ability_decl: KW_OVERRIDE? KW_STATIC? KW_CAN access_tag? named_ref event_clause (block_tail | KW_ABSTRACT? SEMI)
-block_tail: code_block | KW_BY atomic_call SEMI
+block_tail: code_block | KW_BY expression SEMI
 event_clause: KW_WITH expression? (KW_EXIT | KW_ENTRY)
 
 func_decl: (LPAREN func_decl_params? RPAREN) (RETURN_HINT expression)?
@@ -331,9 +331,9 @@ index_slice: LSQUARE
            | list_val
 
 // [Heading]: Function calls.
-atomic_call: atomic_chain LPAREN param_list? by_call? RPAREN by_call?
+atomic_call: atomic_chain LPAREN param_list? by_llm? RPAREN
 
-by_call: KW_BY expression
+by_llm: KW_BY expression
 
 param_list: expr_list COMMA kw_expr_list COMMA?
           | kw_expr_list COMMA?