arnekeller/Typicalc
1
0
Fork 0
mirror of https://gitlab.kit.edu/uskyk/typicalc.git synced 2024-11-10 03:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

More parser error handling tests

Browse Source
This commit is contained in:
Arne Keller 2021-02-01 11:08:31 +01:00
parent f8ac91cdd8
commit 64312cd172
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/edu/kit/typicalc/model/parser/LambdaLexer.java
View File

@ -4,9 +4,7 @@ import edu.kit.typicalc.model.parser.Token.TokenType;
import edu.kit.typicalc.util.Result;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
import java.util.List;
/**
* This class lexes a term given as String into tokens.
@ -71,13 +69,6 @@ public class LambdaLexer {
}
public Result<List<Token>, ParseError> allTokens() {
if (result.isError()) {
return new Result<>(result);
}
return new Result<>(new ArrayList<>(result.unwrap()));
}
private Result<Token, ParseError> parseNextToken() {
while (pos < term.length() && Character.isWhitespace(term.charAt(pos))) {
advance();

5
src/main/java/edu/kit/typicalc/model/parser/LambdaParser.java
View File

@ -186,10 +186,7 @@ public class LambdaParser {
switch (token.getType()) {
case VARIABLE:
Result<VarTerm, ParseError> var = parseVar();
if (var.isError()) {
return new Result<>(var);
}
return new Result<>(var.unwrap());
return new Result<>(var.unwrap()); // variable token can always be parsed
case NUMBER:
String number = token.getText();
int n;

40
src/test/java/edu/kit/typicalc/model/parser/LambdaParserTest.java
View File

@ -11,6 +11,7 @@ import edu.kit.typicalc.model.term.LetTerm;
import edu.kit.typicalc.model.term.VarTerm;
import edu.kit.typicalc.model.parser.Token.TokenType;
import edu.kit.typicalc.util.Result;
import nl.jqno.equalsverifier.EqualsVerifier;
import org.junit.jupiter.api.Test;
class LambdaParserTest {
@ -82,7 +83,7 @@ class LambdaParserTest {
);
}
@Test
void miscellaneousTerms() {
void errorHandling() {
LambdaParser parser = new LambdaParser("");
assertEquals(ParseError.TOO_FEW_TOKENS, parser.parse().unwrapError());
parser = new LambdaParser("x)");
@ -97,5 +98,42 @@ class LambdaParserTest {
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_CHARACTER, error);
assertEquals(new Token(TokenType.NUMBER, "123333333333333", 2), error.getCause());
parser = new LambdaParser("λ)");
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_TOKEN, error);
assertEquals(new Token(TokenType.RIGHT_PARENTHESIS, ")", 1), error.getCause());
parser = new LambdaParser("λx=");
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_TOKEN, error);
assertEquals(new Token(TokenType.EQUALS, "=", 2), error.getCause());
parser = new LambdaParser("λx..");
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_TOKEN, error);
assertEquals(new Token(TokenType.DOT, ".", 3), error.getCause());
parser = new LambdaParser("let ) =");
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_TOKEN, error);
assertEquals(new Token(TokenType.RIGHT_PARENTHESIS, ")", 4), error.getCause());
parser = new LambdaParser("let x .");
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_TOKEN, error);
assertEquals(new Token(TokenType.DOT, ".", 6), error.getCause());
parser = new LambdaParser("let x = )");
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_TOKEN, error);
assertEquals(new Token(TokenType.RIGHT_PARENTHESIS, ")", 8), error.getCause());
parser = new LambdaParser("let x = y )");
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_TOKEN, error);
assertEquals(new Token(TokenType.RIGHT_PARENTHESIS, ")", 10), error.getCause());
parser = new LambdaParser("let x = y in )");
error = parser.parse().unwrapError();
assertEquals(ParseError.UNEXPECTED_TOKEN, error);
assertEquals(new Token(TokenType.RIGHT_PARENTHESIS, ")", 13), error.getCause());
}
@Test
void equality() {
EqualsVerifier.forClass(Token.class).usingGetClass().verify();
}
}