jaclang 0.5.17__py3-none-any.whl → 0.6.0__py3-none-any.whl

jaclang/compiler/passes/main/pyast_load_pass.py

@@ -6,6 +6,8 @@ import ast as py_ast
 import os
 from typing import Optional, Sequence, TypeAlias, TypeVar
 
+# from icecream import ic
+
 import jaclang.compiler.absyntree as ast
 from jaclang.compiler.constant import Tokens as Tok
 from jaclang.compiler.passes.ir_pass import Pass
@@ -44,6 +46,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             raise self.ice(f"Unknown node type {type(node).__name__}")
         # print(f"finshed {type(node).__name__} ---------------------")
         # print("normalizing", ret.__class__.__name__)
+        # ic("normalizing", ret.__class__.__name__)
         # print(ret.unparse())
         # ret.unparse()
         return ret
@@ -140,10 +143,13 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             if sys.version_info >= (3, 12):
             type_params: list[type_param]
         """
+        # ic("----")
         name = ast.Name(
             file_path=self.mod_path,
             name=Tok.NAME,
-            value=node.name,
+            value=(
+                node.name if node.name != "root" else "root_"
+            ),  # root is a reserved keyword
             line=node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name),
@@ -160,12 +166,12 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             and isinstance(valid[0], ast.ExprStmt)
             and isinstance(valid[0].expr, ast.String)
         ):
-            doc = valid[0].expr
-            self.convert_to_doc(doc)
+            self.convert_to_doc(valid[0].expr)
+            doc = valid[0]
             valid_body = ast.SubNodeList[ast.CodeBlockStmt](
-                items=valid[1:],
+                items=[doc] + valid[1:],
                 delim=Tok.WS,
-                kid=valid[1:],
+                kid=valid[1:] + [doc],
                 left_enc=self.operator(Tok.LBRACE, "{"),
                 right_enc=self.operator(Tok.RBRACE, "}"),
             )
@@ -213,7 +219,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             signature=sig,
             body=valid_body,
             decorators=valid_decorators,
-            doc=doc,
+            doc=None,
             kid=kid,
         )
         return ret
@@ -262,8 +268,8 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         )
         arch_type = ast.Token(
             file_path=self.mod_path,
-            name=Tok.KW_OBJECT,
-            value="obj",
+            name=Tok.KW_CLASS,
+            value="class",
             line=node.lineno,
             col_start=0,
             col_end=0,
@@ -309,7 +315,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         body = body[1:] if doc else body
         valid: list[ast.ArchBlockStmt] = (
             self.extract_with_entry(body, ast.ArchBlockStmt)
-            if not (isinstance(body[0], ast.Semi) and len(body) == 1)
+            if body and not (isinstance(body[0], ast.Semi) and len(body) == 1)
             else []
         )
         empty_block: Sequence[ast.AstNode] = [
@@ -491,8 +497,12 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             op: operator
             value: expr
         """
+        from jaclang.compiler import TOKEN_MAP
+
         target = self.convert(node.target)
         op = self.convert(node.op)
+        if isinstance(op, ast.Token):
+            op.name = self.aug_op_map(TOKEN_MAP, op)
         value = self.convert(node.value)
         if (
             isinstance(value, ast.Expr)
@@ -750,9 +760,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 condition=test,
                 body=body2,
                 else_body=else_body,
-                kid=(
-                    [test, body2, else_body] if else_body is not None else [test, body2]
-                ),
+                kid=([test, body2, else_body] if else_body else [test, body2]),
             )
         else:
             raise self.ice()
@@ -837,11 +845,11 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         if (isinstance(cause, ast.Expr) or cause is None) and (
             isinstance(exc, ast.Expr) or exc is None
         ):
-            if node.exc and not node.cause:
+            if exc and not node.cause:
                 return ast.RaiseStmt(
-                    cause=None,
+                    cause=exc,
                     from_target=None,
-                    kid=[self.operator(Tok.KW_RAISE, "raise")],
+                    kid=[self.operator(Tok.KW_RAISE, "raise"), exc],
                 )
             else:
                 return ast.RaiseStmt(cause=cause, from_target=exc, kid=kid)
