christoph/lecture-compilers
1
Fork 0
Code Actions Activity

parser returns tree

Browse Source
This commit is contained in:
ChUrl
2020-12-11 13:35:06 +01:00
parent 5f88a56d53
commit ec5e243e22
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/parser/LL1Parser.java
View File

@ -10,7 +10,6 @@ import util.ast.Node;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Deque;
import java.util.List;
@ -33,7 +32,7 @@ public class LL1Parser {
return new LL1Parser(analyzer.getTable());
}
public boolean parse(List<? extends Token> token, Vocabulary voc) {
public AST parse(List<? extends Token> token, Vocabulary voc) {
Node root = new Node(this.parsetable.getStartSymbol());
AST tree = new AST(root);
Deque<Node> stack = new ArrayDeque<>();
@ -110,6 +109,6 @@ public class LL1Parser {
log("\nParsed AST:\n" + tree);
log("-".repeat(100) + "\n");
return true;
return tree;
}
}

20
src/test/java/parser/LexerParserGrammarTest.java
View File

@ -3,9 +3,7 @@ package parser;
import lexer.StupsLexer;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.Lexer;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import parser.grammar.Grammar;
import java.io.IOException;
import java.net.URISyntaxException;
@ -13,8 +11,6 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
@ -39,7 +35,7 @@ class LexerParserGrammarTest {
Lexer lex = this.initLexer("EmptyFile.stups");
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isTrue();
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isNotNull();
}
@Test
@ -49,7 +45,7 @@ class LexerParserGrammarTest {
Lexer lex = this.initLexer("EmptyMain.stups");
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isTrue();
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isNotNull();
}
@Test
@ -59,7 +55,7 @@ class LexerParserGrammarTest {
Lexer lex = this.initLexer("GeneralComment.stups");
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isTrue();
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isNotNull();
}
@Test
@ -69,7 +65,7 @@ class LexerParserGrammarTest {
Lexer lex = this.initLexer("MultipleDeclarations.stups");
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isTrue();
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isNotNull();
}
@Test
@ -79,7 +75,7 @@ class LexerParserGrammarTest {
Lexer lex = this.initLexer("DeclarationAssignment.stups");
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isTrue();
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isNotNull();
}
@Test
@ -89,7 +85,7 @@ class LexerParserGrammarTest {
Lexer lex = this.initLexer("Expr.stups");
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isTrue();
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isNotNull();
}
@Test
@ -99,7 +95,7 @@ class LexerParserGrammarTest {
Lexer lex = this.initLexer("GeneralWhile.stups");
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isTrue();
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isNotNull();
}
@Test
@ -109,6 +105,6 @@ class LexerParserGrammarTest {
Lexer lex = this.initLexer("GeneralIfElse.stups");
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isTrue();
assertThat(parser.parse(lex.getAllTokens(), lex.getVocabulary())).isNotNull();
}
}