jaclang 0.8.1__py3-none-any.whl → 0.8.3__py3-none-any.whl

jaclang/__init__.py

@@ -1,14 +1,20 @@
 """The Jac Programming Language."""
 
+import sys
+
 from jaclang.runtimelib.machine import (
     JacMachine,
     JacMachineImpl,
     JacMachineInterface,
     plugin_manager,
 )
+from jaclang.runtimelib.meta_importer import JacMetaImporter
 
 
 plugin_manager.register(JacMachineImpl)
 plugin_manager.load_setuptools_entrypoints("jac")
 
+if not any(isinstance(f, JacMetaImporter) for f in sys.meta_path):
+    sys.meta_path.insert(0, JacMetaImporter())
+
 __all__ = ["JacMachineInterface", "JacMachine"]

jaclang/cli/cli.py

@@ -12,20 +12,20 @@ from typing import Optional
 
 import jaclang.compiler.unitree as uni
 from jaclang.cli.cmdreg import CommandShell, cmd_registry
-from jaclang.compiler.passes.main import CompilerMode as CMode, PyastBuildPass
+from jaclang.compiler.passes.main import PyastBuildPass
 from jaclang.compiler.program import JacProgram
 from jaclang.runtimelib.builtin import printgraph
 from jaclang.runtimelib.constructs import WalkerArchetype
 from jaclang.runtimelib.machine import (
-    JacMachine,
-    JacMachineInterface as Jac,
-    call_jac_func_with_machine,
+    ExecutionContext,
+    JacMachine as Jac,
+    JacMachineInterface as JacInterface,
 )
 from jaclang.utils.helpers import debugger as db
 from jaclang.utils.lang_tools import AstTool
 
 
-Jac.create_cmd()
+JacInterface.create_cmd()
 Jac.setup()
 
 
