From 4e8a6bb2cd5b89e8ff5395ef6faed59fad4deded Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Fri, 15 Mar 2024 20:56:24 +0100 Subject: [PATCH] refactor --- .../test/org/antlr/v4/runtime/TestSuggestionHelper.java | 2 +- .../{TokenStateRecorder.java => TokenStatesRecorder.java} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename runtime/Java/src/org/antlr/v4/runtime/{TokenStateRecorder.java => TokenStatesRecorder.java} (90%) diff --git a/runtime-testsuite/test/org/antlr/v4/runtime/TestSuggestionHelper.java b/runtime-testsuite/test/org/antlr/v4/runtime/TestSuggestionHelper.java index e3cd88ef7b..407195e532 100644 --- a/runtime-testsuite/test/org/antlr/v4/runtime/TestSuggestionHelper.java +++ b/runtime-testsuite/test/org/antlr/v4/runtime/TestSuggestionHelper.java @@ -54,7 +54,7 @@ void matchesExpectation(Path expectations) throws Exception { lexer.setTokenFactory(CommonTokenWithStatesFactory.DEFAULT); TokenStream stream = new CommonTokenStream(lexer); JavaParser parser = new JavaParser(stream); - parser.setStateListener(new TokenStateRecorder(stream)); + parser.setStateListener(new TokenStatesRecorder(stream)); RuleContext context = parser.compilationUnit(); Pair contextsAndIntervals = parser.getExpectedTokensAt(context, expectation.line, expectation.column); Set actual = contextsAndIntervals.b.toSet().stream() diff --git a/runtime/Java/src/org/antlr/v4/runtime/TokenStateRecorder.java b/runtime/Java/src/org/antlr/v4/runtime/TokenStatesRecorder.java similarity index 90% rename from runtime/Java/src/org/antlr/v4/runtime/TokenStateRecorder.java rename to runtime/Java/src/org/antlr/v4/runtime/TokenStatesRecorder.java index 922c76a398..88e3ce05b6 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/TokenStateRecorder.java +++ b/runtime/Java/src/org/antlr/v4/runtime/TokenStatesRecorder.java @@ -6,10 +6,10 @@ /* we take advantage of the fact that each successful match is followed by a setState(int state) */ /* however there may be numerous setState following a match, so we only register the first state change */ -public class TokenStateRecorder implements StateListener { +public class TokenStatesRecorder implements StateListener { final TokenStream _tokenStream; - public TokenStateRecorder(TokenStream tokenStream) { + public TokenStatesRecorder(TokenStream tokenStream) { this._tokenStream = tokenStream; }