@@ -856,12 +864,12 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             msg: expr | None
         """
         test = self.convert(node.test)
-        msg = self.convert(node.msg) if node.msg is not None else None
+        msg = self.convert(node.msg) if node.msg else None
         if isinstance(test, ast.Expr) and (isinstance(msg, ast.Expr) or msg is None):
             return ast.AssertStmt(
                 condition=test,
                 error_msg=msg,
-                kid=[test, msg] if msg is not None else [test],
+                kid=[test, msg] if msg else [test],
             )
         else:
             raise self.ice()
@@ -877,11 +885,31 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         ctx: expr_context
         """
         value = self.convert(node.value)
-
+        if (
+            isinstance(value, ast.FuncCall)
+            and isinstance(value.target, ast.Name)
+            and value.target.value == "super"
+        ):
+            tok = ast.Token(
+                file_path=self.mod_path,
+                name=Tok.KW_SUPER,
+                value="super",
+                line=node.lineno,
+                col_start=node.col_offset,
+                col_end=node.col_offset + len("super"),
+                pos_start=0,
+                pos_end=0,
+            )
+            value = ast.SpecialVarRef(var=tok, kid=[tok])
+            # exit()
         attribute = ast.Name(
             file_path=self.mod_path,
             name=Tok.NAME,
-            value=node.attr,
+            value=(
+                ("<>" + node.attr)
+                if node.attr == "init"
+                else "init" if node.attr == "__init__" else node.attr
+            ),
             line=node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.attr),
@@ -911,7 +939,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         else:
             raise self.ice()
 
-    def proc_bin_op(self, node: py_ast.BinOp) -> ast.BinaryExpr:
+    def proc_bin_op(self, node: py_ast.BinOp) -> ast.AtomUnit:
         """Process python node.
 
         class BinOp(expr):
@@ -929,12 +957,20 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             and isinstance(op, ast.Token)
             and isinstance(right, ast.Expr)
         ):
-            return ast.BinaryExpr(
+            value = ast.BinaryExpr(
                 left=left,
                 op=op,
                 right=right,
                 kid=[left, op, right],
             )
+            return ast.AtomUnit(
+                value=value,
+                kid=[
+                    self.operator(Tok.RPAREN, "("),
+                    value,
+                    self.operator(Tok.LPAREN, ")"),
+                ],
+            )
         else:
             raise self.ice()
 
@@ -1134,11 +1170,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             kvp = ast.KVPair(
                 key=key_pluck,
                 value=valid_values[i],
-                kid=(
-                    [key_pluck, valid_values[i]]
-                    if key_pluck is not None
-                    else [valid_values[i]]
-                ),
+                kid=([key_pluck, valid_values[i]] if key_pluck else [valid_values[i]]),
             )
             kvpair.append(kvp)
         return ast.DictVal(
@@ -1182,32 +1214,54 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name: _Identifier | None
             body: list[stmt]
         """
-        type = self.convert(node.type) if node.type is not None else None
-        if not type:
+        type = self.convert(node.type) if node.type else None
+        name: ast.Name | None = None
+        if not type and not node.name:
             type = ast.Name(
                 file_path=self.mod_path,
                 name=Tok.NAME,
-                value="Any",
+                value="Exception",
                 line=node.lineno,
                 col_start=node.col_offset,
-                col_end=node.col_offset + 3,
+                col_end=node.col_offset + 9,
                 pos_start=0,
                 pos_end=0,
             )
-        name = (
-            ast.Name(
+            name = ast.Name(
                 file_path=self.mod_path,
                 name=Tok.NAME,
-                value=node.name,
+                value="e",
                 line=node.lineno,
                 col_start=node.col_offset,
-                col_end=node.col_offset + len(node.name),
+                col_end=node.col_offset + 1,
                 pos_start=0,
                 pos_end=0,
             )
-            if node.name is not None
-            else None
-        )
+        else:
+            # type = ast.Name(
+            #     file_path=self.mod_path,
+            #     name=Tok.NAME,
+            #     value=no,
+            #     line=node.lineno,
+            #     col_start=node.col_offset,
+            #     col_end=node.col_offset + 9,
+            #     pos_start=0,
+            #     pos_end=0,
+            # )
+            name = (
+                ast.Name(
+                    file_path=self.mod_path,
+                    name=Tok.NAME,
+                    value=node.name,
+                    line=node.lineno,
+                    col_start=node.col_offset,
+                    col_end=node.col_offset + len(node.name),
+                    pos_start=0,
+                    pos_end=0,
+                )
+                if node.name
+                else None
+            )
 
         body = [self.convert(i) for i in node.body]
         valid = [i for i in body if isinstance(i, (ast.CodeBlockStmt))]
@@ -1220,12 +1274,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             left_enc=self.operator(Tok.LBRACE, "{"),
             right_enc=self.operator(Tok.RBRACE, "}"),
         )
