bump version to 4.9.2

antlr · Mar 11, 2021 · cb4e59d · cb4e59d
1 parent 8d621b7
commit cb4e59d
Show file tree

Hide file tree

Showing 34 changed files with 49 additions and 38 deletions.
diff --git a/doc/releasing-antlr.md b/doc/releasing-antlr.md
@@ -24,18 +24,19 @@ $ git push upstream 4.9-rc1
 
 ## Copy PHP runtime over
 
-Bump version to 4.9 in `runtime/PHP/src/RuntimeMetaData.php` in separate repository and commit plus push.
+Bump version to 4.9 in `~/antlr/code/antlr-php-runtime/src/RuntimeMetaData.php` in separate repository and commit plus push.
 
 ```
-cd ~/antlr/code/antlr-php-runtime
-... vi src/RuntimeMetaData.php ...
+cd ~/antlr/code/antlr-php-runtime/src
+... vi RuntimeMetaData.php ...
 git commit -a -m "Update PHP Runtime to latest version"
 ```
 
 them back over in the ANTLR repo:
 
 ```
 cd runtime
+rm -rf PHP
 mkdir PHP
 cp ~/antlr/code/antlr-php-runtime/LICENSE PHP
 cp ~/antlr/code/antlr-php-runtime/README.md PHP
@@ -58,6 +59,7 @@ Edit the repository looking for 4.5 or whatever and update it. Bump version in t
  * runtime/PHP/src/RuntimeMetaData.php
  * runtime/JavaScript/package.json
  * runtime/JavaScript/src/antlr4/Recognizer.js
+ * runtime/JavaScript/package-lock.json
  * runtime/Cpp/VERSION
  * runtime/Cpp/runtime/src/RuntimeMetaData.cpp
  * runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
@@ -66,13 +68,19 @@ Edit the repository looking for 4.5 or whatever and update it. Bump version in t
  * runtime/Swift/Antlr4/org/antlr/v4/runtime/RuntimeMetaData.swift
  * runtime/Dart/lib/src/runtime_meta_data.dart
  * runtime/Dart/pubspec.yaml
+ * runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift
+ * runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift
+ * runtime/CSharp/src/Tree/Xpath/XPathLexer.cs
+ * runtime/CSharp/src/README.md
+ * runtime/CSharp/src/Properties/AssemblyInfo.cs
  * tool/src/org/antlr/v4/codegen/target/GoTarget.java
  * tool/src/org/antlr/v4/codegen/target/CppTarget.java
  * tool/src/org/antlr/v4/codegen/target/CSharpTarget.java
  * tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java
  * tool/src/org/antlr/v4/codegen/target/Python2Target.java
  * tool/src/org/antlr/v4/codegen/target/Python3Target.java
  * tool/src/org/antlr/v4/codegen/target/SwiftTarget.java
+ * tool/src/org/antlr/v4/codegen/target/PHPTarget.java
  * tool/src/org/antlr/v4/codegen/Target.java
  * tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg
 
@@ -82,9 +90,10 @@ Here is a simple script to display any line from the critical files with, say, `
 mvn clean
 rm -rf runtime/CSharp/src/bin
 rm -rf runtime/CSharp/src/obj
+rm -rf runtime/Cpp/runtime/build
 rm -rf runtime/gen
+rm -rf runtime/JavaScript/dist
 find tool runtime -type f -exec grep -l '4\.9' {} \;
