diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-12-14 15:31:48 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-12-14 17:39:26 +0100 |
| commit | b35713ae9a32184a002be8431d49a52db1c47a34 (patch) | |
| tree | 08e92865c98eb8adc4bd908ef9259a8bcfaebd73 /container-search/src/main/java/com/yahoo/search | |
| parent | 2b2334c29f65f476240a13056bfd6061dbebc1ab (diff) | |
Upgrade Antlr4 to 4.9.3
Remove tokens that are empty in lexer definition
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java b/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java index c7c4b2885d2..df582ee8141 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java @@ -51,9 +51,9 @@ import com.yahoo.search.yql.yqlplusParser.StatementContext; import com.yahoo.search.yql.yqlplusParser.TimeoutContext; import com.yahoo.search.yql.yqlplusParser.UnaryExpressionContext; import com.yahoo.search.yql.yqlplusParser.WhereContext; -import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.RecognitionException; @@ -78,13 +78,11 @@ import java.util.Set; final class ProgramParser { public yqlplusParser prepareParser(String programName, InputStream input) throws IOException { - //TODO ANTLRInputStream goes away on 4.7, so must use CharStreams.fromXXX() when upgrading - return prepareParser(programName, new CaseInsensitiveCharStream(new ANTLRInputStream(input))); + return prepareParser(programName, new CaseInsensitiveCharStream(CharStreams.fromStream(input))); } public yqlplusParser prepareParser(String programName, String input) throws IOException { - //TODO ANTLRInputStream goes away on 4.7, so must use CharStreams.fromXXX() when upgrading - return prepareParser(programName, new CaseInsensitiveCharStream(new ANTLRInputStream(input))); + return prepareParser(programName, new CaseInsensitiveCharStream(CharStreams.fromString(input))); } private static class ErrorListener extends BaseErrorListener { |