diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs
index 580d104e3..40571ac14 100644
--- a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs
+++ b/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: AssemblyInformationalVersion("4.6.0")]
+[assembly: AssemblyFileVersion("4.6.1")]
+[assembly: AssemblyInformationalVersion("4.6.1")]
#endif
diff --git a/runtime/CSharp/runtime/CSharp/Package.nuspec b/runtime/CSharp/runtime/CSharp/Package.nuspec
index 40af53551..32b4fb7b9 100644
--- a/runtime/CSharp/runtime/CSharp/Package.nuspec
+++ b/runtime/CSharp/runtime/CSharp/Package.nuspec
@@ -2,7 +2,7 @@
Antlr4.Runtime.Standard
- 4.6.0
+ 4.6.1
en-us
ANTLR 4 Standard Runtime
The standard C# ANTLR 4 runtime from the ANTLR Organization
@@ -21,4 +21,4 @@
-
\ No newline at end of file
+
diff --git a/runtime/Cpp/VERSION b/runtime/Cpp/VERSION
index b3d791d75..8ac28bf9f 100644
--- a/runtime/Cpp/VERSION
+++ b/runtime/Cpp/VERSION
@@ -1 +1 @@
-4.6
+4.6.1
diff --git a/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake b/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
index eda023845..17ebf8db7 100644
--- a/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
+++ b/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}")
diff --git a/runtime/Cpp/demo/generate.cmd b/runtime/Cpp/demo/generate.cmd
index 390bceffd..20507eb76 100644
--- a/runtime/Cpp/demo/generate.cmd
+++ b/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
diff --git a/runtime/Cpp/runtime/src/RuntimeMetaData.cpp b/runtime/Cpp/runtime/src/RuntimeMetaData.cpp
index f5bdacac5..193861296 100755
--- a/runtime/Cpp/runtime/src/RuntimeMetaData.cpp
+++ b/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;
diff --git a/runtime/Go/antlr/recognizer.go b/runtime/Go/antlr/recognizer.go
index cdcc88a71..6c747c26f 100644
--- a/runtime/Go/antlr/recognizer.go
+++ b/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)
}
diff --git a/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java b/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java
index 9355d3196..86062da05 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java
@@ -67,7 +67,7 @@ public class RuntimeMetaData {
* omitted.
*
*/
- 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.
diff --git a/runtime/JavaScript/src/antlr4/Recognizer.js b/runtime/JavaScript/src/antlr4/Recognizer.js
index 3d38d3adf..eef01667a 100644
--- a/runtime/JavaScript/src/antlr4/Recognizer.js
+++ b/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);
}
diff --git a/runtime/JavaScript/src/antlr4/package.json b/runtime/JavaScript/src/antlr4/package.json
index 34a7e1eca..ad9e6eb3e 100644
--- a/runtime/JavaScript/src/antlr4/package.json
+++ b/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",
diff --git a/runtime/Python2/setup.py b/runtime/Python2/setup.py
index d37c63152..33ad2adc4 100644
--- a/runtime/Python2/setup.py
+++ b/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'
)
diff --git a/runtime/Python2/src/antlr4/Recognizer.py b/runtime/Python2/src/antlr4/Recognizer.py
index 052b7cf47..32135e882 100644
--- a/runtime/Python2/src/antlr4/Recognizer.py
+++ b/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:
diff --git a/runtime/Python3/setup.py b/runtime/Python3/setup.py
index 4257fbfd9..2833e9287 100644
--- a/runtime/Python3/setup.py
+++ b/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'
)
diff --git a/runtime/Python3/src/antlr4/Recognizer.py b/runtime/Python3/src/antlr4/Recognizer.py
index 199c0c07d..96f7355ca 100644
--- a/runtime/Python3/src/antlr4/Recognizer.py
+++ b/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:
diff --git a/runtime/Swift/Antlr4/org/antlr/v4/runtime/RuntimeMetaData.swift b/runtime/Swift/Antlr4/org/antlr/v4/runtime/RuntimeMetaData.swift
index 9d6215552..530b29305 100644
--- a/runtime/Swift/Antlr4/org/antlr/v4/runtime/RuntimeMetaData.swift
+++ b/runtime/Swift/Antlr4/org/antlr/v4/runtime/RuntimeMetaData.swift
@@ -66,7 +66,7 @@ public class RuntimeMetaData {
* omitted.
*
*/
- 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.
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg
index 9e2dc5391..64aa3e9c1 100755
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg
+++ b/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,
._ATN,._decisionToDFA, ._sharedContextCache)
}
diff --git a/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java b/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java
index 88d143824..c14c88723 100644
--- a/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java
+++ b/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
diff --git a/tool/src/org/antlr/v4/codegen/target/CppTarget.java b/tool/src/org/antlr/v4/codegen/target/CppTarget.java
index 14ac858a3..2b274f6c1 100644
--- a/tool/src/org/antlr/v4/codegen/target/CppTarget.java
+++ b/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; }
diff --git a/tool/src/org/antlr/v4/codegen/target/GoTarget.java b/tool/src/org/antlr/v4/codegen/target/GoTarget.java
index 678b532ac..1f4c373f8 100644
--- a/tool/src/org/antlr/v4/codegen/target/GoTarget.java
+++ b/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 getBadWords() {
diff --git a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java b/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java
index 455c488f6..3830b2b9e 100644
--- a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java
+++ b/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 getBadWords() {
diff --git a/tool/src/org/antlr/v4/codegen/target/Python2Target.java b/tool/src/org/antlr/v4/codegen/target/Python2Target.java
index 85cdb9c8a..cb203ac5a 100644
--- a/tool/src/org/antlr/v4/codegen/target/Python2Target.java
+++ b/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 getBadWords() {
diff --git a/tool/src/org/antlr/v4/codegen/target/Python3Target.java b/tool/src/org/antlr/v4/codegen/target/Python3Target.java
index e151ea014..598b2d3b9 100644
--- a/tool/src/org/antlr/v4/codegen/target/Python3Target.java
+++ b/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. */
diff --git a/tool/src/org/antlr/v4/codegen/target/SwiftTarget.java b/tool/src/org/antlr/v4/codegen/target/SwiftTarget.java
index b4db95490..b96d910ec 100644
--- a/tool/src/org/antlr/v4/codegen/target/SwiftTarget.java
+++ b/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 getBadWords() {