-        kid = []
-        if type:
-            kid.append(type)
-        if name:
-            kid.append(name)
-        kid.append(valid_body)
+        kid = [item for item in [type, name, valid_body] if item]
         if isinstance(type, ast.Expr) and (isinstance(name, ast.Name) or not name):
             return ast.Except(
                 ex_type=type,
@@ -1372,12 +1421,13 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             pos_end=0,
         )
         pytag = ast.SubTag[ast.Name](tag=lang, kid=[lang])
+        items = ast.SubNodeList[ast.ModulePath](items=paths, delim=Tok.COMMA, kid=paths)
         ret = ast.Import(
             hint=pytag,
-            paths=paths,
-            items=None,
+            from_loc=None,
+            items=items,
             is_absorb=False,
-            kid=[pytag, *paths],
+            kid=[pytag, items],
         )
         return ret
 
@@ -1431,7 +1481,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 valid_names.append(
                     ast.ModuleItem(
                         name=name.expr,
-                        alias=name.alias if name.alias is not None else None,
+                        alias=name.alias if name.alias else None,
                         kid=[i for i in name.kid if i],
                     )
                 )
@@ -1447,9 +1497,21 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         if not items:
             raise self.ice("No valid names in import from")
         pytag = ast.SubTag[ast.Name](tag=lang, kid=[lang])
+        if len(node.names) == 1 and node.names[0].name == "*":
+            path_in = ast.SubNodeList[ast.ModulePath](
+                items=[path], delim=Tok.COMMA, kid=[path]
+            )
+            ret = ast.Import(
+                hint=pytag,
+                from_loc=None,
+                items=path_in,
+                is_absorb=True,
+                kid=[pytag, path_in],
+            )
+            return ret
         ret = ast.Import(
             hint=pytag,
-            paths=[path],
+            from_loc=path,
             items=items,
             is_absorb=False,
             kid=[pytag, path, items],
@@ -1634,7 +1696,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             kid.append(kw_patterns)
         else:
             kw_patterns = None
-        if isinstance(cls, ast.NameSpec):
+        if isinstance(cls, (ast.NameSpec, ast.AtomTrailer)):
             return ast.MatchArch(
                 name=cls, arg_patterns=patterns_sub, kw_patterns=kw_patterns, kid=kid
             )
@@ -1732,10 +1794,10 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         name = ast.Name(
             file_path=self.mod_path,
             name=Tok.NAME,
-            value=node.name if node.name is not None else "_",
+            value=node.name if node.name else "_",
             line=node.lineno,
             col_start=node.col_offset,
-            col_end=node.col_offset + len(node.name if node.name is not None else "_"),
+            col_end=node.col_offset + len(node.name if node.name else "_"),
             pos_start=0,
             pos_end=0,
         )
@@ -1765,7 +1827,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         ret = ast.Name(
             file_path=self.mod_path,
             name=Tok.NAME,
-            value=node.id,
+            value=node.id if node.id != "root" else "root_",  # reserved word
             line=node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.id),
@@ -1987,6 +2049,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 left_enc=self.operator(Tok.LBRACE, "{"),
                 right_enc=self.operator(Tok.RBRACE, "}"),
             )
+            elsestmt = ast.ElseStmt(body=else_body, kid=[else_body])
             kid.append(else_body)
         else:
             else_body = None
@@ -2005,23 +2068,19 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 left_enc=self.operator(Tok.LBRACE, "{"),
                 right_enc=self.operator(Tok.RBRACE, "}"),
             )
-            kid.append(finally_body)
+            finally_stmt = ast.FinallyStmt(body=finally_body, kid=[finally_body])
+
+            kid.append(finally_stmt)
         else:
             finally_body = None