-find runtime runtime -type f -exec grep -l '4\.9' {} \;
 ```
 
 Commit to repository.

diff --git a/runtime/CSharp/src/Antlr4.csproj b/runtime/CSharp/src/Antlr4.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Company>The ANTLR Organization</Company>
-    <Version>4.9.1</Version>
+    <Version>4.9.2</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
     <TargetFramework>netstandard2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591;CS1574;CS1580</NoWarn>

diff --git a/runtime/CSharp/src/Properties/AssemblyInfo.cs b/runtime/CSharp/src/Properties/AssemblyInfo.cs
@@ -6,4 +6,4 @@
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
-[assembly: AssemblyVersion("4.9.1")]
+[assembly: AssemblyVersion("4.9.2")]
diff --git a/runtime/CSharp/src/README.md b/runtime/CSharp/src/README.md
@@ -41,7 +41,7 @@ See the docs and the book to learn about writing lexer and parser grammars.
 ### Step 4: Generate the C# code
 
 This can be done either from the cmd line, or by adding a custom pre-build command in your project.
-At minimal, the cmd line should look as follows: ``java -jar antlr4-4.9.1.jar -Dlanguage=CSharp grammar.g4``
+At minimal, the cmd line should look as follows: ``java -jar antlr4-4.9.2.jar -Dlanguage=CSharp grammar.g4``
 This will generate the files, which you can then integrate in your project.
 This is just a quick start. The tool has many useful options to control generation, please refer to its documentation.
 

diff --git a/runtime/CSharp/src/Tree/Xpath/XPathLexer.cs b/runtime/CSharp/src/Tree/Xpath/XPathLexer.cs
@@ -24,7 +24,7 @@
 using Antlr4.Runtime.Misc;
 using DFA = Antlr4.Runtime.Dfa.DFA;
 
-[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.9.1")]
+[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.9.2")]
 [System.CLSCompliant(false)]
 public partial class XPathLexer : Lexer
 {

diff --git a/runtime/Cpp/VERSION b/runtime/Cpp/VERSION
@@ -1 +1 @@
-4.9.1
+4.9.2
diff --git a/runtime/Cpp/cmake/Antlr4Package.md b/runtime/Cpp/cmake/Antlr4Package.md
@@ -96,7 +96,7 @@ target_link_libraries( Parsertest PRIVATE
  find_package(antlr4-generator REQUIRED)
 
  # Set path to generator
- set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.9.1-complete.jar)
+ set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.9.2-complete.jar)
 
  # generate lexer
  antlr4_generate(

diff --git a/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake b/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
@@ -38,7 +38,7 @@ else()
     set(ANTLR4_SHARED_LIBRARIES
         ${ANTLR4_OUTPUT_DIR}/libantlr4-runtime.dll.a)
     set(ANTLR4_RUNTIME_LIBRARIES
-        ${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.9.1.dll)
+        ${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.9.2.dll)
   elseif(APPLE)
     set(ANTLR4_RUNTIME_LIBRARIES
         ${ANTLR4_OUTPUT_DIR}/libantlr4-runtime.dylib)

diff --git a/runtime/Cpp/cmake/FindANTLR.cmake b/runtime/Cpp/cmake/FindANTLR.cmake
@@ -2,7 +2,7 @@ find_package(Java QUIET COMPONENTS Runtime)
 
 if(NOT ANTLR_EXECUTABLE)
   find_program(ANTLR_EXECUTABLE
-               NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.9.1-complete.jar)
+               NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.9.2-complete.jar)
 endif()
 
 if(ANTLR_EXECUTABLE AND Java_JAVA_EXECUTABLE)

diff --git a/runtime/Cpp/cmake/README.md b/runtime/Cpp/cmake/README.md
@@ -31,7 +31,7 @@ include_directories(${ANTLR4_INCLUDE_DIRS})
 
 # set variable pointing to the antlr tool that supports C++
 # this is not required if the jar file can be found under PATH environment
-set(ANTLR_EXECUTABLE /home/user/antlr-4.9.1-complete.jar)
+set(ANTLR_EXECUTABLE /home/user/antlr-4.9.2-complete.jar)
 # add macros to generate ANTLR Cpp code from grammar
 find_package(ANTLR REQUIRED)
 

diff --git 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.9.1-complete.jar
+set LOCATION=antlr-4.9.2-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
@@ -7,7 +7,7 @@
 
 using namespace antlr4;
 
-const std::string RuntimeMetaData::VERSION = "4.9.1";
+const std::string RuntimeMetaData::VERSION = "4.9.2";
 
 std::string RuntimeMetaData::getRuntimeVersion() {
   return VERSION;

diff --git a/runtime/Dart/lib/src/runtime_meta_data.dart b/runtime/Dart/lib/src/runtime_meta_data.dart
@@ -66,7 +66,7 @@ class RuntimeMetaData {
   /// omitted, the {@code -} (hyphen-minus) appearing before it is also
   /// omitted.</li>
   /// </ul>
-  static final String VERSION = '4.9.1';
+  static final String VERSION = '4.9.2';
 
   /// Gets the currently executing version of the ANTLR 4 runtime library.
   ///

diff --git a/runtime/Dart/pubspec.yaml b/runtime/Dart/pubspec.yaml
@@ -1,5 +1,5 @@
 name: "antlr4"
-version: "4.9.1"
+version: "4.9.2"
 description: "New Dart runtime for ANTLR4."
 homepage: "https://github.com/antlr/antlr4"
 license: "BSD-3-Clause"

diff --git a/runtime/Go/antlr/recognizer.go b/runtime/Go/antlr/recognizer.go
@@ -49,7 +49,7 @@ var tokenTypeMapCache = make(map[string]int)
 var ruleIndexMapCache = make(map[string]int)
 
 func (b *BaseRecognizer) checkVersion(toolVersion string) {
-	runtimeVersion := "4.9.1"
+	runtimeVersion := "4.9.2"
 	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
@@ -67,7 +67,7 @@ public class RuntimeMetaData {
 	 * omitted.</li>
 	 * </ul>
 	 */
-	public static final String VERSION = "4.9.1";
+	public static final String VERSION = "4.9.2";
 
 	/**
 	 * Gets the currently executing version of the ANTLR 4 runtime library.

diff --git a/runtime/JavaScript/package-lock.json b/runtime/JavaScript/package-lock.json
diff --git a/runtime/JavaScript/package.json b/runtime/JavaScript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antlr4",
-  "version": "4.9.1",
+  "version": "4.9.2",
   "description": "JavaScript runtime for ANTLR4",
   "main": "src/antlr4/index.js",
   "repository": "antlr/antlr4.git",

diff --git a/runtime/JavaScript/src/antlr4/Recognizer.js b/runtime/JavaScript/src/antlr4/Recognizer.js
@@ -15,7 +15,7 @@ class Recognizer {
     }
 
     checkVersion(toolVersion) {
-        const runtimeVersion = "4.9.1";
+        const runtimeVersion = "4.9.2";
         if (runtimeVersion!==toolVersion) {
             console.log("ANTLR runtime and generated code versions disagree: "+runtimeVersion+"!="+toolVersion);
         }

diff --git a/runtime/Python2/setup.py b/runtime/Python2/setup.py
@@ -2,12 +2,12 @@
 
 setup(
     name='antlr4-python2-runtime',
-    version='4.9.1',
+    version='4.9.2',
     url='http://www.antlr.org',
     license='BSD',
     packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
     package_dir={'': 'src'},
     author='Eric Vergnaud, Terence Parr, Sam Harwell',
     author_email='eric.vergnaud@wanadoo.fr',
-    description='ANTLR 4.9.1 runtime for Python 2.7.12'
+    description='ANTLR 4.9.2 runtime for Python 2.7.12'
 )
diff --git a/runtime/Python2/src/antlr4/Recognizer.py b/runtime/Python2/src/antlr4/Recognizer.py
@@ -30,7 +30,7 @@ def extractVersion(self, version):
         return major, minor
 
     def checkVersion(self, toolVersion):
-        runtimeVersion = "4.9.1"
+        runtimeVersion = "4.9.2"
         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
@@ -2,7 +2,7 @@
 
 setup(
     name='antlr4-python3-runtime',
-    version='4.9.1',
+    version='4.9.2',
     packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
     package_dir={'': 'src'},
     install_requires=[
@@ -13,5 +13,5 @@
     author='Eric Vergnaud, Terence Parr, Sam Harwell',
     author_email='eric.vergnaud@wanadoo.fr',
     scripts=["bin/pygrun"],
-    description='ANTLR 4.9.1 runtime for Python 3.7'
+    description='ANTLR 4.9.2 runtime for Python 3.7'
 )
diff --git a/runtime/Python3/src/antlr4/Recognizer.py b/runtime/Python3/src/antlr4/Recognizer.py
@@ -34,7 +34,7 @@ def extractVersion(self, version):
         return major, minor
 
     def checkVersion(self, toolVersion):
-        runtimeVersion = "4.9.1"
+        runtimeVersion = "4.9.2"
         rvmajor, rvminor = self.extractVersion(runtimeVersion)
         tvmajor, tvminor = self.extractVersion(toolVersion)
         if rvmajor!=tvmajor or rvminor!=tvminor:

diff --git a/runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift b/runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift
@@ -63,7 +63,7 @@ public class RuntimeMetaData {
     /// omitted, the `-` (hyphen-minus) appearing before it is also
     /// omitted.
     /// 
-    public static let VERSION: String = "4.9.1"
+    public static let VERSION: String = "4.9.2"
 
     /// 
     /// Gets the currently executing version of the ANTLR 4 runtime library.

diff --git a/runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift b/runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift
@@ -18,12 +18,14 @@ class RuntimeMetaDataTests: XCTestCase {
         doGetMajorMinorVersionTest("4.8", "4.8")
         doGetMajorMinorVersionTest("4.9", "4.9")
         doGetMajorMinorVersionTest("4.9.1", "4.9")
+        doGetMajorMinorVersionTest("4.9.2", "4.9")
         doGetMajorMinorVersionTest("4-SNAPSHOT", "4")
         doGetMajorMinorVersionTest("4.-SNAPSHOT", "4.")
         doGetMajorMinorVersionTest("4.7-SNAPSHOT", "4.7")
         doGetMajorMinorVersionTest("4.7.1-SNAPSHOT", "4.7")
         doGetMajorMinorVersionTest("4.7.2-SNAPSHOT", "4.7")
         doGetMajorMinorVersionTest("4.9.1-SNAPSHOT", "4.9")
+        doGetMajorMinorVersionTest("4.9.2-SNAPSHOT", "4.9")
     }
 }
 

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
@@ -356,7 +356,7 @@ func getVocabulary() -> Vocabulary {
 
 override <accessLevelNotOpen(parser)>
 init(_ input:TokenStream) throws {
-    RuntimeMetaData.checkVersion("4.9.1", RuntimeMetaData.VERSION)
+    RuntimeMetaData.checkVersion("4.9.2", RuntimeMetaData.VERSION)
 	try super.init(input)
 	_interp = ParserATNSimulator(self,<p.name>._ATN,<p.name>._decisionToDFA, <parser.name>._sharedContextCache)
 }

diff --git a/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java b/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java
@@ -28,7 +28,7 @@ public CSharpTarget(CodeGenerator gen) {
 
     @Override
     public String getVersion() {
-        return "4.9.1";
+        return "4.9.2";
     }
 
 	@Override

diff --git a/tool/src/org/antlr/v4/codegen/target/CppTarget.java b/tool/src/org/antlr/v4/codegen/target/CppTarget.java
@@ -51,7 +51,7 @@ public CppTarget(CodeGenerator gen) {
 	}
 
 	public String getVersion() {
-		return "4.9.1";
+		return "4.9.2";
 	}
 
     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
@@ -71,7 +71,7 @@ public GoTarget(CodeGenerator gen) {
 
 	@Override
 	public String getVersion() {
-		return "4.9.1";
+		return "4.9.2";
 	}
 
 	public Set<String> getBadWords() {

diff --git a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java b/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java
@@ -51,7 +51,7 @@ public JavaScriptTarget(CodeGenerator gen) {
 
     @Override
     public String getVersion() {
-        return "4.9.1";
+        return "4.9.2";
     }
 
     public Set<String> getBadWords() {

diff --git a/tool/src/org/antlr/v4/codegen/target/PHPTarget.java b/tool/src/org/antlr/v4/codegen/target/PHPTarget.java
@@ -54,7 +54,7 @@ public PHPTarget(CodeGenerator gen) {
 
     @Override
     public String getVersion() {
-        return "4.9.1";
+        return "4.9.2";
     }
 
 	@Override

diff --git a/tool/src/org/antlr/v4/codegen/target/Python2Target.java b/tool/src/org/antlr/v4/codegen/target/Python2Target.java
@@ -95,7 +95,7 @@ public boolean supportsOverloadedMethods() {
 
 	@Override
 	public String getVersion() {
-		return "4.9.1";
+		return "4.9.2";
 	}
 
 	public Set<String> getBadWords() {

diff --git a/tool/src/org/antlr/v4/codegen/target/Python3Target.java b/tool/src/org/antlr/v4/codegen/target/Python3Target.java
@@ -97,7 +97,7 @@ public boolean supportsOverloadedMethods() {
 
 	@Override
 	public String getVersion() {
-		return "4.9.1";
+		return "4.9.2";
 	}
 
 	/** 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
@@ -87,7 +87,7 @@ public SwiftTarget(CodeGenerator gen) {
 
     @Override
     public String getVersion() {
-        return "4.9.1"; // Java and tool versions move in lock step
+        return "4.9.2"; // Java and tool versions move in lock step
     }
 
     public Set<String> getBadWords() {