Merge pull request #1563 from parrt/bump-to-4.6.1

bump version to 4.6.1 in all files.

runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs

@@ -42,8 +42,8 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.6.0")]
+[assembly: AssemblyVersion("4.6.1")]
 #if !COMPACT
-[assembly: AssemblyFileVersion("4.6.0")]
+[assembly: AssemblyFileVersion("4.6.1")]
-[assembly: AssemblyInformationalVersion("4.6.0")]
+[assembly: AssemblyInformationalVersion("4.6.1")]
 #endif

runtime/CSharp/runtime/CSharp/Package.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Antlr4.Runtime.Standard</id>
-    <version>4.6.0</version>
+    <version>4.6.1</version>
      <language>en-us</language>
     <title>ANTLR 4 Standard Runtime</title>
     <description>The standard C# ANTLR 4 runtime from the ANTLR Organization</description>

runtime/Cpp/VERSION

@@ -1 +1 @@
-4.6
+4.6.1

runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake

@@ -66,7 +66,7 @@ set(ANTLR4CPP_EXTERNAL_ROOT ${CMAKE_BINARY_DIR}/externals/antlr4cpp)
 # external repository
 # GIT_REPOSITORY     https://github.com/antlr/antlr4.git
 set(ANTLR4CPP_EXTERNAL_REPO "https://github.com/antlr/antlr4.git")
-set(ANTLR4CPP_EXTERNAL_TAG  "4.6-rc1")
+set(ANTLR4CPP_EXTERNAL_TAG  "4.6.1")
 
 if(NOT EXISTS "${ANTLR4CPP_JAR_LOCATION}")
   message(FATAL_ERROR "Unable to find antlr tool. ANTLR4CPP_JAR_LOCATION:${ANTLR4CPP_JAR_LOCATION}")

runtime/Cpp/demo/generate.cmd

@@ -6,7 +6,7 @@
 
 :: Download the ANLTR jar and place it in the same folder as this script (or adjust the LOCATION var accordingly).
 
-set LOCATION=antlr-4.6-complete.jar
+set LOCATION=antlr-4.6.1-complete.jar
 java -jar %LOCATION% -Dlanguage=Cpp -listener -visitor -o generated/ -package antlrcpptest TLexer.g4 TParser.g4
 ::java -jar %LOCATION% -Dlanguage=Cpp -listener -visitor -o generated/ -package antlrcpptest -XdbgST TLexer.g4 TParser.g4
 ::java -jar %LOCATION% -Dlanguage=Java -listener -visitor -o generated/ -package antlrcpptest TLexer.g4 TParser.g4

runtime/Cpp/runtime/src/RuntimeMetaData.cpp

@@ -7,7 +7,7 @@
 
 using namespace antlr4;
 
-const std::string RuntimeMetaData::VERSION = "4.6";
+const std::string RuntimeMetaData::VERSION = "4.6.1";
 
 std::string RuntimeMetaData::getRuntimeVersion() {
   return VERSION;

runtime/Go/antlr/recognizer.go

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

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

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

runtime/JavaScript/src/antlr4/Recognizer.js

@@ -21,7 +21,7 @@ Recognizer.ruleIndexMapCache = {};
 
 
 Recognizer.prototype.checkVersion = function(toolVersion) {
-    var runtimeVersion = "4.6";
+    var runtimeVersion = "4.6.1";
     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.6.0",
+  "version": "4.6.1",
   "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.6',
+    version='4.6.1',
     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.6 runtime for Python 2.7.6'
+    description='ANTLR 4.6.1 runtime for Python 2.7.6'
 )

runtime/Python2/src/antlr4/Recognizer.py

@@ -30,7 +30,7 @@ class Recognizer(object):
         return major, minor
 
     def checkVersion(self, toolVersion):
-        runtimeVersion = "4.6"
+        runtimeVersion = "4.6.1"
         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.6',
+    version='4.6.1',
     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.6 runtime for Python 3.4.0'
+    description='ANTLR 4.6.1 runtime for Python 3.4.0'
 )

runtime/Python3/src/antlr4/Recognizer.py

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

runtime/Swift/Antlr4/org/antlr/v4/runtime/RuntimeMetaData.swift

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

tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg

@@ -362,7 +362,7 @@ open override func getVocabulary() -> Vocabulary {
 }
 
 public override init(_ input:TokenStream)throws {
-    RuntimeMetaData.checkVersion("4.6", RuntimeMetaData.VERSION)
+    RuntimeMetaData.checkVersion("4.6.1", RuntimeMetaData.VERSION)
 	try super.init(input)
 	_interp = ParserATNSimulator(self,<p.name>._ATN,<p.name>._decisionToDFA, <parser.name>._sharedContextCache)
 }

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

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

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

@@ -49,7 +49,7 @@ public class CppTarget extends Target {
 	}
 
 	public String getVersion() {
-		return "4.6";
+		return "4.6.1";
 	}
 
     public boolean needsHeader() { return true; }

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

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

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

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

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

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

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

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

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

@@ -86,7 +86,7 @@ public class SwiftTarget extends Target {
 
     @Override
     public String getVersion() {
-        return "4.6"; // Java and tool versions move in lock step
+        return "4.6.1"; // Java and tool versions move in lock step
     }
 
     public Set<String> getBadWords() {