-
-        return ast.TryStmt(
+        ret = ast.TryStmt(
             body=valid_body,
             excepts=excepts,
-            else_body=(
-                ast.ElseStmt(body=else_body, kid=[else_body]) if else_body else None
-            ),
-            finally_body=(
-                ast.FinallyStmt(body=finally_body, kid=[finally_body])
-                if finally_body
-                else None
-            ),
+            else_body=elsestmt if else_body else None,
+            finally_body=finally_stmt if finally_body else None,
             kid=kid,
         )
+        return ret
 
     def proc_try_star(self, node: py_ast.TryStar) -> ast.TryStmt:
         """Process python node.
@@ -2122,7 +2181,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         name = ast.Name(
             file_path=self.mod_path,
             name=Tok.NAME,
-            value=node.arg,
+            value=node.arg if node.arg != "root" else "root_",  # reserved word
             line=node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.arg),
@@ -2201,9 +2260,12 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 pos_end=0,
             )
             kwarg.add_kids_left([kwarg.unpack])
-        defaults = [self.convert(expr) for expr in node.defaults if type(expr) is None]
-
+        defaults = [self.convert(expr) for expr in node.defaults]
         params = [*args]
+        for param, default in zip(params[::-1], defaults[::-1]):
+            if isinstance(default, ast.Expr) and isinstance(param, ast.ParamVar):
+                param.value = default
+                param.add_kids_right([default])
         if vararg:
             params.append(vararg)
         params += kwonlyargs
@@ -2212,8 +2274,6 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         params += defaults
 
         valid_params = [param for param in params if isinstance(param, ast.ParamVar)]
-        if len(valid_params) != len(params):
-            raise self.ice("Length mismatch in arguments")
         if valid_params:
             fs_params = ast.SubNodeList[ast.ParamVar](
                 items=valid_params, delim=Tok.COMMA, kid=valid_params
@@ -2401,10 +2461,10 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         arg = ast.Name(
             file_path=self.mod_path,
             name=Tok.NAME,
-            value=node.arg if node.arg is not None else "_",
+            value=node.arg if node.arg else "_",
             line=node.lineno,
             col_start=node.col_offset,
-            col_end=node.col_offset + len(node.arg if node.arg is not None else "_"),
+            col_end=node.col_offset + len(node.arg if node.arg else "_"),
             pos_start=0,
             pos_end=0,
         )
@@ -2423,7 +2483,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             body: list[stmt]
         """
         pattern = self.convert(node.pattern)
-        guard = self.convert(node.guard) if node.guard is not None else None
+        guard = self.convert(node.guard) if node.guard else None
         body = [self.convert(i) for i in node.body]
         valid = [i for i in body if isinstance(i, ast.CodeBlockStmt)]
         if isinstance(pattern, ast.MatchPattern) and (
@@ -2433,9 +2493,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 pattern=pattern,
                 guard=guard,
                 body=valid,
-                kid=(
-                    [pattern, guard, *valid] if guard is not None else [pattern, *valid]
-                ),
+                kid=([pattern, guard, *valid] if guard else [pattern, *valid]),
             )
         else:
             raise self.ice()
@@ -2448,9 +2506,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             optional_vars: expr | None
         """
         context_expr = self.convert(node.context_expr)
-        optional_vars = (
-            self.convert(node.optional_vars) if node.optional_vars is not None else None
-        )
+        optional_vars = self.convert(node.optional_vars) if node.optional_vars else None
         if isinstance(context_expr, ast.Expr) and (
             isinstance(optional_vars, ast.Expr) or optional_vars is None
         ):
@@ -2477,3 +2533,11 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
     def convert_to_doc(self, string: ast.String) -> None:
         """Convert a string to a docstring."""
         string.value = f'""{string.value}""'
+
+    def aug_op_map(self, tok_dict: dict, op: ast.Token) -> str:
+        """aug_mapper."""
+        op.value += "="
+        for _key, value in tok_dict.items():
+            if value == op.value:
+                break
+        return _key

jaclang/compiler/passes/main/pyout_pass.py

@@ -5,7 +5,6 @@ also creates bytecode files from the Python code, and manages the caching of
 relevant files.
 """
 
-import ast as ast3
 import os
 
 
@@ -43,18 +42,17 @@ class PyOutPass(Pass):
                 out_path_pyc
             ) > os.path.getmtime(mod_path):
                 continue
-            self.gen_python(mod, out_path=out_path_py)
-            self.dump_bytecode(mod, mod_path=mod_path, out_path=out_path_pyc)
+            try:
+                self.gen_python(mod, out_path=out_path_py)
+                self.dump_bytecode(mod, mod_path=mod_path, out_path=out_path_pyc)
+            except Exception as e:
+                self.warning(f"Error in generating Python code: {e}", node)
         self.terminate()
 
     def gen_python(self, node: ast.Module, out_path: str) -> None:
         """Generate Python."""
