implements PR006.2

This commit is contained in:
2026-03-24 13:42:20 +00:00
parent 0cf2e3e099
commit 42392f3d02
8 changed files with 259 additions and 73 deletions
@@ -8,6 +8,7 @@ import p.studio.compiler.source.identifiers.FileId;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
class PbsExprParserTest {
@@ -60,14 +61,20 @@ class PbsExprParserTest {
assertTrue(diagnostics.isEmpty(), "Expression control-flow forms should parse cleanly");
final var body = ast.functions().getFirst().body().statements();
assertInstanceOf(PbsAst.IfExpr.class,
final var ifExpr = assertInstanceOf(PbsAst.IfExpr.class,
assertInstanceOf(PbsAst.LetStatement.class, body.get(0)).initializer());
assertInstanceOf(PbsAst.SwitchExpr.class,
assertInstanceOf(PbsAst.IntLiteralExpr.class, ifExpr.thenBlock().tailExpression());
final var elseBlock = assertInstanceOf(PbsAst.BlockExpr.class, ifExpr.elseExpression()).block();
assertInstanceOf(PbsAst.IntLiteralExpr.class, elseBlock.tailExpression());
final var switchExpr = assertInstanceOf(PbsAst.SwitchExpr.class,
assertInstanceOf(PbsAst.LetStatement.class, body.get(1)).initializer());
assertInstanceOf(PbsAst.IntLiteralExpr.class, switchExpr.arms().getFirst().block().tailExpression());
final var handle = assertInstanceOf(PbsAst.HandleExpr.class,
assertInstanceOf(PbsAst.LetStatement.class, body.get(2)).initializer());
assertEquals(2, handle.arms().size());
assertInstanceOf(PbsAst.IntLiteralExpr.class, handle.arms().get(1).block().tailExpression());
}
@Test
@@ -88,14 +95,28 @@ class PbsExprParserTest {
assertTrue(diagnostics.isEmpty(), "Expression control-flow forms with return blocks should parse cleanly");
final var body = ast.functions().getFirst().body().statements();
assertInstanceOf(PbsAst.IfExpr.class,
final var ifExpr = assertInstanceOf(PbsAst.IfExpr.class,
assertInstanceOf(PbsAst.LetStatement.class, body.get(0)).initializer());
assertInstanceOf(PbsAst.SwitchExpr.class,
assertEquals(1, ifExpr.thenBlock().statements().size());
assertInstanceOf(PbsAst.ReturnStatement.class, ifExpr.thenBlock().statements().getFirst());
assertNull(ifExpr.thenBlock().tailExpression());
final var elseBlock = assertInstanceOf(PbsAst.BlockExpr.class, ifExpr.elseExpression()).block();
assertEquals(1, elseBlock.statements().size());
assertInstanceOf(PbsAst.ReturnStatement.class, elseBlock.statements().getFirst());
assertNull(elseBlock.tailExpression());
final var switchExpr = assertInstanceOf(PbsAst.SwitchExpr.class,
assertInstanceOf(PbsAst.LetStatement.class, body.get(1)).initializer());
assertEquals(1, switchExpr.arms().getFirst().block().statements().size());
assertInstanceOf(PbsAst.ReturnStatement.class, switchExpr.arms().getFirst().block().statements().getFirst());
assertNull(switchExpr.arms().getFirst().block().tailExpression());
final var handle = assertInstanceOf(PbsAst.HandleExpr.class,
assertInstanceOf(PbsAst.LetStatement.class, body.get(2)).initializer());
assertEquals(2, handle.arms().size());
assertEquals(1, handle.arms().get(1).block().statements().size());
assertInstanceOf(PbsAst.ReturnStatement.class, handle.arms().get(1).block().statements().getFirst());
assertNull(handle.arms().get(1).block().tailExpression());
}
@Test
@@ -97,6 +97,8 @@ class PbsParserTest {
final var structDecl = assertInstanceOf(PbsAst.StructDecl.class, ast.topDecls().get(1));
assertEquals(2, structDecl.fields().size());
assertTrue(structDecl.hasBody());
assertEquals(1, structDecl.methods().size());
assertEquals(1, structDecl.ctors().size());
final var contractDecl = assertInstanceOf(PbsAst.ContractDecl.class, ast.topDecls().get(2));
assertEquals(1, contractDecl.signatures().size());
@@ -115,7 +117,8 @@ class PbsParserTest {
assertEquals("Err", callbackDecl.resultErrorType().name());
assertInstanceOf(PbsAst.ConstDecl.class, ast.topDecls().get(7));
assertInstanceOf(PbsAst.ImplementsDecl.class, ast.topDecls().get(8));
final var implementsDecl = assertInstanceOf(PbsAst.ImplementsDecl.class, ast.topDecls().get(8));
assertEquals(1, implementsDecl.methods().size());
}
@Test
@@ -164,6 +167,37 @@ class PbsParserTest {
assertInstanceOf(PbsAst.FunctionDecl.class, ast.topDecls().get(2));
}
@Test
void shouldRejectFunctionElseFallbackSurface() {
final var source = """
fn run() -> int else 1 {
return 1;
}
""";
final var diagnostics = DiagnosticSink.empty();
final var fileId = new FileId(0);
PbsParser.parse(PbsLexer.lex(source, fileId, diagnostics), fileId, diagnostics);
assertTrue(diagnostics.hasErrors(), "Function-level else fallback syntax is not valid PBS core syntax");
}
@Test
void shouldReportEnumMixedAndDuplicateCases() {
final var source = """
declare enum Mixed(A, B = 1);
declare enum Duplicated(Idle = 0, Idle = 1, Run = 1);
""";
final var diagnostics = DiagnosticSink.empty();
final var fileId = new FileId(0);
PbsParser.parse(PbsLexer.lex(source, fileId, diagnostics), fileId, diagnostics);
assertTrue(diagnostics.stream().anyMatch(d -> d.getCode().equals(ParseErrors.E_PARSE_INVALID_ENUM_FORM.name())));
assertTrue(diagnostics.stream().anyMatch(d -> d.getCode().equals(ParseErrors.E_PARSE_DUPLICATE_ENUM_CASE_LABEL.name())));
assertTrue(diagnostics.stream().anyMatch(d -> d.getCode().equals(ParseErrors.E_PARSE_DUPLICATE_ENUM_CASE_ID.name())));
}
@Test
void shouldRecoverWithInvalidDeclarationNode() {
final var source = """