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

jaclang/cli/cli.py

@@ -14,7 +14,7 @@ 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.program import JacProgram
-from jaclang.runtimelib.builtin import dotgen
+from jaclang.runtimelib.builtin import printgraph
 from jaclang.runtimelib.constructs import WalkerArchetype
 from jaclang.runtimelib.machine import (
     JacMachine,
@@ -85,7 +85,7 @@ def format(path: str, outfile: str = "", to_screen: bool = False) -> None:
 
 
 def proc_file_sess(
-    filename: str, session: str, root: Optional[str] = None, interp: bool = False
+    filename: str, session: str, root: Optional[str] = None
 ) -> tuple[str, str, JacMachine]:
     """Create JacMachine and return the base path, module name, and machine state."""
     if session == "":
@@ -99,7 +99,7 @@ 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, interp_mode=interp)
+    mach = JacMachine(base, session=session, root=root)
     return base, mod, mach
 
 
@@ -109,7 +109,6 @@ def run(
     session: str = "",
     main: bool = True,
     cache: bool = True,
-    interp: bool = False,
 ) -> None:
     """Run the specified .jac file.
 
@@ -121,7 +120,6 @@ def run(
         session: Optional session identifier for persistent state
         main: Treat the module as __main__ (default: True)
         cache: Use cached compilation if available (default: True)
-        interp: Run in interpreter mode (default: False)
 
     Examples:
         jac run myprogram.jac
@@ -130,7 +128,7 @@ 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, interp=interp)
+    base, mod, mach = proc_file_sess(filename, session)
 
     if filename.endswith(".jac"):
         try:
@@ -286,9 +284,13 @@ def lsp() -> None:
     Examples:
         jac lsp
     """
-    from jaclang.langserve.server import run_lang_server
+    from jaclang import JacMachineInterface as _
 
-    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
 
 
 @cmd_registry.register
@@ -533,7 +535,7 @@ def dot(
         globals().update(vars(module))
         try:
             node = globals().get(initial, eval(initial)) if initial else None
-            graph = dotgen(
+            graph = printgraph(
                 node=node,
                 depth=depth,
                 traverse=traverse,

jaclang/compiler/jac.lark

@@ -1,19 +1,9 @@
 // [Heading]: Base Module structure.
 start: module
 
-// TODO:AST: We should allow the very first top level statement to have
-// docstring but not the module to have one. After allowing that
-// the rule for the module would be:
-//
-// module: STRING? toplevel_stmt*
-//
 module: (toplevel_stmt (tl_stmt_with_doc | toplevel_stmt)*)?
        | STRING        (tl_stmt_with_doc | toplevel_stmt)*
 
-// AST:TODO: Docstring should be part of the definition of the statement
-// and not all toplevel statement have docstring, example: ImportStmt.
-//
-// Statements that are only valid at the toplevel.
 tl_stmt_with_doc: STRING toplevel_stmt
 toplevel_stmt: import_stmt
        | archetype
@@ -66,7 +56,7 @@ enum: decorators? enum_decl
 enum_decl: KW_ENUM access_tag? NAME inherited_archs? (enum_block | SEMI)
 enum_block: LBRACE assignment_list COMMA? (py_code_block | free_code)* RBRACE
 
-// [Heading]: Abilities.
+// [Heading]: Functions and Abilities.
 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)
@@ -165,7 +155,7 @@ pattern: literal_pattern
     | class_pattern
 
 
-// [Heading]: Match litteral patterns.
+// [Heading]: Match literal patterns.
 literal_pattern: (INT | FLOAT | multistring)
 
 // [Heading]: Match singleton patterns.