2 Commits

Author SHA1 Message Date
9a7c1e24f1 chore: add icon to README
All checks were successful
Tests / tests (pull_request) Successful in 6s
2026-07-10 00:37:03 +02:00
348352ab8c chore: add Contributing and License to README 2026-07-10 00:32:45 +02:00
5 changed files with 32 additions and 77 deletions

View File

@@ -86,9 +86,6 @@ 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,

View File

@@ -53,8 +53,6 @@ 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,

View File

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

View File

@@ -48,9 +48,7 @@ TypedExpr = tuple[p.Expr, Type]
class ReturnException(Exception):
def __init__(self, stmt: p.Stmt):
super().__init__()
self.stmt: p.Stmt = stmt
pass
class UndefinedMethodException(Exception):
@@ -118,10 +116,7 @@ class PythonTyper(
self.judgements = []
self.evaluated_casts = []
try:
self.check(stmts)
except ReturnException as e:
self.reporter.error(e.stmt.location, "Return statement outside of function")
self.check(stmts)
return TypedAST(
stmts=stmts,
@@ -581,7 +576,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(stmt)
raise ReturnException()
def visit_if_stmt(self, stmt: p.IfStmt) -> None:
# Not evaluated in sub-environment because assignments in the test leak out of the if
@@ -604,7 +599,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(stmt)
raise ReturnException()
def visit_pass(self, stmt: p.Pass) -> None:
pass
@@ -632,7 +627,7 @@ class PythonTyper(
self.env = outer_env
if body_returned:
raise ReturnException(stmt)
raise ReturnException()
def visit_import_stmt(self, stmt: p.ImportStmt) -> None:
self._visit_imports(stmt.location, stmt.imports)
@@ -777,21 +772,14 @@ class PythonTyper(
match expr.callee:
case p.GetExpr(object=obj, name=method):
obj_type: Type = self.type_of(obj)
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()
return self.call_method(
location=expr.location,
call_expr=expr,
obj=(obj, obj_type),
method_name=method,
positional=positional,
keywords=keywords,
)
callee: Type = self.type_of(expr.callee)
result: CallResult = self.dispatcher.get_result(
@@ -1013,11 +1001,7 @@ class PythonTyper(
if len(node.args) != 0:
args: list[Type] = [self.resolve_type_expr(arg) for arg in node.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 self.types.apply_generic(base, args)
return base
def visit_frame_column(self, node: p.FrameColumn) -> ColumnType:
@@ -1094,13 +1078,10 @@ class PythonTyper(
bound: Optional[Type] = None
variance: Variance = Variance.INVARIANT
if "bound" in call.keywords:
try:
bound_type: p.MidasType = self._parse_type_from_expr(
call.keywords["bound"]
)
bound = self.resolve_type_expr(bound_type)
except NotImplementedError:
bound = UnknownType()
bound_type: p.MidasType = self._parse_type_from_expr(
call.keywords["bound"]
)
bound = self.resolve_type_expr(bound_type)
if is_kw_true("covariant"):
variance = Variance.COVARIANT
@@ -1115,13 +1096,7 @@ class PythonTyper(
else:
variance = Variance.CONTRAVARIANT
var: TypeVar = TypeVar(name=name, bound=bound, variance=variance)
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",
)
self.types.define_type(name, var)
return var
case _:
@@ -1152,14 +1127,6 @@ 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

View File

@@ -362,6 +362,9 @@ 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)