Set version in code to 4.6.

runtime/Go/antlr/recognizer.go

@@ -45,7 +45,7 @@ var tokenTypeMapCache = make(map[string]int)
 var ruleIndexMapCache = make(map[string]int)
 
 func (b *BaseRecognizer) checkVersion(toolVersion string) {
-	runtimeVersion := "4.5.2"
+	runtimeVersion := "4.6"
 	if runtimeVersion != toolVersion {
 		fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
 	}

runtime/Java/pom.xml

@@ -16,7 +16,7 @@
       <plugin>
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-maven-plugin</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
         <executions>
           <execution>
             <id>antlr</id>

runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java

@@ -91,7 +91,7 @@ public class RuntimeMetaData {
 	 * omitted.</li>
 	 * </ul>
 	 */
-	public static final String VERSION = "4.5.3";
+	public static final String VERSION = "4.6";
 
 	/**
 	 * Gets the currently executing version of the ANTLR 4 runtime library.

runtime/JavaScript/src/antlr4/Recognizer.js

@@ -45,7 +45,7 @@ Recognizer.ruleIndexMapCache = {};
 
 
 Recognizer.prototype.checkVersion = function(toolVersion) {
-    var runtimeVersion = "4.5.3";
+    var runtimeVersion = "4.6";
     if (runtimeVersion!==toolVersion) {
         console.log("ANTLR runtime and generated code versions disagree: "+runtimeVersion+"!="+toolVersion);
     }

runtime/JavaScript/src/antlr4/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antlr4",
-  "version": "4.5.3",
+  "version": "4.6",
   "description": "JavaScript runtime for ANTLR4",
   "main": "src/antlr4/index.js",
   "repository": "antlr/antlr4.git",

runtime/Python2/setup.py

@@ -2,12 +2,12 @@ from distutils.core import setup
 
 setup(
     name='antlr4-python2-runtime',
-    version='4.5.3',
+    version='4.6',
     packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
     package_dir={'': 'src'},
     url='http://www.antlr.org',
     license='BSD',
     author='Eric Vergnaud, Terence Parr, Sam Harwell',
     author_email='eric.vergnaud@wanadoo.fr',
-    description='ANTLR 4.5.3 runtime for Python 2.7.6'
+    description='ANTLR 4.6 runtime for Python 2.7.6'
 )

runtime/Python2/src/antlr4/Recognizer.py

@@ -55,7 +55,7 @@ class Recognizer(object):
         return major, minor
 
     def checkVersion(self, toolVersion):
-        runtimeVersion = "4.5.3"
+        runtimeVersion = "4.6"
         rvmajor, rvminor = self.extractVersion(runtimeVersion)
         tvmajor, tvminor = self.extractVersion(toolVersion)
         if rvmajor!=tvmajor or rvminor!=tvminor:

runtime/Python3/setup.py

@@ -2,12 +2,12 @@ from distutils.core import setup
 
 setup(
     name='antlr4-python3-runtime',
-    version='4.5.3',
+    version='4.6',
     packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
     package_dir={'': 'src'},
     url='http://www.antlr.org',
     license='BSD',
     author='Eric Vergnaud, Terence Parr, Sam Harwell',
     author_email='eric.vergnaud@wanadoo.fr',
-    description='ANTLR 4.5.3 runtime for Python 3.4.0'
+    description='ANTLR 4.6 runtime for Python 3.4.0'
 )

runtime/Python3/src/antlr4/Recognizer.py

@@ -58,7 +58,7 @@ class Recognizer(object):
         return major, minor
 
     def checkVersion(self, toolVersion):
-        runtimeVersion = "4.5.3"
+        runtimeVersion = "4.6"
         rvmajor, rvminor = self.extractVersion(runtimeVersion)
         tvmajor, tvminor = self.extractVersion(toolVersion)
         if rvmajor!=tvmajor or rvminor!=tvminor:

runtime/Python3/src/antlr4/xpath/XPath.py

@@ -42,20 +42,19 @@
 # <p>
 # Whitespace is not allowed.</p>
 #
-from xmlrpc.client import boolean
+from antlr4 import CommonTokenStream, DFA, PredictionContextCache, Lexer, LexerATNSimulator
-from antlr4 import CommonTokenStream, DFA, PredictionContextCache, Lexer, LexerATNSimulator, ParserRuleContext, TerminalNode
 from antlr4.InputStream import InputStream
 from antlr4.Parser import Parser
 from antlr4.RuleContext import RuleContext
 from antlr4.Token import Token
+from antlr4.atn.ATNDeserializer import ATNDeserializer
 from antlr4.error.ErrorListener import ErrorListener
 from antlr4.error.Errors import LexerNoViableAltException
 from antlr4.tree.Tree import ParseTree
 from antlr4.tree.Trees import Trees
-from antlr4.atn.ATNDeserializer import ATNDeserializer
-
 from io import StringIO
 
+
 def serializedATN():
     with StringIO() as buf:
         buf.write("\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2\n")
@@ -115,7 +114,7 @@ class XPathLexer(Lexer):
 
     def __init__(self, input=None):
         super().__init__(input)
-        self.checkVersion("4.5")
+        self.checkVersion("4.6")
         self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
         self._actions = None
         self._predicates = None

runtime/Python3/test/parser/clexer.py

@@ -792,7 +792,7 @@ class CLexer(Lexer):
 
     def __init__(self, input=None):
         super().__init__(input)
-        self.checkVersion("4.5.1")
+        self.checkVersion("4.6")
         self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
         self._actions = None
         self._predicates = None

runtime/Python3/test/parser/cparser.py

@@ -915,7 +915,7 @@ class CParser ( Parser ):
 
     def __init__(self, input:TokenStream):
         super().__init__(input)
-        self.checkVersion("4.5.1")
+        self.checkVersion("4.6")
         self._interp = ParserATNSimulator(self, self.atn, self.decisionsToDFA, self.sharedContextCache)
         self._predicates = None
 

tool/src/org/antlr/v4/codegen/target/CSharpTarget.java

@@ -51,7 +51,7 @@ public class CSharpTarget extends Target {
 
     @Override
     public String getVersion() {
-        return "4.5.3";
+        return "4.6";
     }
 
 	@Override

tool/src/org/antlr/v4/codegen/target/GoTarget.java

@@ -54,7 +54,7 @@ public class GoTarget extends Target {
 
     @Override
     public String getVersion() {
-		return "4.5.2";
+		return "4.6";
 	}
 
     public Set<String> getBadWords() {

tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java

@@ -74,7 +74,7 @@ public class JavaScriptTarget extends Target {
 
     @Override
     public String getVersion() {
-        return "4.5.3";
+        return "4.6";
     }
 
     public Set<String> getBadWords() {

tool/src/org/antlr/v4/codegen/target/Python2Target.java

@@ -117,7 +117,7 @@ public class Python2Target extends Target {
 
 	@Override
 	public String getVersion() {
-		return "4.5.3";
+		return "4.6";
 	}
 
 	public Set<String> getBadWords() {

tool/src/org/antlr/v4/codegen/target/Python3Target.java

@@ -119,7 +119,7 @@ public class Python3Target extends Target {
 
 	@Override
 	public String getVersion() {
-		return "4.5.3";
+		return "4.6";
 	}
 
 	/** Avoid grammar symbols in this set to prevent conflicts in gen'd code. */