add lex and parser errors + comments
This commit is contained in:
+7
-7
@@ -1,7 +1,7 @@
|
||||
package p.studio.compiler.pbs;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
@@ -21,11 +21,11 @@ class PbsFrontendCompilerTest {
|
||||
}
|
||||
""";
|
||||
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
final var diagnostics = DiagnosticSink.empty();
|
||||
final var compiler = new PbsFrontendCompiler();
|
||||
final var functions = compiler.compileFile(new FileId(0), source, "compile-test.pbs", issues);
|
||||
final var functions = compiler.compileFile(new FileId(0), source, diagnostics);
|
||||
|
||||
assertTrue(issues.isEmpty(), "Valid program should not report issues");
|
||||
assertTrue(diagnostics.isEmpty(), "Valid program should not report diagnostics");
|
||||
assertEquals(2, functions.size());
|
||||
assertEquals("a", functions.get(0).name());
|
||||
assertEquals(0, functions.get(0).parameterCount());
|
||||
@@ -40,10 +40,10 @@ class PbsFrontendCompilerTest {
|
||||
fn a(): int { return 2; }
|
||||
""";
|
||||
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
final var diagnostics = DiagnosticSink.empty();
|
||||
final var compiler = new PbsFrontendCompiler();
|
||||
compiler.compileFile(new FileId(0), source, "compile-test.pbs", issues);
|
||||
compiler.compileFile(new FileId(0), source, diagnostics);
|
||||
|
||||
assertTrue(issues.hasErrors());
|
||||
assertTrue(diagnostics.hasErrors());
|
||||
}
|
||||
}
|
||||
|
||||
+5
-4
@@ -1,7 +1,8 @@
|
||||
package p.studio.compiler.pbs.lexer;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
@@ -11,9 +12,9 @@ class PbsLexerTest {
|
||||
@Test
|
||||
void shouldLexFunctionTokens() {
|
||||
final var source = "fn sum(a: int, b: int): int { return a + b; }";
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
final var diagnostics = DiagnosticSink.empty();
|
||||
|
||||
final var tokens = PbsLexer.lex(source, "test.pbs", issues);
|
||||
final var tokens = PbsLexer.lex(source, new FileId(0), diagnostics);
|
||||
|
||||
assertEquals(PbsTokenKind.FN, tokens.get(0).kind());
|
||||
assertEquals(PbsTokenKind.IDENTIFIER, tokens.get(1).kind());
|
||||
@@ -24,6 +25,6 @@ class PbsLexerTest {
|
||||
.orElseThrow()
|
||||
.kind());
|
||||
assertEquals(PbsTokenKind.EOF, tokens.getLast().kind());
|
||||
assertTrue(issues.isEmpty(), "Lexer should not report issues for valid input");
|
||||
assertTrue(diagnostics.isEmpty(), "Lexer should not report diagnostics for valid input");
|
||||
}
|
||||
}
|
||||
|
||||
+6
-5
@@ -1,9 +1,9 @@
|
||||
package p.studio.compiler.pbs.parser;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import p.studio.compiler.messages.BuildingIssueSink;
|
||||
import p.studio.compiler.pbs.ast.PbsAst;
|
||||
import p.studio.compiler.pbs.lexer.PbsLexer;
|
||||
import p.studio.compiler.source.diagnostics.DiagnosticSink;
|
||||
import p.studio.compiler.source.identifiers.FileId;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
@@ -19,12 +19,13 @@ class PbsParserTest {
|
||||
return a + b;
|
||||
}
|
||||
""";
|
||||
final var issues = BuildingIssueSink.empty();
|
||||
final var tokens = PbsLexer.lex(source, "parser-test.pbs", issues);
|
||||
final var diagnostics = DiagnosticSink.empty();
|
||||
final var fileId = new FileId(0);
|
||||
final var tokens = PbsLexer.lex(source, fileId, diagnostics);
|
||||
|
||||
final PbsAst.File ast = PbsParser.parse(tokens, new FileId(0), "parser-test.pbs", issues);
|
||||
final PbsAst.File ast = PbsParser.parse(tokens, fileId, diagnostics);
|
||||
|
||||
assertTrue(issues.isEmpty(), "Parser should not report issues for valid function");
|
||||
assertTrue(diagnostics.isEmpty(), "Parser should not report diagnostics for valid function");
|
||||
assertEquals(1, ast.functions().size());
|
||||
|
||||
final var fn = ast.functions().getFirst();
|
||||
|
||||
Reference in New Issue
Block a user