jaclang 0.7.23__py3-none-any.whl → 0.7.25__py3-none-any.whl

jaclang/compiler/codeloc.py

@@ -9,7 +9,7 @@ from typing import Optional, TYPE_CHECKING
 from jaclang.vendor.mypy.nodes import Node as MypyNode
 
 if TYPE_CHECKING:
-    from jaclang.compiler.absyntree import Token
+    from jaclang.compiler.absyntree import JacSource, Token
 
 
 @dataclass
@@ -42,10 +42,15 @@ class CodeLocInfo:
         self.first_tok = first_tok
         self.last_tok = last_tok
 
+    @property
+    def orig_src(self) -> JacSource:
+        """Get file source."""
+        return self.first_tok.orig_src
+
     @property
     def mod_path(self) -> str:
         """Get line number."""
-        return self.first_tok.file_path
+        return self.first_tok.orig_src.file_path
 
     @property
     def first_line(self) -> int:

jaclang/compiler/compile.py

@@ -16,11 +16,13 @@ def compile_jac(file_path: str, cache_result: bool = False) -> Pass:
         file_path=file_path,
         schedule=pass_schedule,
     )
-    if cache_result and isinstance(code.ir, ast.Module):
+    # If there is syntax error, the code will be an instance of JacParser as there is
+    # no more passes were processed, in that case we can ignore it.
+    had_syntax_error = isinstance(code, JacParser) and len(code.errors_had) != 0
+    if cache_result and (not had_syntax_error) and isinstance(code.ir, ast.Module):
         print_pass = PyOutPass(input_ir=code.ir, prior=code)
         return print_pass