-        try:
-            with open(out_path, "w") as f:
-                f.write(node.gen.py)
-        except Exception as e:
-            print(ast3.dump(node.gen.py_ast[0], indent=2))
-            raise e
+        with open(out_path, "w") as f:
+            f.write(node.gen.py)
 
     def dump_bytecode(self, node: ast.Module, mod_path: str, out_path: str) -> None:
         """Generate Python."""
@@ -70,14 +68,17 @@ class PyOutPass(Pass):
         """Get output targets."""
         base_path, file_name = os.path.split(node.loc.mod_path)
         gen_path = os.path.join(base_path, Con.JAC_GEN_DIR)
-        os.makedirs(gen_path, exist_ok=True)
-        with open(os.path.join(gen_path, "__init__.py"), "w"):
-            pass
         mod_dir, file_name = os.path.split(node.loc.mod_path)
         mod_dir = mod_dir.replace(base_path, "").lstrip(os.sep)
         base_name, _ = os.path.splitext(file_name)
         out_dir = os.path.join(gen_path, mod_dir)
-        os.makedirs(out_dir, exist_ok=True)
+        try:
+            os.makedirs(gen_path, exist_ok=True)
+            with open(os.path.join(gen_path, "__init__.py"), "w"):
+                pass
+            os.makedirs(out_dir, exist_ok=True)
+        except Exception as e:
+            self.warning(f"Can't create directory {out_dir}: {e}", node)
         out_path_py = os.path.join(out_dir, f"{base_name}.py")
         out_path_pyc = os.path.join(out_dir, f"{base_name}.jbc")
         return node.loc.mod_path, out_path_py, out_path_pyc

jaclang/compiler/passes/main/registry_pass.py

@@ -32,9 +32,14 @@ class RegistryPass(Pass):
         module_dir = os.path.join(
             os.path.abspath(os.path.dirname(node.source.file_path)), Con.JAC_GEN_DIR
         )
-        os.makedirs(module_dir, exist_ok=True)
-        with open(os.path.join(module_dir, f"{module_name}.registry.pkl"), "wb") as f:
-            pickle.dump(node.registry, f)
+        try:
+            os.makedirs(module_dir, exist_ok=True)
+            with open(
+                os.path.join(module_dir, f"{module_name}.registry.pkl"), "wb"
+            ) as f:
+                pickle.dump(node.registry, f)
+        except Exception as e:
+            self.warning(f"Can't save registry for {module_name}: {e}")
         self.modules_visited.pop()
 
     def exit_architype(self, node: ast.Architype) -> None:

jaclang/compiler/passes/main/schedules.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 
 from .sub_node_tab_pass import SubNodeTabPass  # noqa: I100
-from .import_pass import ImportPass  # noqa: I100
+from .import_pass import JacImportPass, PyImportPass  # noqa: I100
 from .sym_tab_build_pass import SymTabBuildPass  # noqa: I100
 from .def_impl_match_pass import DeclDefMatchPass  # noqa: I100
 from .def_use_pass import DefUsePass  # noqa: I100
@@ -17,10 +17,12 @@ from .pyast_gen_pass import PyastGenPass  # noqa: I100
 from .type_check_pass import JacTypeCheckPass  # noqa: I100
 from .fuse_typeinfo_pass import FuseTypeInfoPass  # noqa: I100
 from .registry_pass import RegistryPass  # noqa: I100
+from .access_modifier_pass import AccessCheckPass  # noqa: I100
 
 py_code_gen = [
     SubNodeTabPass,
-    ImportPass,
+    JacImportPass,
+    PyImportPass,
     SymTabBuildPass,
     DeclDefMatchPass,
     DefUsePass,
@@ -29,5 +31,5 @@ py_code_gen = [
     PyBytecodeGenPass,
 ]
 
-py_code_gen_typed = [*py_code_gen, JacTypeCheckPass, FuseTypeInfoPass]
+py_code_gen_typed = [*py_code_gen, JacTypeCheckPass, FuseTypeInfoPass, AccessCheckPass]
 py_compiler = [*py_code_gen, PyOutPass]