Merge pull request 'Avoid raising exceptions, report diagnostics instead' (#42) from fix/remove-raises into main

Reviewed-on: #42

LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 Louis Heredero
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,5 +1,9 @@
 <h1>Midas</h1>
 
+<p align="center">
+<img src="assets/icon.svg" width="64">
+</p>
+
 <img src="https://git.kb28.ch/HEL/midas/actions/workflows/tests.yaml/badge.svg">
 
 *Midas* is a type system to _Maintain Integrity of Data with Annotated Structures_. In Greek mythology, [Midas](https://en.wikipedia.org/wiki/Midas) was a Phrygian king who was blessed with the gift of turning everything he touched into gold.
@@ -24,6 +28,8 @@ This framework is being developed as part of a Bachelor's Thesis by Louis Herede
   - [Showing Type Judgements](#showing-type-judgements)
   - [Validating Definitions](#validating-definitions)
 - [Tests](#tests)
+- [Contributing](#contributing)
+- [License](#license)
 </details>
 
 
@@ -163,3 +169,16 @@ Not specifying any subcommand is equivalent to running `run -a`
 - Run specific tests: `run tests/cases/test1.py tests/cases/test2.py ...`
 - Update all tests: `update -a`
 - Update specific tests: `update tests/cases/test1.py tests/cases/test2.py ...`
+
+## Contributing
+
+Feel free to [open an issue](https://git.kb28.ch/HEL/midas/issues) to report a bug or if you experience any issues with Midas.
+
+Contributions are also welcome so feel free to [open a pull request](https://git.kb28.ch/HEL/midas/pulls).
+
+> [!NOTE]
+> As this is part of my bachelor project, I will not accept any contributions before my defense
+
+## License
+
+Midas is distributed under the terms of the Apache-2.0 license. See [LICENSE](LICENSE) for details.

midas/checker/frames/column_groupby_methods.py

@@ -86,6 +86,9 @@ class ColumnGroupByMethodRegistry(MethodRegistry[Call]):
 
         # TODO: maybe better to filter arguments and pass some, in case the
         # return type depends on them
+
+        # Don't catch UndefinedMethodException because all aggregation
+        # methods should be defined on columns too
         returns: Type = self.typer.call_method(
             location=call.location,
             call_expr=call.call_expr,

midas/checker/frames/frame_groupby_methods.py

@@ -53,6 +53,8 @@ class FrameGroupByMethodRegistry(MethodRegistry[Call]):
         for column in call.groupby.frame.columns:
             with self.reporter.with_context(f"in column '{column.name}'"):
                 column_groupby: ColumnGroupBy = ColumnGroupBy(column=column.type)
+                # Don't catch UndefinedMethodException because all aggregation
+                # methods should be defined on columns too
                 result_type: Type = self.typer.call_method(
                     location=call.location,
                     call_expr=call.call_expr,

midas/checker/midas.py

@@ -170,7 +170,10 @@ class MidasTyper(m.Stmt.Visitor[None], m.Expr.Visitor[Type], m.Type.Visitor[Type
             type = GenericType(name=name, params=params, body=type)
         else:
             type = DerivedType(name=name, type=type)
-        self.types.define_type(name, type)
+        try:
+            self.types.define_type(name, type)
+        except ValueError:
+            self.reporter.error(stmt.location, f"Type {name} already defined")
         self._local_variables.clear()
         self._current_name = None
 
@@ -178,7 +181,10 @@ class MidasTyper(m.Stmt.Visitor[None], m.Expr.Visitor[Type], m.Type.Visitor[Type
         name: str = stmt.name.lexeme
         self._current_name = name
         type: Type = stmt.type.accept(self)
-        self.types.define_type(name, type)
+        try:
+            self.types.define_type(name, type)
+        except ValueError:
+            self.reporter.error(stmt.location, f"Type {name} already defined")
         self._current_name = None
 
     def visit_member_stmt(self, stmt: m.MemberStmt) -> None: ...
@@ -201,6 +207,7 @@ class MidasTyper(m.Stmt.Visitor[None], m.Expr.Visitor[Type], m.Type.Visitor[Type
             )
 
     def visit_predicate_stmt(self, stmt: m.PredicateStmt) -> None:
+        name: str = stmt.name.lexeme
         for spec in stmt.params:
             for param in spec.mixed:
                 assert param.name is not None
@@ -222,14 +229,17 @@ class MidasTyper(m.Stmt.Visitor[None], m.Expr.Visitor[Type], m.Type.Visitor[Type
                     returns=type,
                 )
         self._predicate_params = {}
-        self.types.define_predicate(
-            stmt.name.lexeme,
-            Predicate(
-                type=type,
-                body=stmt.body,
-                alias=len(params) == 0,
-            ),
-        )
+        try:
+            self.types.define_predicate(
+                name,
+                Predicate(
+                    type=type,
+                    body=stmt.body,
+                    alias=len(params) == 0,
+                ),
+            )
+        except ValueError:
+            self.reporter.error(stmt.location, f"Predicate {name} already defined")
 
     def _is_valid_predicate(self, body: Type) -> bool:
         """Check whether the given type is valid as a predicate's body

midas/checker/python.py

@@ -48,7 +48,9 @@ TypedExpr = tuple[p.Expr, Type]
 
 
 class ReturnException(Exception):
-    pass
+    def __init__(self, stmt: p.Stmt):
+        super().__init__()
+        self.stmt: p.Stmt = stmt
 
 
 class UndefinedMethodException(Exception):
@@ -116,7 +118,10 @@ class PythonTyper(
         self.judgements = []
         self.evaluated_casts = []
 
-        self.check(stmts)
+        try:
+            self.check(stmts)
+        except ReturnException as e:
+            self.reporter.error(e.stmt.location, "Return statement outside of function")
 
         return TypedAST(
             stmts=stmts,
@@ -576,7 +581,7 @@ class PythonTyper(
     def visit_return_stmt(self, stmt: p.ReturnStmt) -> None:
         type: Type = self.type_of(stmt.value) if stmt.value is not None else UnitType()
         self.env.return_types.append(type)
-        raise ReturnException()
+        raise ReturnException(stmt)
 
     def visit_if_stmt(self, stmt: p.IfStmt) -> None:
         # Not evaluated in sub-environment because assignments in the test leak out of the if
@@ -599,7 +604,7 @@ class PythonTyper(
         else_returned: bool = self.process_block(stmt.orelse, env)
         self.env.return_types.extend(env.return_types)
         if body_returned and else_returned:
-            raise ReturnException()
+            raise ReturnException(stmt)
 
     def visit_pass(self, stmt: p.Pass) -> None:
         pass
@@ -627,7 +632,7 @@ class PythonTyper(
         self.env = outer_env
 
         if body_returned:
-            raise ReturnException()
+            raise ReturnException(stmt)
 
     def visit_import_stmt(self, stmt: p.ImportStmt) -> None:
         self._visit_imports(stmt.location, stmt.imports)
@@ -772,14 +777,21 @@ class PythonTyper(
         match expr.callee:
             case p.GetExpr(object=obj, name=method):
                 obj_type: Type = self.type_of(obj)
-                return self.call_method(
-                    location=expr.location,
-                    call_expr=expr,
-                    obj=(obj, obj_type),
-                    method_name=method,
-                    positional=positional,
-                    keywords=keywords,
-                )
+                try:
+                    return self.call_method(
+                        location=expr.location,
+                        call_expr=expr,
+                        obj=(obj, obj_type),
+                        method_name=method,
+                        positional=positional,
+                        keywords=keywords,
+                    )
+                except UndefinedMethodException:
+                    self.reporter.error(
+                        expr.location,
+                        f"Unknown method {method} on type {obj_type}",
+                    )
+                    return UnknownType()
 
         callee: Type = self.type_of(expr.callee)
         result: CallResult = self.dispatcher.get_result(
@@ -1001,7 +1013,11 @@ class PythonTyper(
 
         if len(node.args) != 0:
             args: list[Type] = [self.resolve_type_expr(arg) for arg in node.args]
-            return self.types.apply_generic(base, args)
+            try:
+                return self.types.apply_generic(base, args)
+            except Exception as e:
+                self.reporter.error(node.location, f"Cannot apply generic type: {e}")
+                return UnknownType()
         return base
 
     def visit_frame_column(self, node: p.FrameColumn) -> ColumnType:
@@ -1078,10 +1094,13 @@ class PythonTyper(
                 bound: Optional[Type] = None
                 variance: Variance = Variance.INVARIANT
                 if "bound" in call.keywords:
-                    bound_type: p.MidasType = self._parse_type_from_expr(
-                        call.keywords["bound"]
-                    )
-                    bound = self.resolve_type_expr(bound_type)
+                    try:
+                        bound_type: p.MidasType = self._parse_type_from_expr(
+                            call.keywords["bound"]
+                        )
+                        bound = self.resolve_type_expr(bound_type)
+                    except NotImplementedError:
+                        bound = UnknownType()
 
                 if is_kw_true("covariant"):
                     variance = Variance.COVARIANT
@@ -1096,7 +1115,13 @@ class PythonTyper(
                     else:
                         variance = Variance.CONTRAVARIANT
                 var: TypeVar = TypeVar(name=name, bound=bound, variance=variance)
-                self.types.define_type(name, var)
+                try:
+                    self.types.define_type(name, var)
+                except ValueError:
+                    self.reporter.error(
+                        call.location,
+                        f"A type or type variable with the name {name} is already defined",
+                    )
                 return var
 
             case _:
@@ -1127,6 +1152,14 @@ class PythonTyper(
                 return parser._parse_type(node.body)
             case p.VariableExpr(name=name):
                 return p.BaseType(location=location, base=name, args=())
+            case p.SubscriptExpr(object=p.VariableExpr(name=name), index=arg):
+                args: tuple[p.MidasType, ...] = (
+                    tuple(self._parse_type_from_expr(a) for a in arg.items)
+                    if isinstance(arg, p.TupleExpr)
+                    else (self._parse_type_from_expr(arg),)
+                )
+                return p.BaseType(location=location, base=name, args=args)
+
             case _:
                 raise NotImplementedError
 

midas/checker/types.py

@@ -362,9 +362,6 @@ def substitute_typevars(type: Type, substitutions: dict[str, Type]) -> Type:
         case UnknownType() | UnitType():
             return type
 
-        case TopType() | GenericType():
-            raise NotImplementedError(f"Unsupported type {type}")
-
         # Ensure exhaustiveness
         case _:
             assert_never(type)