jaclang 0.8.8__py3-none-any.whl → 0.8.9__py3-none-any.whl

jaclang/cli/cli.py

@@ -62,7 +62,7 @@ def format(path: str, outfile: str = "", to_screen: bool = False) -> None:
     if path.endswith(".jac"):
         if not path_obj.exists():
             print(f"Error: File '{path}' does not exist.", file=sys.stderr)
-            return
+            exit(1)
         formatted_code = JacProgram.jac_file_formatter(str(path_obj))
         write_formatted_code(formatted_code, str(path_obj))
         return
@@ -79,6 +79,7 @@ def format(path: str, outfile: str = "", to_screen: bool = False) -> None:
 
     # Case 3: Invalid path
     print(f"Error: '{path}' is not a .jac file or directory.", file=sys.stderr)
+    exit(1)
 
 
 def proc_file_sess(
@@ -104,6 +105,7 @@ def proc_file_sess(
             "Not a valid file!\nOnly supports `.jac`, `.jir`, and `.py`",
             file=sys.stderr,
         )
+        exit(1)
     mach = ExecutionContext(session=session, root=root)
     Jac.set_context(mach)
     return base, mod, mach
@@ -149,6 +151,8 @@ def run(
             )
         except Exception as e:
             print(f"Error running {filename}: {e}", file=sys.stderr)
+            mach.close()
+            exit(1)
     elif filename.endswith(".jir"):
         try:
             with open(filename, "rb") as f:
@@ -161,6 +165,8 @@ def run(
                 )
         except Exception as e:
             print(f"Error running {filename}: {e}", file=sys.stderr)
+            mach.close()
+            exit(1)
 
     mach.close()
 
@@ -208,6 +214,8 @@ def get_object(filename: str, id: str, session: str = "", main: bool = True) ->
         data = obj.__jac__.__getstate__()
     else:
         print(f"Object with id {id} not found.", file=sys.stderr)
+        mach.close()
+        exit(1)
     mach.close()
     return data
 
@@ -238,6 +246,9 @@ def build(filename: str, typecheck: bool = False) -> None:
     for alrt in out.errors_had + out.warnings_had:
         print(alrt.pretty_print(), file=sys.stderr)
 
+    if errs > 0:
+        exit(1)
+
     with open(filename[:-4] + ".jir", "wb") as f:
         pickle.dump(out, f)
 
@@ -273,8 +284,11 @@ def bind(filename: str, typecheck: bool = False) -> None:
                 divider = "=" * 40
                 print(f"{divider}\n{header}\n{divider}\n{mods.sym_tab.sym_pp()}")
         print(f"Errors: {errs}, Warnings: {warnings}")
+        if errs > 0:
+            exit(1)
     else:
         print("Not a .jac/.py file.", file=sys.stderr)
+        exit(1)
 
 
 @cmd_registry.register
@@ -301,8 +315,11 @@ def check(filename: str, print_errs: bool = True) -> None:
             for e in prog.errors_had:
                 print("Error:", e, file=sys.stderr)
         print(f"Errors: {errs}, Warnings: {warnings}")
+        if errs > 0:
+            exit(1)
     else:
         print("Not a .jac file.", file=sys.stderr)
+        exit(1)
 
 
 @cmd_registry.register
@@ -376,6 +393,8 @@ def enter(
         (loaded_mod,) = ret_module
         if not loaded_mod:
             print("Errors occurred while importing the module.", file=sys.stderr)
+            mach.close()
+            exit(1)
         else:
             archetype = getattr(loaded_mod, entrypoint)(*args)
 
@@ -466,6 +485,7 @@ def tool(tool: str, args: Optional[list] = None) -> None:
             raise e
     else:
         print(f"Ast tool {tool} not found.", file=sys.stderr)
+        exit(1)
 
 
 @cmd_registry.register
@@ -503,8 +523,10 @@ def debug(filename: str, main: bool = True, cache: bool = False) -> None:
                 print("Done debugging.")
         else:
             print(f"Error while generating bytecode in {filename}.", file=sys.stderr)
+            exit(1)
     else:
         print("Not a .jac file.", file=sys.stderr)
+        exit(1)
 
 
 @cmd_registry.register
@@ -575,6 +597,7 @@ def dot(
         jac_machine.close()
     else:
         print("Not a .jac file.", file=sys.stderr)
+        exit(1)
 
 
 @cmd_registry.register
@@ -607,8 +630,10 @@ def py2jac(filename: str) -> None:
             print(formatted_code)
         else:
             print("Error converting Python code to Jac.", file=sys.stderr)
+            exit(1)
     else:
         print("Not a .py file.")
+        exit(1)
 
 
 @cmd_registry.register
@@ -627,9 +652,46 @@ def jac2py(filename: str) -> None:
     """
     if filename.endswith(".jac"):
         code = JacProgram().compile(file_path=filename).gen.py
-        print(code)
+        if code:
+            print(code)
+        else:
+            exit(1)
     else:
         print("Not a .jac file.", file=sys.stderr)
+        exit(1)
+
+
+@cmd_registry.register
+def jac2lib(filename: str) -> None:
+    """Convert a Jac file to Python library code.
+
+    Translates Jac source code to equivalent Python code with library mode enabled.
+    In library mode, the generated Python uses direct imports from jaclang.lib
+    instead of aliased imports, making the output cleaner and more suitable for
+    use as a standalone library.
+
+    Args:
+        filename: Path to the .jac file to convert
+
+    Examples:
+        jac jac2lib myprogram.jac > mylib.py
+    """
+    if filename.endswith(".jac"):
+        # Temporarily enable library mode
+        original_library_mode = settings.library_mode
+        settings.library_mode = True
+        try:
+            code = JacProgram().compile(file_path=filename).gen.py
+            if code:
+                print(code)
+            else:
+                exit(1)
+        finally:
+            # Restore original setting
+            settings.library_mode = original_library_mode
+    else:
+        print("Not a .jac file.", file=sys.stderr)
+        exit(1)
 
 
 def start_cli() -> None:

jaclang/compiler/constant.py

@@ -197,7 +197,6 @@ class Tokens(str, Enum):
     BW_AND_EQ = "BW_AND_EQ"
     BW_OR_EQ = "BW_OR_EQ"
     BW_XOR_EQ = "BW_XOR_EQ"
-    BW_NOT_EQ = "BW_NOT_EQ"
     LSHIFT_EQ = "LSHIFT_EQ"
     RSHIFT_EQ = "RSHIFT_EQ"
     WALRUS_EQ = "WALRUS_EQ"
@@ -300,8 +299,14 @@ class Tokens(str, Enum):
     FSTR_END = "FSTR_END"
     FSTR_SQ_START = "FSTR_SQ_START"
     FSTR_SQ_END = "FSTR_SQ_END"
+    FSTR_TRIPLE_START = "FSTR_TRIPLE_START"
+    FSTR_TRIPLE_END = "FSTR_TRIPLE_END"
+    FSTR_SQ_TRIPLE_START = "FSTR_SQ_TRIPLE_START"
+    FSTR_SQ_TRIPLE_END = "FSTR_SQ_TRIPLE_END"
     FSTR_PIECE = "FSTR_PIECE"
     FSTR_SQ_PIECE = "FSTR_SQ_PIECE"
+    FSTR_TRIPLE_PIECE = "FSTR_TRIPLE_PIECE"
+    FSTR_SQ_TRIPLE_PIECE = "FSTR_SQ_TRIPLE_PIECE"
     FSTR_BESC = "FSTR_BESC"
     COMMENT = "COMMENT"
     WS = "WS"

jaclang/compiler/jac.lark

@@ -28,7 +28,7 @@ import_items: (import_item COMMA)* import_item COMMA?
 import_item: named_ref (KW_AS NAME)?
 dotted_name: named_ref (DOT named_ref)*
 
-// [Heading]: Archetypes.
+// [Heading]: Class Archetypes.
 archetype: decorators? KW_ASYNC? archetype_decl
          | enum
 
@@ -44,7 +44,7 @@ arch_type: KW_WALKER
           | KW_NODE
           | KW_CLASS
 
-// [Heading]: Archetype bodies.
+// [Heading]: Class Archetype bodies.
 member_block: LBRACE member_stmt* RBRACE
 member_stmt: STRING? (py_code_block | ability | archetype | impl_def | has_stmt | free_code)
 has_stmt: KW_STATIC? (KW_LET | KW_HAS) access_tag? has_assign_list SEMI
@@ -55,7 +55,7 @@ type_tag: COLON expression
 // [Heading]: Enumerations.
 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
+enum_block: LBRACE assignment_list (py_code_block | free_code)* RBRACE
 
 // [Heading]: Functions and Abilities.
 ability: decorators? KW_ASYNC? (ability_decl | function_decl)
@@ -79,13 +79,13 @@ 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
+sem_def: KW_SEM dotted_name (EQ | KW_IS) STRING SEMI
 
 // [Heading]: Global variables.
 global_var: (KW_LET | KW_GLOBAL) access_tag? assignment_list SEMI
-assignment_list: (assignment_list COMMA)? (assignment | named_ref)
+assignment_list: (assignment | named_ref) (COMMA (assignment | named_ref))* COMMA?
 
-// [Heading]: Free code.
+// [Heading]: With entry blocks.
 free_code: KW_WITH KW_ENTRY (COLON NAME)? code_block
 
 // [Heading]: Inline python.
@@ -147,7 +147,6 @@ finally_stmt: KW_FINALLY code_block
 match_stmt: KW_MATCH expression LBRACE match_case_block+ RBRACE
 match_case_block: KW_CASE pattern_seq (KW_IF expression)? COLON statement+
 
-// [Heading]: Match patterns.
 pattern_seq: (or_pattern | as_pattern)
 or_pattern: (pattern BW_OR)* pattern
 as_pattern: or_pattern KW_AS NAME
@@ -157,28 +156,18 @@ pattern: literal_pattern
     | capture_pattern
     | sequence_pattern
     | mapping_pattern
+    | attr_pattern
     | class_pattern
 
-
-// [Heading]: Match literal patterns.
 literal_pattern: (INT | FLOAT | multistring)
-
-// [Heading]: Match singleton patterns.
 singleton_pattern: (NULL | BOOL)
-
-// [Heading]: Match capture patterns.
 capture_pattern: NAME
-
-// [Heading]: Match sequence patterns.
 sequence_pattern: LSQUARE list_inner_pattern (COMMA list_inner_pattern)* RSQUARE
                 | LPAREN list_inner_pattern (COMMA list_inner_pattern)* RPAREN
-
-// [Heading]: Match mapping patterns.
 mapping_pattern: LBRACE (dict_inner_pattern (COMMA dict_inner_pattern)*)? RBRACE
 list_inner_pattern: (pattern_seq | STAR_MUL NAME)
 dict_inner_pattern: (literal_pattern COLON pattern_seq | STAR_POW NAME)
-
-// [Heading]: Match class patterns.
+attr_pattern: NAME (DOT NAME)+
 class_pattern: NAME (DOT NAME)* LPAREN kw_pattern_list? RPAREN
              | NAME (DOT NAME)* LPAREN pattern_list (COMMA kw_pattern_list)? RPAREN
 
@@ -195,7 +184,7 @@ global_ref: GLOBAL_OP name_list
 nonlocal_ref: NONLOCAL_OP name_list
 name_list: (named_ref COMMA)* named_ref
 
-// [Heading]: Object spatial typed context blocks.
+// [Heading]: Typed context blocks (OSP).
 typed_ctx_block: RETURN_HINT expression code_block
 
 // [Heading]: Return statements.
@@ -219,13 +208,9 @@ report_stmt: KW_REPORT expression
 // [Heading]: Control statements.
 ctrl_stmt: KW_SKIP | KW_BREAK | KW_CONTINUE
 
-// [Heading]: Object spatial Walker statements.
+// [Heading]: Walker visit and disengage (OSP).
 spatial_stmt: visit_stmt | disenage_stmt
-
-// [Heading]: Visit statements.
 visit_stmt: KW_VISIT (COLON expression COLON)? expression (else_stmt | SEMI)
-
-// [Heading]: Disengage statements.
 disenage_stmt: KW_DISENGAGE SEMI
 
 // [Heading]: Assignments.
@@ -235,7 +220,6 @@ assignment: KW_LET? (atomic_chain EQ)+ (yield_expr | expression)
 
 aug_op: RSHIFT_EQ
        | LSHIFT_EQ
-       | BW_NOT_EQ
        | BW_XOR_EQ
        | BW_OR_EQ
        | BW_AND_EQ
@@ -296,28 +280,29 @@ term: (term (MOD | DIV | FLOOR_DIV | STAR_MUL | DECOR_OP))? power
 power: (power STAR_POW)? factor
 factor: (BW_NOT | MINUS | PLUS) factor | connect
 
-// [Heading]: Connect expressions.
+// [Heading]: Connect expressions (OSP).
 connect: (connect (connect_op | disconnect_op))? atomic_pipe
 
-// [Heading]: Atomic expressions.
+// [Heading]: Pipe atomic expressions.
 atomic_pipe: (atomic_pipe A_PIPE_FWD)? atomic_pipe_back
 
-// [Heading]: Atomic pipe back expressions.
+// [Heading]: Pipe back atomic expressions.
 atomic_pipe_back: (atomic_pipe_back A_PIPE_BKWD)? os_spawn
 
-// [Heading]: Object spatial spawn expressions.
+// [Heading]: Spawn expressions (OSP).
 os_spawn: (os_spawn KW_SPAWN)? unpack
 
 // [Heading]: Unpack expressions.
 unpack: STAR_MUL? ref
 
-// [Heading]: References (unused).
-ref: BW_AND? pipe_call
+// [Heading]: References (OSP).
+ref: BW_AND? await_expr
 
-// [Heading]: Object spatial calls.
-pipe_call: (PIPE_FWD | A_PIPE_FWD | KW_SPAWN | KW_AWAIT)? atomic_chain
+// [Heading]: Pipe-style function call.
+await_expr: KW_AWAIT? pipe_call
+pipe_call: (PIPE_FWD | A_PIPE_FWD | KW_SPAWN)? atomic_chain
 
-// [Heading]: Subscripted and dotted expressions.
+// [Heading]: Attributes and Subscript expressions.
 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)
@@ -329,7 +314,7 @@ index_slice: LSQUARE
            | list_val
 
 // [Heading]: Function calls.
-atomic_call: atomic_chain LPAREN param_list? by_llm? RPAREN
+atomic_call: atomic_chain (gen_compr | LPAREN param_list? by_llm? RPAREN)
 
 by_llm: KW_BY expression
 
@@ -337,7 +322,7 @@ param_list: expr_list COMMA kw_expr_list COMMA?
           | kw_expr_list COMMA?
           | expr_list COMMA?
 
-// [Heading]: Atom.
+// [Heading]: Atomic expressions.
 atom: named_ref
     | LPAREN (expression | yield_expr) RPAREN
     | atom_collection
@@ -361,9 +346,13 @@ multistring: (fstring | STRING)+
 
 fstring: FSTR_START fstr_parts FSTR_END
        | FSTR_SQ_START fstr_sq_parts FSTR_SQ_END
+       | FSTR_TRIPLE_START fstr_triple_parts FSTR_TRIPLE_END
+       | FSTR_SQ_TRIPLE_START fstr_sq_triple_parts FSTR_SQ_TRIPLE_END
 
 fstr_parts: (FSTR_PIECE | FSTR_BESC | LBRACE expression RBRACE )*
 fstr_sq_parts: (FSTR_SQ_PIECE | FSTR_BESC | LBRACE expression RBRACE )*
+fstr_triple_parts: (FSTR_TRIPLE_PIECE | FSTR_BESC | LBRACE expression RBRACE )*
+fstr_sq_triple_parts: (FSTR_SQ_TRIPLE_PIECE | FSTR_BESC | LBRACE expression RBRACE )*
 
 // [Heading]: Collection values.
 atom_collection: dict_compr
@@ -389,7 +378,6 @@ set_val: LBRACE expr_list COMMA? RBRACE
 kv_pair: expression COLON expression | STAR_POW expression
 expr_list: (expr_list COMMA)? expression
 
-// [Heading]: Tuples and Jac Tuples.
 tuple_list: expression COMMA expr_list COMMA kw_expr_list COMMA?
           | expression COMMA kw_expr_list COMMA?
           | expression COMMA expr_list COMMA?
@@ -399,7 +387,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]: Object-Spatial References.
+// [Heading]: Edge references (OSP).
 edge_ref_chain: LSQUARE KW_ASYNC? (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
@@ -411,7 +399,7 @@ connect_to: CARROW_R | CARROW_R_P1 expression (COLON kw_expr_list)? CARROW_R_P2
 connect_from: CARROW_L | CARROW_L_P1 expression (COLON kw_expr_list)? CARROW_L_P2
 connect_any: CARROW_BI | CARROW_L_P1 expression (COLON kw_expr_list)? CARROW_R_P2
 
-// [Heading]: Special Comprehensions.
+// [Heading]: Filter and assign comprehensions.
 filter_compr: LPAREN NULL_OK filter_compare_list RPAREN
             | LPAREN TYPE_OP NULL_OK typed_filter_compare_list RPAREN
 assign_compr: LPAREN EQ kw_expr_list RPAREN
@@ -455,10 +443,16 @@ GLOBAL_OP: "global"
 NONLOCAL_OP: "nonlocal"
 
 // [Heading]: f-string tokens.
+FSTR_TRIPLE_START.2: "f\"\"\""
+FSTR_TRIPLE_END: "\"\"\""
+FSTR_SQ_TRIPLE_START.2: "f'''"
+FSTR_SQ_TRIPLE_END: "'''"
 FSTR_START.1: "f\""
 FSTR_END: "\""
 FSTR_SQ_START.1: "f'"
 FSTR_SQ_END: "'"
+FSTR_TRIPLE_PIECE.-1: /(?:(?!""")(?![{}])[\s\S])+/
+FSTR_SQ_TRIPLE_PIECE.-1: /(?:(?!''')(?![{}])[\s\S])+/
 FSTR_PIECE.-1: /[^\{\}\"]+/
 FSTR_SQ_PIECE.-1: /[^\{\}\']+/
 FSTR_BESC.1: /{{|}}/
@@ -624,7 +618,6 @@ FLOOR_DIV_EQ: "//="
 BW_AND_EQ: "&="
 BW_OR_EQ: "|="
 BW_XOR_EQ: "^="
-BW_NOT_EQ: "~="
 LSHIFT_EQ: "<<="
 RSHIFT_EQ: ">>="