From 9d0bfc4a242551501d6be357a6f6f9b190462028 Mon Sep 17 00:00:00 2001 From: Ghislain Fourny Date: Thu, 21 Dec 2023 11:04:05 +0100 Subject: [PATCH] Upgrade to AntLR 4.9.3. --- pom.xml | 2 +- .../rumbledb/parser/JsoniqBaseVisitor.java | 2 +- .../java/org/rumbledb/parser/JsoniqLexer.java | 4 +-- .../org/rumbledb/parser/JsoniqParser.java | 4 +-- .../org/rumbledb/parser/JsoniqVisitor.java | 2 +- .../java/org/rumbledb/parser/XQueryLexer.java | 4 +-- .../org/rumbledb/parser/XQueryParser.java | 29 ++++++------------- .../parser/XQueryParserBaseVisitor.java | 2 +- .../rumbledb/parser/XQueryParserVisitor.java | 2 +- 9 files changed, 20 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 991bcd648c..aeb0a23d9a 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,7 @@ org.antlr antlr4-runtime - 4.8 + 4.9.3 org.jline diff --git a/src/main/java/org/rumbledb/parser/JsoniqBaseVisitor.java b/src/main/java/org/rumbledb/parser/JsoniqBaseVisitor.java index 2944705596..378b338ba7 100644 --- a/src/main/java/org/rumbledb/parser/JsoniqBaseVisitor.java +++ b/src/main/java/org/rumbledb/parser/JsoniqBaseVisitor.java @@ -1,4 +1,4 @@ -// Generated from ./src/main/java/org/rumbledb/parser/Jsoniq.g4 by ANTLR 4.8 +// Generated from ./src/main/java/org/rumbledb/parser/Jsoniq.g4 by ANTLR 4.9.3 // Java header package org.rumbledb.parser; diff --git a/src/main/java/org/rumbledb/parser/JsoniqLexer.java b/src/main/java/org/rumbledb/parser/JsoniqLexer.java index 888f964a1d..10855f70de 100644 --- a/src/main/java/org/rumbledb/parser/JsoniqLexer.java +++ b/src/main/java/org/rumbledb/parser/JsoniqLexer.java @@ -1,4 +1,4 @@ -// Generated from ./src/main/java/org/rumbledb/parser/Jsoniq.g4 by ANTLR 4.8 +// Generated from ./src/main/java/org/rumbledb/parser/Jsoniq.g4 by ANTLR 4.9.3 // Java header package org.rumbledb.parser; @@ -16,7 +16,7 @@ @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JsoniqLexer extends Lexer { - static { RuntimeMetaData.checkVersion("4.8", RuntimeMetaData.VERSION); } + static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); } protected static final DFA[] _decisionToDFA; protected static final PredictionContextCache _sharedContextCache = diff --git a/src/main/java/org/rumbledb/parser/JsoniqParser.java b/src/main/java/org/rumbledb/parser/JsoniqParser.java index 299fcb8a32..f68fcbf4c0 100644 --- a/src/main/java/org/rumbledb/parser/JsoniqParser.java +++ b/src/main/java/org/rumbledb/parser/JsoniqParser.java @@ -1,4 +1,4 @@ -// Generated from ./src/main/java/org/rumbledb/parser/Jsoniq.g4 by ANTLR 4.8 +// Generated from ./src/main/java/org/rumbledb/parser/Jsoniq.g4 by ANTLR 4.9.3 // Java header package org.rumbledb.parser; @@ -25,7 +25,7 @@ @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JsoniqParser extends Parser { - static { RuntimeMetaData.checkVersion("4.8", RuntimeMetaData.VERSION); } + static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); } protected static final DFA[] _decisionToDFA; protected static final PredictionContextCache _sharedContextCache = diff --git a/src/main/java/org/rumbledb/parser/JsoniqVisitor.java b/src/main/java/org/rumbledb/parser/JsoniqVisitor.java index e4a5acf0df..b774486780 100644 --- a/src/main/java/org/rumbledb/parser/JsoniqVisitor.java +++ b/src/main/java/org/rumbledb/parser/JsoniqVisitor.java @@ -1,4 +1,4 @@ -// Generated from ./src/main/java/org/rumbledb/parser/Jsoniq.g4 by ANTLR 4.8 +// Generated from ./src/main/java/org/rumbledb/parser/Jsoniq.g4 by ANTLR 4.9.3 // Java header package org.rumbledb.parser; diff --git a/src/main/java/org/rumbledb/parser/XQueryLexer.java b/src/main/java/org/rumbledb/parser/XQueryLexer.java index 8429e5ce88..7e03a5a610 100644 --- a/src/main/java/org/rumbledb/parser/XQueryLexer.java +++ b/src/main/java/org/rumbledb/parser/XQueryLexer.java @@ -1,4 +1,4 @@ -// Generated from ./src/main/java/org/rumbledb/parser/XQueryLexer.g4 by ANTLR 4.8 +// Generated from ./src/main/java/org/rumbledb/parser/XQueryLexer.g4 by ANTLR 4.9.3 // Java header package org.rumbledb.parser; @@ -18,7 +18,7 @@ @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class XQueryLexer extends Lexer { - static { RuntimeMetaData.checkVersion("4.8", RuntimeMetaData.VERSION); } + static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); } protected static final DFA[] _decisionToDFA; protected static final PredictionContextCache _sharedContextCache = diff --git a/src/main/java/org/rumbledb/parser/XQueryParser.java b/src/main/java/org/rumbledb/parser/XQueryParser.java index af62b9768d..f737166a85 100644 --- a/src/main/java/org/rumbledb/parser/XQueryParser.java +++ b/src/main/java/org/rumbledb/parser/XQueryParser.java @@ -1,31 +1,20 @@ -// Generated from ./src/main/java/org/rumbledb/parser/XQueryParser.g4 by ANTLR 4.8 +// Generated from ./src/main/java/org/rumbledb/parser/XQueryParser.g4 by ANTLR 4.9.3 // Java header package org.rumbledb.parser; -import java.util.ArrayList; -import java.util.List; - -import org.antlr.v4.runtime.NoViableAltException; -import org.antlr.v4.runtime.Parser; -import org.antlr.v4.runtime.ParserRuleContext; -import org.antlr.v4.runtime.RecognitionException; -import org.antlr.v4.runtime.RuntimeMetaData; -import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.TokenStream; -import org.antlr.v4.runtime.Vocabulary; -import org.antlr.v4.runtime.VocabularyImpl; -import org.antlr.v4.runtime.atn.ATN; -import org.antlr.v4.runtime.atn.ATNDeserializer; -import org.antlr.v4.runtime.atn.ParserATNSimulator; -import org.antlr.v4.runtime.atn.PredictionContextCache; +import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; -import org.antlr.v4.runtime.tree.ParseTreeVisitor; -import org.antlr.v4.runtime.tree.TerminalNode; +import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.misc.*; +import org.antlr.v4.runtime.tree.*; +import java.util.List; +import java.util.Iterator; +import java.util.ArrayList; @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class XQueryParser extends Parser { - static { RuntimeMetaData.checkVersion("4.8", RuntimeMetaData.VERSION); } + static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); } protected static final DFA[] _decisionToDFA; protected static final PredictionContextCache _sharedContextCache = diff --git a/src/main/java/org/rumbledb/parser/XQueryParserBaseVisitor.java b/src/main/java/org/rumbledb/parser/XQueryParserBaseVisitor.java index bef7ecec8e..f41ea731a7 100644 --- a/src/main/java/org/rumbledb/parser/XQueryParserBaseVisitor.java +++ b/src/main/java/org/rumbledb/parser/XQueryParserBaseVisitor.java @@ -1,4 +1,4 @@ -// Generated from ./src/main/java/org/rumbledb/parser/XQueryParser.g4 by ANTLR 4.8 +// Generated from ./src/main/java/org/rumbledb/parser/XQueryParser.g4 by ANTLR 4.9.3 // Java header package org.rumbledb.parser; diff --git a/src/main/java/org/rumbledb/parser/XQueryParserVisitor.java b/src/main/java/org/rumbledb/parser/XQueryParserVisitor.java index c730984360..d8dafaa785 100644 --- a/src/main/java/org/rumbledb/parser/XQueryParserVisitor.java +++ b/src/main/java/org/rumbledb/parser/XQueryParserVisitor.java @@ -1,4 +1,4 @@ -// Generated from ./src/main/java/org/rumbledb/parser/XQueryParser.g4 by ANTLR 4.8 +// Generated from ./src/main/java/org/rumbledb/parser/XQueryParser.g4 by ANTLR 4.9.3 // Java header package org.rumbledb.parser;