rename package

antlr5-maven-plugin/src/main/java/org/antlr/mojo/antlr5/Antlr5Mojo.java

@@ -8,7 +8,7 @@
 
 import org.antlr.v5.Tool;
 import org.antlr.v5.codegen.CodeGenerator;
-import org.antlr.v5.runtime._unused.misc.MultiMap;
+import org.antlr.v5.runtime.java._unused.misc.MultiMap;
 import org.antlr.v5.tool.Grammar;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;

runtime-testsuite/test/org/antlr/v5/test/runtime/java/JavaRunner.java

@@ -5,7 +5,6 @@
  */
 package org.antlr.v5.test.runtime.java;
 
-import org.antlr.v5.runtime.*;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.Lexer;
 import org.antlr.v5.runtime.core.Parser;
@@ -14,7 +13,8 @@
 import org.antlr.v5.runtime.core.atn.ProfilingATNSimulator;
 import org.antlr.v5.runtime.core.context.ParserRuleContext;
 import org.antlr.v5.runtime.core.tree.ParseTree;
-import org.antlr.v5.runtime.tree.ParseTreeWalker;
+import org.antlr.v5.runtime.java.DiagnosticErrorListener;
+import org.antlr.v5.runtime.java.tree.ParseTreeWalker;
 import org.antlr.v5.test.runtime.*;
 import org.antlr.v5.test.runtime.java.helpers.CustomStreamErrorListener;
 import org.antlr.v5.test.runtime.java.helpers.RuntimeTestLexer;

runtime-testsuite/test/org/antlr/v5/test/runtime/java/TestCharStreams.java

@@ -7,7 +7,7 @@
 package org.antlr.v5.test.runtime.java;
 
 import org.antlr.v5.runtime.core.CharStream;
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 

runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestTokenStream.java

@@ -5,7 +5,7 @@
  */
 package org.antlr.v5.test.runtime.java.api;
 
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.antlr.v5.runtime.core.*;
 import org.junit.jupiter.api.Test;
 

runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestTokenStreamRewriter.java

@@ -5,10 +5,11 @@
  */
 package org.antlr.v5.test.runtime.java.api;
 
-import org.antlr.v5.runtime.*;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.LexerInterpreter;
 import org.antlr.v5.runtime.core.misc.Interval;
+import org.antlr.v5.runtime.java.CharStreams;
+import org.antlr.v5.runtime.java.TokenStreamRewriter;
 import org.antlr.v5.tool.LexerGrammar;
 import org.junit.jupiter.api.Test;
 

runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestVisitors.java

@@ -5,14 +5,15 @@
  */
 package org.antlr.v5.test.runtime.java.api;
 
-import org.antlr.v5.runtime.BaseErrorListener;
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.BaseErrorListener;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.Recognizer;
 import org.antlr.v5.runtime.core.error.RecognitionException;
 import org.antlr.v5.runtime.core.tree.ErrorNode;
 import org.antlr.v5.runtime.core.tree.RuleNode;
 import org.antlr.v5.runtime.core.tree.TerminalNode;
