implements PR003

This commit is contained in:
2026-03-24 13:42:19 +00:00
parent 9ddfa19bf2
commit 96c5505c04
9 changed files with 531 additions and 137 deletions
@@ -12,11 +12,11 @@ class PbsFrontendCompilerTest {
@Test
void shouldLowerFunctionsToIr() {
final var source = """
fn a(): int {
fn a() -> int {
return 1;
}
fn b(x: int): int {
fn b(x: int) -> int {
return x;
}
""";
@@ -37,8 +37,8 @@ class PbsFrontendCompilerTest {
@Test
void shouldReportDuplicateFunctionNames() {
final var source = """
fn a(): int { return 1; }
fn a(): int { return 2; }
fn a() -> int { return 1; }
fn a() -> int { return 2; }
""";
final var diagnostics = DiagnosticSink.empty();
@@ -8,14 +8,15 @@ 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 PbsParserTest {
@Test
void shouldParseSingleFunction() {
void shouldParseSingleFunctionWithArrowReturn() {
final var source = """
fn sum(a: int, b: int): int
fn sum(a: int, b: int) -> int
{
return a + b;
}
@@ -34,7 +35,9 @@ class PbsParserTest {
final var fn = ast.functions().getFirst();
assertEquals("sum", fn.name());
assertEquals(2, fn.parameters().size());
assertEquals(PbsAst.ReturnKind.PLAIN, fn.returnKind());
assertEquals("int", fn.returnType().name());
assertNull(fn.resultErrorType());
assertEquals(1, fn.body().statements().size());
assertInstanceOf(PbsAst.ReturnStatement.class, fn.body().statements().getFirst());
@@ -43,13 +46,13 @@ class PbsParserTest {
}
@Test
void shouldPreserveImportsAndTopDeclOrdering() {
void shouldParseImportsAndTopDeclOrdering() {
final var source = """
import { Vec2 as V2 } from @core:math;
fn first(): int { return 1; }
fn first() -> int { return 1; }
declare struct Point(x: int, y: int);
declare callback Tick(dt: int): int;
declare callback Tick(dt: int) -> int;
""";
final var diagnostics = DiagnosticSink.empty();
final var fileId = new FileId(0);
@@ -70,17 +73,17 @@ class PbsParserTest {
}
@Test
void shouldRepresentMandatoryDeclarationFamilies() {
void shouldParseDeclarationFamiliesWithShape() {
final var source = """
fn f(): int { return 1; }
declare struct S(x: int);
declare contract C { fn run(x: int): int; }
declare service Game { fn tick(x: int): int { return x; } }
declare error Err { Fail; }
declare enum Mode(Idle, Run);
declare callback TickCb(x: int): int;
fn f() -> int { return 1; }
declare struct S(pub mut x: int, y: optional int) { fn run() -> void { return; } ctor make(x: int) { return; } }
declare contract C { fn run(x: int) -> int; }
declare service Game { fn tick(x: int) -> int { return x; } }
declare error Err { Fail; Crash; }
declare enum Mode(Idle = 0, Run = 1);
declare callback TickCb(x: int) -> result<Err> int;
declare const LIMIT: int = 10;
implements C for S using s { fn run(x: int): int { return x; } }
implements C for S using s { fn run(x: int) -> int { return x; } }
""";
final var diagnostics = DiagnosticSink.empty();
final var fileId = new FileId(0);
@@ -88,24 +91,84 @@ class PbsParserTest {
final PbsAst.File ast = PbsParser.parse(tokens, fileId, diagnostics);
assertTrue(diagnostics.isEmpty(), "Parser should represent all mandatory declaration families");
assertTrue(diagnostics.isEmpty(), "Parser should represent declaration families with expected shapes");
assertEquals(9, ast.topDecls().size());
assertInstanceOf(PbsAst.FunctionDecl.class, ast.topDecls().get(0));
assertInstanceOf(PbsAst.StructDecl.class, ast.topDecls().get(1));
assertInstanceOf(PbsAst.ContractDecl.class, ast.topDecls().get(2));
assertInstanceOf(PbsAst.ServiceDecl.class, ast.topDecls().get(3));
assertInstanceOf(PbsAst.ErrorDecl.class, ast.topDecls().get(4));
assertInstanceOf(PbsAst.EnumDecl.class, ast.topDecls().get(5));
assertInstanceOf(PbsAst.CallbackDecl.class, ast.topDecls().get(6));
final var structDecl = assertInstanceOf(PbsAst.StructDecl.class, ast.topDecls().get(1));
assertEquals(2, structDecl.fields().size());
assertTrue(structDecl.hasBody());
final var contractDecl = assertInstanceOf(PbsAst.ContractDecl.class, ast.topDecls().get(2));
assertEquals(1, contractDecl.signatures().size());
final var serviceDecl = assertInstanceOf(PbsAst.ServiceDecl.class, ast.topDecls().get(3));
assertEquals(1, serviceDecl.methods().size());
final var errorDecl = assertInstanceOf(PbsAst.ErrorDecl.class, ast.topDecls().get(4));
assertEquals(2, errorDecl.cases().size());
final var enumDecl = assertInstanceOf(PbsAst.EnumDecl.class, ast.topDecls().get(5));
assertEquals(2, enumDecl.cases().size());
final var callbackDecl = assertInstanceOf(PbsAst.CallbackDecl.class, ast.topDecls().get(6));
assertEquals(PbsAst.ReturnKind.RESULT, callbackDecl.returnKind());
assertEquals("Err", callbackDecl.resultErrorType().name());
assertInstanceOf(PbsAst.ConstDecl.class, ast.topDecls().get(7));
assertInstanceOf(PbsAst.ImplementsDecl.class, ast.topDecls().get(8));
}
@Test
void shouldParseOptionalAndNamedTupleTypes() {
final var source = """
fn shape(a: optional int, b: (x: int, y: optional float)) -> (value: optional int, meta: (k: int, v: float)) {
return a;
}
""";
final var diagnostics = DiagnosticSink.empty();
final var fileId = new FileId(0);
final PbsAst.File ast = PbsParser.parse(PbsLexer.lex(source, fileId, diagnostics), fileId, diagnostics);
assertTrue(diagnostics.isEmpty(), "Parser should accept optional and named tuple type surfaces");
final var fn = ast.functions().getFirst();
final var p0 = fn.parameters().get(0).typeRef();
assertEquals(PbsAst.TypeRefKind.OPTIONAL, p0.kind());
assertEquals(PbsAst.TypeRefKind.SIMPLE, p0.inner().kind());
final var p1 = fn.parameters().get(1).typeRef();
assertEquals(PbsAst.TypeRefKind.NAMED_TUPLE, p1.kind());
assertEquals(2, p1.fields().size());
final var returnType = fn.returnType();
assertEquals(PbsAst.TypeRefKind.NAMED_TUPLE, returnType.kind());
}
@Test
void shouldRejectReservedDeclareHostAndBuiltinType() {
final var source = """
declare host HostApi { fn run() -> int; }
declare builtin type Vec(x: int) { fn mag() -> float; }
fn ok() -> int { return 1; }
""";
final var diagnostics = DiagnosticSink.empty();
final var fileId = new FileId(0);
final PbsAst.File ast = PbsParser.parse(PbsLexer.lex(source, fileId, diagnostics), fileId, diagnostics);
assertTrue(diagnostics.hasErrors(), "Parser should reject reserved declare forms in ordinary source");
assertEquals(3, ast.topDecls().size());
assertInstanceOf(PbsAst.InvalidDecl.class, ast.topDecls().get(0));
assertInstanceOf(PbsAst.InvalidDecl.class, ast.topDecls().get(1));
assertInstanceOf(PbsAst.FunctionDecl.class, ast.topDecls().get(2));
}
@Test
void shouldRecoverWithInvalidDeclarationNode() {
final var source = """
declare ;
fn ok(): int { return 1; }
fn ok() -> int { return 1; }
""";
final var diagnostics = DiagnosticSink.empty();
final var fileId = new FileId(0);