implements PR006.3

This commit is contained in:
2026-03-24 13:42:20 +00:00
parent 42392f3d02
commit e94f76db56
13 changed files with 232 additions and 51 deletions
@@ -112,6 +112,17 @@ class PbsLexerTest {
diagnostics.stream().findFirst().orElseThrow().getCode());
}
@Test
void shouldReportInvalidStringEscape() {
final var source = "\"bad\\q\"";
final var diagnostics = DiagnosticSink.empty();
PbsLexer.lex(source, new FileId(0), diagnostics);
assertTrue(diagnostics.hasErrors(), "Lexer should report invalid string escapes");
assertTrue(diagnostics.stream().anyMatch(d -> d.getCode().equals(LexErrors.E_LEX_INVALID_STRING_ESCAPE.name())));
}
@Test
void shouldReportInvalidCharacter() {
final var source = "fn a() { ~ }";
@@ -33,6 +33,19 @@ class PbsModuleVisibilityTest {
assertTrue(diagnostics.stream().anyMatch(d -> d.getCode().equals(PbsLinkErrors.E_LINK_MISSING_BARREL.name())));
}
@Test
void shouldReportBarrelWithoutSourceFiles() {
final var diagnostics = DiagnosticSink.empty();
final var nextFileId = new AtomicInteger(0);
final var module = module("core", "math", List.of(), """
pub fn run() -> int;
""", nextFileId, diagnostics);
new PbsModuleVisibilityValidator().validate(ReadOnlyList.wrap(List.of(module)), diagnostics);
assertTrue(diagnostics.stream().anyMatch(d -> d.getCode().equals(PbsLinkErrors.E_LINK_BARREL_WITHOUT_SOURCE.name())));
}
@Test
void shouldReportDuplicateBarrelEntriesByKindAndSignature() {
final var diagnostics = DiagnosticSink.empty();
@@ -166,6 +166,7 @@ class PbsExprParserTest {
value?;
(a: 1);
(a: 1, 2);
(1, 2, 3, 4, 5, 6, 7);
if a { 1; };
return 0;
}
@@ -121,6 +121,38 @@ class PbsParserTest {
assertEquals(1, implementsDecl.methods().size());
}
@Test
void shouldRejectAttributesInOrdinarySourceAndRecover() {
final var source = """
[Host(module = "gfx", name = "draw", version = 1)]
fn run() -> int { return 1; }
declare struct Point(x: int,);
""";
final var diagnostics = DiagnosticSink.empty();
final var fileId = new FileId(0);
final PbsAst.File ast = PbsParser.parse(PbsLexer.lex(source, fileId, diagnostics), fileId, diagnostics);
assertEquals(2, ast.topDecls().size());
assertInstanceOf(PbsAst.FunctionDecl.class, ast.topDecls().get(0));
assertInstanceOf(PbsAst.StructDecl.class, ast.topDecls().get(1));
assertTrue(diagnostics.stream().anyMatch(d -> d.getCode().equals(ParseErrors.E_PARSE_ATTRIBUTES_NOT_ALLOWED.name())));
}
@Test
void shouldAcceptStructFieldTrailingComma() {
final var source = "declare struct S(a: int,);";
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(), "Struct field trailing comma should be accepted");
final var decl = assertInstanceOf(PbsAst.StructDecl.class, ast.topDecls().getFirst());
assertEquals(1, decl.fields().size());
assertEquals("a", decl.fields().getFirst().name());
}
@Test
void shouldParseOptionalAndNamedTupleTypes() {
final var source = """
@@ -148,6 +180,21 @@ class PbsParserTest {
assertEquals(PbsAst.TypeRefKind.NAMED_TUPLE, returnType.kind());
}
@Test
void shouldRejectNamedTupleTypeWithArityAboveSix() {
final var source = """
fn tooWide(v: (a: int, b: int, c: int, d: int, e: int, f: int, g: int)) -> int {
return 0;
}
""";
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_TYPE_SURFACE.name())));
}
@Test
void shouldRejectReservedDeclareHostAndBuiltinType() {
final var source = """