Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(#3706): Use Correct Token Names #3716

Merged
merged 3 commits into from
Dec 20, 2024
Merged

feat(#3706): Use Correct Token Names #3716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c68033
feat(#3706): remove puzzles
volodya-lombrozo Dec 20, 2024
bad3869
feat(#3706): use correct token names
volodya-lombrozo Dec 20, 2024
cfbf907
Merge branch 'master' into 3706_fix_token_names
volodya-lombrozo Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eo-parser/src/main/java/org/eolang/parser/EoIndentLexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private void emitDedent(final int shift) {
* @param type Type.
*/
private void emitToken(final int type) {
final CommonToken tkn = new CommonToken(type, this.getRuleNames()[type]);
final CommonToken tkn = new CommonToken(type, EoParser.VOCABULARY.getSymbolicName(type));
tkn.setLine(this.getLine() + 1);
this.tokens.offer(tkn);
}
Expand Down
21 changes: 0 additions & 21 deletions eo-parser/src/test/java/org/eolang/parser/EoIndentLexerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.cactoos.text.TextOf;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
Expand All @@ -47,17 +46,7 @@ public final class EoIndentLexerTest {
*/
public static final String TO_ADD_MESSAGE = "TO ADD ASSERTION MESSAGE";

/**
* Tests if the lexer emits a tab token with the correct name.
* @throws IOException In case if the input is invalid.
* @todo #3706:30min Fix the the name of the TAB token.
* Currently {@link EoIndentLexer} emits TAB token with the name 'ZERO' instead of 'TAB'.
* Fix the lexer to emit TAB token with the correct name.
* This problem affects lexer error messages.
* When this issue is fixed, remove the @Disabled annotation from the test.
*/
@Test
@Disabled
void emitsTabWithCorrectName() throws IOException {
MatcherAssert.assertThat(
"We expect the token to be a tab indentation with name 'TAB'",
Expand All @@ -66,17 +55,7 @@ void emitsTabWithCorrectName() throws IOException {
);
}

/**
* Tests if the lexer emits an untab token with the correct name.
* @throws IOException In case if the input is invalid.
* @todo #3706:30min Fix the the name of the UNTAB token.
* Currently {@link EoIndentLexer} emits UNTAB token with the name 'INT' instead of 'UNTAB'.
* Fix the lexer to emit UNTAB token with the correct name.
* This problem affects lexer error messages.
* When this issue is fixed, remove the @Disabled annotation from the test.
*/
@Test
@Disabled
void emitsUntabWithCorrectName() throws IOException {
MatcherAssert.assertThat(
"We expect the token to be an untab indentation with name 'UNTAB'",
Expand Down
Loading