implements PR-19.3 parser and ast globals lifecycle markers
This commit is contained in:
+4
-2
@@ -16,6 +16,7 @@ class PbsBarrelParserTest {
|
||||
pub fn sum(a: int, b: int) -> int;
|
||||
mod fn run(state: optional int) -> result<Err> (value: int, meta: float);
|
||||
pub struct Vec2;
|
||||
mod global Palette;
|
||||
pub callback Tick;
|
||||
""";
|
||||
|
||||
@@ -25,7 +26,7 @@ class PbsBarrelParserTest {
|
||||
final var barrel = PbsBarrelParser.parse(tokens, fileId, diagnostics);
|
||||
|
||||
assertTrue(diagnostics.isEmpty(), "Valid barrel should parse without diagnostics");
|
||||
assertEquals(4, barrel.items().size());
|
||||
assertEquals(5, barrel.items().size());
|
||||
|
||||
final var sum = assertInstanceOf(PbsAst.BarrelFunctionItem.class, barrel.items().get(0));
|
||||
assertEquals("sum", sum.name());
|
||||
@@ -39,7 +40,8 @@ class PbsBarrelParserTest {
|
||||
assertEquals(PbsAst.TypeRefKind.NAMED_TUPLE, run.returnType().kind());
|
||||
|
||||
assertInstanceOf(PbsAst.BarrelStructItem.class, barrel.items().get(2));
|
||||
assertInstanceOf(PbsAst.BarrelCallbackItem.class, barrel.items().get(3));
|
||||
assertInstanceOf(PbsAst.BarrelGlobalItem.class, barrel.items().get(3));
|
||||
assertInstanceOf(PbsAst.BarrelCallbackItem.class, barrel.items().get(4));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+42
-9
@@ -75,12 +75,17 @@ class PbsParserTest {
|
||||
void shouldParseDeclarationFamiliesWithShape() {
|
||||
final var source = """
|
||||
fn f() -> int { return 1; }
|
||||
[Init]
|
||||
fn init() -> void { return; }
|
||||
[Frame]
|
||||
fn frame() -> void { return; }
|
||||
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 global STATE: int = 10;
|
||||
declare const LIMIT: int = 10;
|
||||
implements C for S using s { fn run(x: int) -> int { return x; } }
|
||||
""";
|
||||
@@ -91,32 +96,40 @@ class PbsParserTest {
|
||||
final PbsAst.File ast = PbsParser.parse(tokens, fileId, diagnostics);
|
||||
|
||||
assertTrue(diagnostics.isEmpty(), "Parser should represent declaration families with expected shapes");
|
||||
assertEquals(9, ast.topDecls().size());
|
||||
assertEquals(12, ast.topDecls().size());
|
||||
|
||||
final var structDecl = assertInstanceOf(PbsAst.StructDecl.class, ast.topDecls().get(1));
|
||||
final var initDecl = assertInstanceOf(PbsAst.FunctionDecl.class, ast.topDecls().get(1));
|
||||
assertEquals(PbsAst.LifecycleMarker.INIT, initDecl.lifecycleMarker());
|
||||
|
||||
final var frameDecl = assertInstanceOf(PbsAst.FunctionDecl.class, ast.topDecls().get(2));
|
||||
assertEquals(PbsAst.LifecycleMarker.FRAME, frameDecl.lifecycleMarker());
|
||||
|
||||
final var structDecl = assertInstanceOf(PbsAst.StructDecl.class, ast.topDecls().get(3));
|
||||
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));
|
||||
final var contractDecl = assertInstanceOf(PbsAst.ContractDecl.class, ast.topDecls().get(4));
|
||||
assertEquals(1, contractDecl.signatures().size());
|
||||
|
||||
final var serviceDecl = assertInstanceOf(PbsAst.ServiceDecl.class, ast.topDecls().get(3));
|
||||
final var serviceDecl = assertInstanceOf(PbsAst.ServiceDecl.class, ast.topDecls().get(5));
|
||||
assertEquals(1, serviceDecl.methods().size());
|
||||
|
||||
final var errorDecl = assertInstanceOf(PbsAst.ErrorDecl.class, ast.topDecls().get(4));
|
||||
final var errorDecl = assertInstanceOf(PbsAst.ErrorDecl.class, ast.topDecls().get(6));
|
||||
assertEquals(2, errorDecl.cases().size());
|
||||
|
||||
final var enumDecl = assertInstanceOf(PbsAst.EnumDecl.class, ast.topDecls().get(5));
|
||||
final var enumDecl = assertInstanceOf(PbsAst.EnumDecl.class, ast.topDecls().get(7));
|
||||
assertEquals(2, enumDecl.cases().size());
|
||||
|
||||
final var callbackDecl = assertInstanceOf(PbsAst.CallbackDecl.class, ast.topDecls().get(6));
|
||||
final var callbackDecl = assertInstanceOf(PbsAst.CallbackDecl.class, ast.topDecls().get(8));
|
||||
assertEquals(PbsAst.ReturnKind.RESULT, callbackDecl.returnKind());
|
||||
assertEquals("Err", callbackDecl.resultErrorType().name());
|
||||
|
||||
assertInstanceOf(PbsAst.ConstDecl.class, ast.topDecls().get(7));
|
||||
final var implementsDecl = assertInstanceOf(PbsAst.ImplementsDecl.class, ast.topDecls().get(8));
|
||||
final var globalDecl = assertInstanceOf(PbsAst.GlobalDecl.class, ast.topDecls().get(9));
|
||||
assertEquals("STATE", globalDecl.name());
|
||||
assertInstanceOf(PbsAst.ConstDecl.class, ast.topDecls().get(10));
|
||||
final var implementsDecl = assertInstanceOf(PbsAst.ImplementsDecl.class, ast.topDecls().get(11));
|
||||
assertEquals(1, implementsDecl.methods().size());
|
||||
}
|
||||
|
||||
@@ -139,6 +152,26 @@ class PbsParserTest {
|
||||
assertTrue(diagnostics.stream().anyMatch(d -> d.getCode().equals(ParseErrors.E_PARSE_ATTRIBUTES_NOT_ALLOWED.name())));
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldParseLifecycleMarkersOnlyOnTopLevelFunctions() {
|
||||
final var source = """
|
||||
[Init]
|
||||
fn init() -> void { return; }
|
||||
[Frame]
|
||||
fn frame() -> void { return; }
|
||||
""";
|
||||
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(), "Lifecycle markers should be accepted on top-level functions");
|
||||
final var initDecl = assertInstanceOf(PbsAst.FunctionDecl.class, ast.topDecls().get(0));
|
||||
final var frameDecl = assertInstanceOf(PbsAst.FunctionDecl.class, ast.topDecls().get(1));
|
||||
assertEquals(PbsAst.LifecycleMarker.INIT, initDecl.lifecycleMarker());
|
||||
assertEquals(PbsAst.LifecycleMarker.FRAME, frameDecl.lifecycleMarker());
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldParseServiceAndMemberNamesUsingErrorKeyword() {
|
||||
final var source = """
|
||||
|
||||
Reference in New Issue
Block a user