diff options
Diffstat (limited to 'src/test/java/no')
4 files changed, 10 insertions, 12 deletions
diff --git a/src/test/java/no/eliashaugsbakk/kompilator/IRGeneration/IRGeneratorTest.java b/src/test/java/no/eliashaugsbakk/kompilator/IRGeneration/IRGeneratorTest.java index 16ebc73..fdaab26 100644 --- a/src/test/java/no/eliashaugsbakk/kompilator/IRGeneration/IRGeneratorTest.java +++ b/src/test/java/no/eliashaugsbakk/kompilator/IRGeneration/IRGeneratorTest.java @@ -6,7 +6,7 @@ import java.util.List; import no.eliashaugsbakk.kompilator.parsing.AST; import no.eliashaugsbakk.kompilator.parsing.node.Program; import no.eliashaugsbakk.kompilator.parsing.node.expression.FunctionCall; -import no.eliashaugsbakk.kompilator.parsing.node.expression.StringLiteral; +import no.eliashaugsbakk.kompilator.parsing.node.expression.literal.StringLiteral; import no.eliashaugsbakk.kompilator.parsing.node.statement.ExpressionStatement; import org.junit.jupiter.api.Test; diff --git a/src/test/java/no/eliashaugsbakk/kompilator/parsing/ParserTest.java b/src/test/java/no/eliashaugsbakk/kompilator/parsing/ParserTest.java index ac31dfc..fcd47c7 100644 --- a/src/test/java/no/eliashaugsbakk/kompilator/parsing/ParserTest.java +++ b/src/test/java/no/eliashaugsbakk/kompilator/parsing/ParserTest.java @@ -4,13 +4,13 @@ import static no.eliashaugsbakk.kompilator.tokenization.TokenType.KEYWORD; import static no.eliashaugsbakk.kompilator.tokenization.TokenType.LPAREN; import static no.eliashaugsbakk.kompilator.tokenization.TokenType.RPAREN; import static no.eliashaugsbakk.kompilator.tokenization.TokenType.SEMICOLON; -import static no.eliashaugsbakk.kompilator.tokenization.TokenType.STRING; +import static no.eliashaugsbakk.kompilator.tokenization.TokenType.STRING_LITERAL; import static org.junit.jupiter.api.Assertions.*; import java.util.List; import no.eliashaugsbakk.kompilator.parsing.node.Program; import no.eliashaugsbakk.kompilator.parsing.node.expression.FunctionCall; -import no.eliashaugsbakk.kompilator.parsing.node.expression.StringLiteral; +import no.eliashaugsbakk.kompilator.parsing.node.expression.literal.StringLiteral; import no.eliashaugsbakk.kompilator.parsing.node.statement.ExpressionStatement; import no.eliashaugsbakk.kompilator.tokenization.Token; import org.junit.jupiter.api.Test; @@ -22,7 +22,7 @@ class ParserTest { List<Token> tokens = List.of( new Token(KEYWORD, "print", 1, 0), new Token(LPAREN, "(", 1, 5), - new Token(STRING, "Hello", 1, 6), + new Token(STRING_LITERAL, "Hello", 1, 6), new Token(RPAREN, ")", 1, 13), new Token(SEMICOLON, ";", 1, 14) ); @@ -49,7 +49,7 @@ class ParserTest { List<Token> tokens = List.of( new Token(KEYWORD, "print", 1, 0), new Token(LPAREN, "(", 1, 5), - new Token(STRING, "Hello", 1, 6), + new Token(STRING_LITERAL, "Hello", 1, 6), new Token(RPAREN, ")", 1, 13) ); @@ -60,7 +60,7 @@ class ParserTest { void missingParenthesisThrows() { List<Token> tokens = List.of( new Token(KEYWORD, "print", 1, 0), - new Token(STRING, "Hello", 1, 5), + new Token(STRING_LITERAL, "Hello", 1, 5), new Token(RPAREN, ")", 1, 12), new Token(SEMICOLON, ";", 1, 13) ); diff --git a/src/test/java/no/eliashaugsbakk/kompilator/semanticAnalysis/AnalyzerTest.java b/src/test/java/no/eliashaugsbakk/kompilator/semanticAnalysis/AnalyzerTest.java index e6cdafa..13827e4 100644 --- a/src/test/java/no/eliashaugsbakk/kompilator/semanticAnalysis/AnalyzerTest.java +++ b/src/test/java/no/eliashaugsbakk/kompilator/semanticAnalysis/AnalyzerTest.java @@ -6,7 +6,7 @@ import java.util.List; import no.eliashaugsbakk.kompilator.parsing.AST; import no.eliashaugsbakk.kompilator.parsing.node.Program; import no.eliashaugsbakk.kompilator.parsing.node.expression.FunctionCall; -import no.eliashaugsbakk.kompilator.parsing.node.expression.StringLiteral; +import no.eliashaugsbakk.kompilator.parsing.node.expression.literal.StringLiteral; import no.eliashaugsbakk.kompilator.parsing.node.statement.ExpressionStatement; import org.junit.jupiter.api.Test; diff --git a/src/test/java/no/eliashaugsbakk/kompilator/tokenization/LexerTest.java b/src/test/java/no/eliashaugsbakk/kompilator/tokenization/LexerTest.java index 4b7fd46..85241ef 100644 --- a/src/test/java/no/eliashaugsbakk/kompilator/tokenization/LexerTest.java +++ b/src/test/java/no/eliashaugsbakk/kompilator/tokenization/LexerTest.java @@ -5,7 +5,7 @@ import static no.eliashaugsbakk.kompilator.tokenization.TokenType.KEYWORD; import static no.eliashaugsbakk.kompilator.tokenization.TokenType.LPAREN; import static no.eliashaugsbakk.kompilator.tokenization.TokenType.RPAREN; import static no.eliashaugsbakk.kompilator.tokenization.TokenType.SEMICOLON; -import static no.eliashaugsbakk.kompilator.tokenization.TokenType.STRING; +import static no.eliashaugsbakk.kompilator.tokenization.TokenType.STRING_LITERAL; import static org.junit.jupiter.api.Assertions.*; import java.util.List; @@ -22,15 +22,13 @@ class LexerTest { Lexer lexer = new Lexer(input); List<Token> tokens = lexer.tokenize(); - // tokens.forEach(t-> IO.println(t.type + " : " + t.value)); - assertSame(KEYWORD, tokens.getFirst().type()); assertEquals(1, tokens.get(0).line()); - assertEquals(1, tokens.get(0).colum()); + assertEquals(1, tokens.get(0).column()); assertSame(LPAREN, tokens.get(1).type()); - assertSame(STRING, tokens.get(2).type()); + assertSame(STRING_LITERAL, tokens.get(2).type()); assertTrue(tokens.get(2).value().contains("Hello, World")); assertSame(RPAREN, tokens.get(3).type()); |