@@ -86,7 +86,7 @@ def format(path: str, outfile: str = "", to_screen: bool = False) -> None:
 
 def proc_file_sess(
     filename: str, session: str, root: Optional[str] = None
-) -> tuple[str, str, JacMachine]:
+) -> tuple[str, str, ExecutionContext]:
     """Create JacMachine and return the base path, module name, and machine state."""
     if session == "":
         session = (
@@ -99,7 +99,8 @@ def proc_file_sess(
     base, mod = os.path.split(filename)
     base = base if base else "./"
     mod = mod[:-4]
-    mach = JacMachine(base, session=session, root=root)
+    mach = ExecutionContext(session=session, root=root)
+    Jac.set_context(mach)
     return base, mod, mach
 
 
@@ -129,11 +130,11 @@ def run(
     # if no session specified, check if it was defined when starting the command shell
     # otherwise default to jaclang.session
     base, mod, mach = proc_file_sess(filename, session)
+    Jac.set_base_path(base)
 
     if filename.endswith(".jac"):
         try:
             Jac.jac_import(
-                mach=mach,
                 target=mod,
                 base_path=base,
                 override_name="__main__" if main else None,
@@ -143,9 +144,8 @@ def run(
     elif filename.endswith(".jir"):
         try:
             with open(filename, "rb") as f:
-                Jac.attach_program(mach, pickle.load(f))
+                Jac.attach_program(pickle.load(f))
                 Jac.jac_import(
-                    mach=mach,
                     target=mod,
                     base_path=base,
                     override_name="__main__" if main else None,
@@ -179,19 +179,14 @@ def get_object(filename: str, id: str, session: str = "", main: bool = True) ->
 
     if filename.endswith(".jac"):
         Jac.jac_import(
-            mach=mach,
             target=mod,
             base_path=base,
             override_name="__main__" if main else None,
         )
     elif filename.endswith(".jir"):
         with open(filename, "rb") as f:
-            Jac.attach_program(
-                mach,
-                pickle.load(f),
-            )
+            Jac.attach_program(pickle.load(f))
             Jac.jac_import(
-                mach=mach,
                 target=mod,
                 base_path=base,
                 override_name="__main__" if main else None,
@@ -201,12 +196,11 @@ def get_object(filename: str, id: str, session: str = "", main: bool = True) ->
         raise ValueError("Not a valid file!\nOnly supports `.jac` and `.jir`")
 
     data = {}
-    obj = call_jac_func_with_machine(mach, Jac.get_object, id)
+    obj = Jac.get_object(id)
     if obj:
         data = obj.__jac__.__getstate__()
     else:
         print(f"Object with id {id} not found.", file=sys.stderr)
-
     mach.close()
     return data
 
@@ -227,10 +221,7 @@ def build(filename: str) -> None:
         jac build myprogram.jac --no-typecheck
     """
     if filename.endswith(".jac"):
-        (out := JacProgram()).compile(
-            file_path=filename,
-            mode=CMode.COMPILE,
-        )
+        (out := JacProgram()).compile(file_path=filename)
         errs = len(out.errors_had)
         warnings = len(out.warnings_had)
         print(f"Errors: {errs}, Warnings: {warnings}")
@@ -256,10 +247,7 @@ def check(filename: str, print_errs: bool = True) -> None:
         jac check myprogram.jac --no-print_errs
     """
     if filename.endswith(".jac"):
-        (prog := JacProgram()).compile(
-            file_path=filename,
-            mode=CMode.TYPECHECK,
-        )
+        (prog := JacProgram()).compile(file_path=filename)
 
         errs = len(prog.errors_had)
         warnings = len(prog.warnings_had)
@@ -284,13 +272,9 @@ def lsp() -> None:
     Examples:
         jac lsp
     """
-    from jaclang import JacMachineInterface as _
+    from jaclang.langserve.server import run_lang_server
 
-    run_lang_server_tuple = _.py_jac_import(
-        "...jaclang.langserve.server", __file__, items={"run_lang_server": None}
-    )
-    run_lang_server = run_lang_server_tuple[0]
-    run_lang_server()  # type: ignore
+    run_lang_server()
 
 
 @cmd_registry.register
@@ -326,19 +310,14 @@ def enter(
 
     if filename.endswith(".jac"):
         ret_module = Jac.jac_import(
-            mach=mach,
             target=mod,
             base_path=base,
             override_name="__main__" if main else None,
         )
     elif filename.endswith(".jir"):
         with open(filename, "rb") as f:
-            Jac.attach_program(
-                mach,
-                pickle.load(f),
-            )
+            Jac.attach_program(pickle.load(f))
             ret_module = Jac.jac_import(
-                mach=mach,
                 target=mod,
                 base_path=base,
                 override_name="__main__" if main else None,
@@ -355,11 +334,10 @@ def enter(
             archetype = getattr(loaded_mod, entrypoint)(*args)
 
             mach.set_entry_node(node)
-            if isinstance(archetype, WalkerArchetype) and call_jac_func_with_machine(
-                mach, Jac.check_read_access, mach.entry_node
+            if isinstance(archetype, WalkerArchetype) and Jac.check_read_access(
+                mach.entry_node
             ):
                 Jac.spawn(mach.entry_node.archetype, archetype)
-
     mach.close()
 
 
@@ -397,10 +375,7 @@ def test(
         jac test --xit               # Stop on first failure
         jac test --verbose           # Show detailed output
     """
-    mach = JacMachine()
-
     failcount = Jac.run_test(
-        mach=mach,
         filepath=filepath,
         func_name=("test_" + test_name) if test_name else None,
         filter=filter,
@@ -410,8 +385,6 @@ def test(
         verbose=verbose,
     )
 
-    mach.close()
-
     if failcount:
         raise SystemExit(f"Tests failed: {failcount}")
 
@@ -528,10 +501,8 @@ def dot(
     base, mod, jac_machine = proc_file_sess(filename, session)
 
     if filename.endswith(".jac"):
-        Jac.jac_import(
-            mach=jac_machine, target=mod, base_path=base, override_name="__main__"
-        )
-        module = jac_machine.loaded_modules.get("__main__")
+        Jac.jac_import(target=mod, base_path=base, override_name="__main__")
+        module = Jac.loaded_modules.get("__main__")
         globals().update(vars(module))
         try:
             node = globals().get(initial, eval(initial)) if initial else None

jaclang/compiler/codeinfo.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 import ast as ast3
 from typing import Optional, TYPE_CHECKING
 
-
 if TYPE_CHECKING:
     from jaclang.compiler.unitree import Source, Token
 

jaclang/compiler/constant.py

@@ -19,6 +19,7 @@ class SymbolType(Enum):
     TEST = "test"  # LSP: Function
     TYPE = "type"  # LSP: TypeParameter
     IMPL = "impl"  # LSP: Interface or Property
+    SEM = "sem"  # LSP: Property
     HAS_VAR = "field"  # LSP: Field
     METHOD = "method"  # LSP: Method
     CONSTRUCTOR = "constructor"  # LSP: Constructor
@@ -290,6 +291,7 @@ class Tokens(str, Enum):
     KW_ROOT = "KW_ROOT"
     KW_POST_INIT = "KW_POST_INIT"
     KW_IMPL = "KW_IMPL"
+    KW_SEM = "KW_SEM"
     TYPE_OP = "TYPE_OP"
     A_PIPE_FWD = "A_PIPE_FWD"
     A_PIPE_BKWD = "A_PIPE_BKWD"

jaclang/compiler/jac.lark

@@ -8,6 +8,7 @@ tl_stmt_with_doc: STRING toplevel_stmt
 toplevel_stmt: import_stmt
        | archetype
        | impl_def
+       | sem_def
        | ability
        | global_var
        | free_code
@@ -62,7 +63,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
-event_clause: KW_WITH expression? (KW_EXIT | KW_ENTRY) (RETURN_HINT expression)?
+event_clause: KW_WITH expression? (KW_EXIT | KW_ENTRY)
 
 func_decl: (LPAREN func_decl_params? RPAREN) (RETURN_HINT expression)?
          | (RETURN_HINT expression)
@@ -75,6 +76,9 @@ impl_def: decorators? KW_IMPL dotted_name impl_spec? impl_tail
 impl_spec: inherited_archs | func_decl | event_clause
 impl_tail: enum_block | block_tail
 
+// [Heading]: Semstrings.
+sem_def: KW_SEM dotted_name EQ STRING SEMI
+
 // [Heading]: Global variables.
 global_var: (KW_LET | KW_GLOBAL) access_tag? assignment_list SEMI
 assignment_list: (assignment_list COMMA)? (assignment | named_ref)
@@ -190,7 +194,7 @@ global_ref: GLOBAL_OP name_list
 nonlocal_ref: NONLOCAL_OP name_list
 name_list: (named_ref COMMA)* named_ref
 
-// [Heading]: Data spatial typed context blocks.
+// [Heading]: Object spatial typed context blocks.
 typed_ctx_block: RETURN_HINT expression code_block
 
 // [Heading]: Return statements.
@@ -217,7 +221,7 @@ report_stmt: KW_REPORT expression
 // [Heading]: Control statements.
 ctrl_stmt: KW_SKIP | KW_BREAK | KW_CONTINUE
 
-// [Heading]: Data spatial Walker statements.
+// [Heading]: Object spatial Walker statements.
 spatial_stmt: visit_stmt | ignore_stmt | disenage_stmt
 
 // [Heading]: Visit statements.
@@ -304,10 +308,10 @@ connect: (connect (connect_op | disconnect_op))? atomic_pipe
 atomic_pipe: (atomic_pipe A_PIPE_FWD)? atomic_pipe_back
 
 // [Heading]: Atomic pipe back expressions.
-atomic_pipe_back: (atomic_pipe_back A_PIPE_BKWD)? ds_spawn
+atomic_pipe_back: (atomic_pipe_back A_PIPE_BKWD)? os_spawn
 
-// [Heading]: Data spatial spawn expressions.
-ds_spawn: (ds_spawn KW_SPAWN)? unpack
+// [Heading]: Object spatial spawn expressions.
+os_spawn: (os_spawn KW_SPAWN)? unpack
 
 // [Heading]: Unpack expressions.
 unpack: STAR_MUL? ref
@@ -315,7 +319,7 @@ unpack: STAR_MUL? ref
 // [Heading]: References (unused).
 ref: BW_AND? pipe_call
 
-// [Heading]: Data spatial calls.
+// [Heading]: Object spatial calls.
 pipe_call: (PIPE_FWD | A_PIPE_FWD | KW_SPAWN | KW_AWAIT)? atomic_chain
 
 // [Heading]: Subscripted and dotted expressions.
@@ -330,7 +334,9 @@ index_slice: LSQUARE
            | list_val
 
 // [Heading]: Function calls.
-atomic_call: atomic_chain LPAREN param_list? (KW_BY atomic_call)? RPAREN
+atomic_call: atomic_chain LPAREN param_list? by_call? RPAREN by_call?
+
+by_call: KW_BY expression
 
 param_list: expr_list COMMA kw_expr_list COMMA?
           | kw_expr_list COMMA?
@@ -398,7 +404,7 @@ tuple_list: expression COMMA expr_list COMMA kw_expr_list COMMA?
 kw_expr_list: (kw_expr_list COMMA)? kw_expr
 kw_expr: named_ref EQ expression | STAR_POW expression
 
-// [Heading]: Data Spatial References.
+// [Heading]: Object-Spatial References.
 edge_ref_chain: LSQUARE (KW_NODE| KW_EDGE)? expression? (edge_op_ref (filter_compr | expression)?)+ RSQUARE
 edge_op_ref: edge_any | edge_from | edge_to
 edge_to: ARROW_R | ARROW_R_P1 typed_filter_compare_list ARROW_R_P2
@@ -519,6 +525,7 @@ KW_FLOW: "flow"
 KW_WAIT: "wait"
 KW_TEST: "test"
 KW_IMPL: "impl"
+KW_SEM: "sem"
 KW_ASSERT: "assert"
 KW_CHECK: "check"
 KW_IF: "if"
@@ -589,7 +596,7 @@ KWESC_NAME: /<>[a-zA-Z_][a-zA-Z0-9_]*/
 NAME: /[a-zA-Z_][a-zA-Z0-9_]*/
 
 
-// Data Spatial Operators -------------------------------------------------- //
+// Object-Spatial Operators -------------------------------------------------- //
 
 ARROW_BI: "<-->"
 ARROW_L: "<--"