Skip to content

Allow DummyUnifier to abort #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martin-ilgner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow DummyUnifier to abort #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions effekt/shared/src/main/scala/effekt/typer/CapabilityScope.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,13 @@ object DummyUnifier extends TypeUnifier {
override def requireEqual(x: symbols.UnificationVar, tpe: symbols.ValueType, ctx: ErrorContext): Unit = ()
override def requireSubregion(lower: symbols.Captures, upper: symbols.Captures, ctx: ErrorContext): Unit = ()


// NOTE(jiribenes, 2025-11-12): I think the 'abort' should never be triggered here.
override def abort(msg: String, ctx: ErrorContext): Nothing = sys error "Unexpected abort in DummyUnifier!"
override def abort(msg: String, ctx: ErrorContext): Nothing = throw UnificationFailed

override def error(msg: String, ctx: ErrorContext): Unit = throw UnificationFailed
override def error(left: symbols.Type, right: symbols.Type, ctx: ErrorContext): Unit = throw UnificationFailed
}

class BindSome(binder: source.Tree, capabilities: Map[symbols.InterfaceType, symbols.BlockParam],val parent: CapabilityScope) extends CapabilityScope {
class BindSome(binder: source.Tree, capabilities: Map[symbols.InterfaceType, symbols.BlockParam], val parent: CapabilityScope) extends CapabilityScope {
def copy: CapabilityScope = BindSome(binder, capabilities, parent.copy)
def capabilityFor(tpe: symbols.InterfaceType)(using C: Context): symbols.BlockParam =
capabilities.get(tpe).orElse {
Expand Down
2 changes: 1 addition & 1 deletion effekt/shared/src/main/scala/effekt/typer/TypeComparer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ trait TypeUnifier {
// TODO here we assume that the type constructor is covariant
(args1 zip args2) foreach { case (t1, t2) => unifyValueTypes(t1, t2, ErrorContext.TypeConstructorArgument(ctx)) }

case (t @ BoxedType(tpe1, capt1), s @ BoxedType(tpe2, capt2), p, _) =>
case (t @ BoxedType(tpe1, capt1), s @ BoxedType(tpe2, capt2), _, _) =>
unifyBlockTypes(tpe1, tpe2, ErrorContext.BoxedTypeBlock(t, s, ctx))
unifyCaptures(capt1, capt2, ErrorContext.BoxedTypeCapture(t, s, ctx))

Expand Down
Loading