+import org.antlr.v5.runtime.java.tree.AbstractParseTreeVisitor;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -108,7 +109,7 @@ protected String aggregateResult(String aggregate, String nextResult) {
 	/**
 	 * This test verifies that {@link AbstractParseTreeVisitor#visitChildren} does not call
 	 * {@link org.antlr.v5.runtime.tree.ParseTreeVisitor#visit} after
-	 * {@link org.antlr.v5.runtime.tree.AbstractParseTreeVisitor#shouldVisitNextChild} returns
+	 * {@link AbstractParseTreeVisitor#shouldVisitNextChild} returns
 	 * {@code false}.
 	 */
 	@Test

runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/perf/TimeLexerSpeed.java

@@ -6,7 +6,7 @@
 
 package org.antlr.v5.test.runtime.java.api.perf;
 
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.Lexer;

runtime-testsuite/test/org/antlr/v5/test/runtime/java/helpers/CustomStreamErrorListener.java

@@ -1,6 +1,6 @@
 package org.antlr.v5.test.runtime.java.helpers;
 
-import org.antlr.v5.runtime.BaseErrorListener;
+import org.antlr.v5.runtime.java.BaseErrorListener;
 import org.antlr.v5.runtime.core.error.RecognitionException;
 import org.antlr.v5.runtime.core.Recognizer;
 

runtime-testsuite/test/org/antlr/v5/test/runtime/states/jvm/JavaCompiledState.java

@@ -1,7 +1,7 @@
 package org.antlr.v5.test.runtime.states.jvm;
 
 import kotlin.Pair;
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.TokenStream;
 import org.antlr.v5.runtime.core.CommonTokenStream;

runtime/Java/src/main/java/org/antlr/v5/runtime/BailErrorStrategy.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/BailErrorStrategy.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.Parser;
 import org.antlr.v5.runtime.core.Token;

runtime/Java/src/main/java/org/antlr/v5/runtime/BaseErrorListener.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/BaseErrorListener.java

@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.atn.ATNConfigSet;
 import org.antlr.v5.runtime.core.Parser;

runtime/Java/src/main/java/org/antlr/v5/runtime/CharStreams.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/CharStreams.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.IntStream;

runtime/Java/src/main/java/org/antlr/v5/runtime/CodePointBuffer.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/CodePointBuffer.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

runtime/Java/src/main/java/org/antlr/v5/runtime/CodePointCharStream.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/CodePointCharStream.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.IntStream;
 import org.antlr.v5.runtime.core.CharStream;

runtime/Java/src/main/java/org/antlr/v5/runtime/ConsoleErrorListener.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/ConsoleErrorListener.java

@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.Recognizer;
 import org.antlr.v5.runtime.core.error.RecognitionException;

runtime/Java/src/main/java/org/antlr/v5/runtime/DiagnosticErrorListener.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/DiagnosticErrorListener.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.Parser;
 import org.antlr.v5.runtime.core.atn.ATNConfig;

runtime/Java/src/main/java/org/antlr/v5/runtime/ListTokenSource.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/ListTokenSource.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import kotlin.Pair;
 import org.antlr.v5.runtime.core.*;

runtime/Java/src/main/java/org/antlr/v5/runtime/TokenStreamRewriter.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/TokenStreamRewriter.java

@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.Token;
 import org.antlr.v5.runtime.core.TokenStream;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/misc/MultiMap.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/misc/MultiMap.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.misc;
+package org.antlr.v5.runtime.java._unused.misc;
 
 import kotlin.Pair;
 

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/Chunk.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/Chunk.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 /**
  * A chunk is either a token tag, a rule tag, or a span of literal text within a

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/ParseTreeMatch.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/ParseTreeMatch.java

@@ -4,9 +4,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
-import org.antlr.v5.runtime._unused.misc.MultiMap;
+import org.antlr.v5.runtime.java._unused.misc.MultiMap;
 import org.antlr.v5.runtime.core.tree.ParseTree;
 
 import java.util.Collections;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/ParseTreePattern.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/ParseTreePattern.java

@@ -4,9 +4,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
-import org.antlr.v5.runtime._unused.tree.xpath.XPath;
+import org.antlr.v5.runtime.java._unused.tree.xpath.XPath;
 import org.antlr.v5.runtime.core.tree.ParseTree;
 
 import java.util.ArrayList;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/ParseTreePatternCompiler.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/ParseTreePatternCompiler.java

@@ -1,4 +1,4 @@
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 import org.antlr.v5.runtime.core.Lexer;
 import org.antlr.v5.runtime.core.Parser;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/ParseTreePatternMatcher.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/ParseTreePatternMatcher.java

@@ -4,12 +4,12 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
-import org.antlr.v5.runtime.BailErrorStrategy;
-import org.antlr.v5.runtime.CharStreams;
-import org.antlr.v5.runtime.ListTokenSource;
-import org.antlr.v5.runtime._unused.misc.MultiMap;
+import org.antlr.v5.runtime.java.BailErrorStrategy;
+import org.antlr.v5.runtime.java.CharStreams;
+import org.antlr.v5.runtime.java.ListTokenSource;
+import org.antlr.v5.runtime.java._unused.misc.MultiMap;
 import org.antlr.v5.runtime.core.*;
 import org.antlr.v5.runtime.core.atn.ATN;
 import org.antlr.v5.runtime.core.context.ParserRuleContext;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/RuleTagToken.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/RuleTagToken.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.Token;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/TagChunk.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/TagChunk.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 /**
  * Represents a placeholder tag in a tree pattern. A tag can have any of the

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/TextChunk.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/TextChunk.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 /**
  * Represents a span of raw text (concrete syntax) between tags in a tree

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/pattern/TokenTagToken.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/pattern/TokenTagToken.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 import org.antlr.v5.runtime.core.Token;
 import org.antlr.v5.runtime.core.CommonToken;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPath.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPath.java

@@ -4,16 +4,16 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
-import org.antlr.v5.runtime.*;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.Token;
 import org.antlr.v5.runtime.core.context.ParserRuleContext;
 import org.antlr.v5.runtime.core.error.*;
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.Parser;
 import org.antlr.v5.runtime.core.tree.ParseTree;
+import org.antlr.v5.runtime.java.CharStreams;
 
 import java.io.IOException;
 import java.util.ArrayList;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathElement.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathElement.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathLexer.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathLexer.java

@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.*;
 import org.antlr.v5.runtime.core.atn.LexerATNSimulator;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathLexerErrorListener.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathLexerErrorListener.java

@@ -4,9 +4,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
-import org.antlr.v5.runtime.BaseErrorListener;
+import org.antlr.v5.runtime.java.BaseErrorListener;
 import org.antlr.v5.runtime.core.error.RecognitionException;
 import org.antlr.v5.runtime.core.Recognizer;
 

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathRuleAnywhereElement.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathRuleAnywhereElement.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.Trees;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathRuleElement.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathRuleElement.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.context.ParserRuleContext;
 import org.antlr.v5.runtime.core.tree.ParseTree;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathTokenAnywhereElement.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathTokenAnywhereElement.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.Trees;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathTokenElement.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathTokenElement.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.TerminalNode;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathWildcardAnywhereElement.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathWildcardAnywhereElement.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.Trees;

runtime/Java/src/main/java/org/antlr/v5/runtime/_unused/tree/xpath/XPathWildcardElement.java → runtime/Java/src/main/java/org/antlr/v5/runtime/java/_unused/tree/xpath/XPathWildcardElement.java

@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.Tree;