-    else:
-        return code
+    return code
 
 
 def jac_file_to_pass(
@@ -49,6 +51,11 @@ def jac_str_to_pass(
         target = schedule[-1] if schedule else None
     source = ast.JacSource(jac_str, mod_path=file_path)
     ast_ret: Pass = JacParser(input_ir=source)
+
+    # If there is syntax error, no point in processing in further passes.
+    if len(ast_ret.errors_had) != 0:
+        return ast_ret
+
     for i in schedule:
         if i == target:
             break

jaclang/compiler/parser.py

@@ -43,14 +43,22 @@ class JacParser(Pass):
                 raise self.ice()
         except jl.UnexpectedInput as e:
             catch_error = ast.EmptyToken()
-            catch_error.file_path = self.mod_path
+            catch_error.orig_src = self.source
             catch_error.line_no = e.line
             catch_error.end_line = e.line
             catch_error.c_start = e.column
             catch_error.c_end = e.column + 1
-            self.error(f"Syntax Error: {e}", node_override=catch_error)
+            catch_error.pos_start = e.pos_in_stream or 0
+            catch_error.pos_end = catch_error.pos_start + 1
+
+            error_msg = "Syntax Error"
+            if len(e.args) >= 1 and isinstance(e.args[0], str):
+                error_msg += e.args[0]
+            self.error(error_msg, node_override=catch_error)
+
         except Exception as e:
             self.error(f"Internal Error: {e}")
+
         return ast.Module(
             name="",
             source=self.source,
@@ -65,7 +73,7 @@ class JacParser(Pass):
     def proc_comment(token: jl.Token, mod: ast.AstNode) -> ast.CommentToken:
         """Process comment."""
         return ast.CommentToken(
-            file_path=mod.loc.mod_path,
+            orig_src=mod.loc.orig_src,
             name=token.type,
             value=token.value,
             line=token.line if token.line is not None else 0,
@@ -166,7 +174,7 @@ class JacParser(Pass):
                 kid=(
                     kid
                     if len(kid)
-                    else [ast.EmptyToken(file_path=self.parse_ref.mod_path)]
+                    else [ast.EmptyToken(ast.JacSource("", self.parse_ref.mod_path))]
                 ),
             )
             return self.nu(mod)
@@ -706,10 +714,12 @@ class JacParser(Pass):
                     | NAME (COLON STRING)?
                     | py_code_block
                     | free_code
+                    | abstract_ability
+                    | ability
             """
-            if isinstance(kid[0], ast.PyInlineCode):
+            if isinstance(kid[0], (ast.PyInlineCode, ast.Ability)):
                 return self.nu(kid[0])
-            if isinstance(kid[0], (ast.Name)):
+            elif isinstance(kid[0], (ast.Name)):
                 if (
                     len(kid) >= 3
                     and isinstance(kid[-1], ast.Expr)
@@ -1010,7 +1020,11 @@ class JacParser(Pass):
                         kid=(
                             kid
                             if len(kid)
-                            else [ast.EmptyToken(file_path=self.parse_ref.mod_path)]
+                            else [
+                                ast.EmptyToken(
+                                    ast.JacSource("", self.parse_ref.mod_path)
+                                )
+                            ]
                         ),
                     )
                 )
@@ -1228,7 +1242,7 @@ class JacParser(Pass):
                 return self.nu(
                     ast.BuiltinType(
                         name=kid[0].name,
-                        file_path=self.parse_ref.mod_path,
+                        orig_src=self.parse_ref.source,
                         value=kid[0].value,
                         line=kid[0].loc.first_line,
                         end_line=kid[0].loc.last_line,
@@ -2786,25 +2800,14 @@ class JacParser(Pass):
         def name_list(self, kid: list[ast.AstNode]) -> ast.SubNodeList[ast.Name]:
             """Grammar rule.
 
-            name_list: (name_list COMMA)? NAME
+            name_list: (named_ref COMMA)* named_ref
             """
-            consume = None
-            name = None
-            comma = None
-            if isinstance(kid[0], ast.SubNodeList):
-                consume = kid[0]
-                comma = kid[1]
-                name = kid[2]
-                new_kid = [*consume.kid, comma, name]
-            else:
-                name = kid[0]
-                new_kid = [name]
-            valid_kid = [i for i in new_kid if isinstance(i, ast.Name)]
+            valid_kid = [i for i in kid if isinstance(i, ast.Name)]
             return self.nu(
                 ast.SubNodeList[ast.Name](
                     items=valid_kid,
                     delim=Tok.COMMA,
-                    kid=new_kid,
+                    kid=kid,
                 )
             )
 
@@ -3996,7 +3999,7 @@ class JacParser(Pass):
             elif token.type == Tok.PYNLINE and isinstance(token.value, str):
                 token.value = token.value.replace("::py::", "")
             ret = ret_type(
-                file_path=self.parse_ref.mod_path,
+                orig_src=self.parse_ref.source,
                 name=token.type,
                 value=token.value[2:] if token.type == Tok.KWESC_NAME else token.value,
                 line=token.line if token.line is not None else 0,

jaclang/compiler/passes/ir_pass.py

@@ -140,11 +140,11 @@ class Pass(Transform[T]):
 
     def error(self, msg: str, node_override: Optional[ast.AstNode] = None) -> None:
         """Pass Error."""
-        self.log_error(f"{msg}", node_override=node_override)
+        self.log_error(msg, node_override=node_override)
 
     def warning(self, msg: str, node_override: Optional[ast.AstNode] = None) -> None:
         """Pass Error."""
-        self.log_warning(f"{msg}", node_override=node_override)
+        self.log_warning(msg, node_override=node_override)
 
     def ice(self, msg: str = "Something went horribly wrong!") -> RuntimeError:
         """Pass Error."""

jaclang/compiler/passes/main/def_impl_match_pass.py

@@ -90,6 +90,10 @@ class DeclImplMatchPass(Pass):
                     raise self.ice(
                         f"Expected AstImplNeedingNode, got {valid_decl.__class__.__name__}. Not possible."
                     )
+
+                # Ensure if it's an ability def impl, the parameters are matched.
+                self.validate_params_match(sym, decl_node.name_of)
+
                 valid_decl.body = sym.decl.name_of
                 sym.decl.name_of.decl_link = valid_decl
                 for idx, a in enumerate(sym.decl.name_of.target.archs):
@@ -97,5 +101,47 @@ class DeclImplMatchPass(Pass):
                     a.name_spec.sym = name_of_links[idx].sym
                 sym.decl.name_of.sym_tab.tab.update(valid_decl.sym_tab.tab)
                 valid_decl.sym_tab.tab = sym.decl.name_of.sym_tab.tab
+
         for i in sym_tab.kid:
             self.connect_def_impl(i)
+
+    def validate_params_match(self, sym: Symbol, valid_decl: ast.AstSymbolNode) -> None:
+        """Validate if the parameters match."""
+        if (
+            isinstance(valid_decl, ast.Ability)
+            and isinstance(sym.decl.name_of, ast.AbilityDef)
+            and isinstance(valid_decl.signature, ast.FuncSignature)
+            and isinstance(sym.decl.name_of.signature, ast.FuncSignature)
+        ):
+
+            params_decl = valid_decl.signature.params
+            params_defn = sym.decl.name_of.signature.params
+
+            if params_decl and params_defn:
+                # Check if the parameter count is matched.
+                if len(params_defn.items) != len(params_decl.items):
+                    self.error(
+                        f"Parameter count mismatch for ability {sym.sym_name}.",
+                        sym.decl.name_of.name_spec,
+                    )
+                    self.error(
+                        f"From the declaration of {valid_decl.name_spec.sym_name}.",
+                        valid_decl.name_spec,
+                    )
+                else:
+                    for idx in range(len(params_defn.items)):
+                        # Check if all the parameter names are matched.
+                        # TODO: This shouldn't be an issue however if the names are not matched, it doesn't
+                        # work as expected like in C++, for now I'm adding this validation, however this
+                        # needs to be fixed to have a C++ style.
+                        param_name_decl = params_decl.items[idx].name.value
+                        param_name_defn = params_defn.items[idx].name.value
+                        if param_name_defn != param_name_decl:
+                            self.error(
+                                f"Parameter name mismatch for ability {sym.sym_name}.",
+                                params_defn.items[idx].name,
+                            )
+                            self.error(
+                                f"From the declaration of {valid_decl.name_spec.sym_name}.",
+                                params_decl.items[idx].name,
+                            )