implements PR021

This commit is contained in:
2026-03-24 13:42:22 +00:00
parent d2287a0a58
commit d7b070ab68
4 changed files with 146 additions and 43 deletions
@@ -7,6 +7,7 @@ import p.studio.compiler.source.identifiers.FileId;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class PbsSemanticsFallthroughTest {
@@ -110,4 +111,100 @@ class PbsSemanticsFallthroughTest {
assertFalse(diagnostics.stream().anyMatch(d ->
d.getCode().equals(PbsSemanticsErrors.E_SEM_POSSIBLE_FALLTHROUGH_RESULT.name())));
}
@Test
void shouldTreatTerminalHandleArmsAsCallableCompletion() {
final var source = """
declare enum Mode(Idle, Run);
declare error InErr { A; B; }
declare error OutErr { Retry; Abort; }
fn source(v: int) -> result<InErr> int {
if v > 0 { return err(InErr.A); }
return err(InErr.B);
}
fn handleShortRemapTerminal(v: int) -> result<OutErr> int {
handle source(v) {
InErr.A -> OutErr.Retry,
InErr.B -> OutErr.Abort,
};
}
fn handleBlockErrTerminal(v: int) -> result<OutErr> int {
handle source(v) {
InErr.A -> { err(OutErr.Retry) },
InErr.B -> { err(OutErr.Abort) },
};
}
fn handleTerminalInIf(flag: bool, v: int) -> result<OutErr> int {
if flag {
handle source(v) {
InErr.A -> OutErr.Retry,
InErr.B -> OutErr.Abort,
};
} else {
return err(OutErr.Abort);
}
}
fn handleTerminalInSwitch(mode: Mode, v: int) -> result<OutErr> int {
switch mode {
Mode.Idle: {
handle source(v) {
InErr.A -> { err(OutErr.Retry) },
InErr.B -> { err(OutErr.Abort) },
};
},
_: { return err(OutErr.Abort); },
};
}
""";
final var diagnostics = DiagnosticSink.empty();
new PbsFrontendCompiler().compileFile(new FileId(0), source, diagnostics);
assertFalse(diagnostics.stream().anyMatch(d ->
d.getCode().equals(PbsSemanticsErrors.E_SEM_POSSIBLE_FALLTHROUGH_RESULT.name())));
}
@Test
void shouldKeepFallthroughWhenHandleArmRecoversWithOk() {
final var source = """
declare error InErr { A; B; }
declare error OutErr { Retry; Abort; }
fn source(v: int) -> result<InErr> int {
if v > 0 { return err(InErr.A); }
return err(InErr.B);
}
fn handleRecoveringTail(v: int) -> result<OutErr> int {
handle source(v) {
InErr.A -> { ok(1) },
InErr.B -> { err(OutErr.Abort) },
};
}
fn handleRecoveringInIf(flag: bool, v: int) -> result<OutErr> int {
if flag {
handle source(v) {
InErr.A -> { ok(1) },
InErr.B -> { err(OutErr.Abort) },
};
} else {
return err(OutErr.Abort);
}
}
""";
final var diagnostics = DiagnosticSink.empty();
new PbsFrontendCompiler().compileFile(new FileId(0), source, diagnostics);
final var resultFallthroughCount = diagnostics.stream()
.filter(d -> d.getCode().equals(PbsSemanticsErrors.E_SEM_POSSIBLE_FALLTHROUGH_RESULT.name()))
.count();
assertTrue(resultFallthroughCount >= 2);
}
}