update to 4.11.1

Signed-off-by: Terence Parr <[email protected]>

Author: parrt

doc/getting-started.md

@@ -6,7 +6,7 @@ Hi and welcome to the version 4 release of ANTLR! It's named after the fearless
 
 ANTLR is really two things: a tool that translates your grammar to a parser/lexer in Java (or other target language) and the runtime needed by the generated parsers/lexers. Even if you are using the ANTLR Intellij plug-in or ANTLRWorks to run the ANTLR tool, the generated code will still need the runtime library. 
 
-The first thing you should do is probably download and install a development tool plug-in. Even if you only use such tools for editing, they are great. Then, follow the instructions below to get the runtime environment available to your system to run generated parsers/lexers.  In what follows, I talk about antlr-4.11.0-complete.jar, which has the tool and the runtime and any other support libraries (e.g., ANTLR v4 is written in v3).
+The first thing you should do is probably download and install a development tool plug-in. Even if you only use such tools for editing, they are great. Then, follow the instructions below to get the runtime environment available to your system to run generated parsers/lexers.  In what follows, I talk about antlr-4.11.1-complete.jar, which has the tool and the runtime and any other support libraries (e.g., ANTLR v4 is written in v3).
 
 If you are going to integrate ANTLR into your existing build system using mvn, ant, or want to get ANTLR into your IDE such as eclipse or intellij, see [Integrating ANTLR into Development Systems](https://github.com/antlr/antlr4/blob/master/doc/IDEs.md).
 
@@ -16,38 +16,38 @@ If you are going to integrate ANTLR into your existing build system using mvn, a
 1. Download
 ```
 $ cd /usr/local/lib
-$ curl -O https://www.antlr.org/download/antlr-4.11.0-complete.jar
+$ curl -O https://www.antlr.org/download/antlr-4.11.1-complete.jar
 ```
 Or just download in browser from website:
     [https://www.antlr.org/download.html](https://www.antlr.org/download.html)
 and put it somewhere rational like `/usr/local/lib`.
 
-if you are using lower version jdk, just download from [website download](https://github.com/antlr/website-antlr4/tree/gh-pages/download) for previous version, and antlr version before 4.11.0 support jdk 1.8  
+if you are using lower version jdk, just download from [website download](https://github.com/antlr/website-antlr4/tree/gh-pages/download) for previous version, and antlr version before 4.11.1 support jdk 1.8  
 
-2. Add `antlr-4.11.0-complete.jar` to your `CLASSPATH`:
+2. Add `antlr-4.11.1-complete.jar` to your `CLASSPATH`:
 ```
-$ export CLASSPATH=".:/usr/local/lib/antlr-4.11.0-complete.jar:$CLASSPATH"
+$ export CLASSPATH=".:/usr/local/lib/antlr-4.11.1-complete.jar:$CLASSPATH"
 ```
 It's also a good idea to put this in your `.bash_profile` or whatever your startup script is.
 
 3. Create aliases for the ANTLR Tool, and `TestRig`.
 ```
-$ alias antlr4='java -Xmx500M -cp "/usr/local/lib/antlr-4.11.0-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
-$ alias grun='java -Xmx500M -cp "/usr/local/lib/antlr-4.11.0-complete.jar:$CLASSPATH" org.antlr.v4.gui.TestRig'
+$ alias antlr4='java -Xmx500M -cp "/usr/local/lib/antlr-4.11.1-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
+$ alias grun='java -Xmx500M -cp "/usr/local/lib/antlr-4.11.1-complete.jar:$CLASSPATH" org.antlr.v4.gui.TestRig'
 ```
 
 ### WINDOWS
 
 (*Thanks to Graham Wideman*)
 
 0. Install Java (version 1.7 or higher)
-1. Download antlr-4.11.0-complete.jar (or whatever version) from [https://www.antlr.org/download.html](https://www.antlr.org/download.html)
+1. Download antlr-4.11.1-complete.jar (or whatever version) from [https://www.antlr.org/download.html](https://www.antlr.org/download.html)
 Save to your directory for 3rd party Java libraries, say `C:\Javalib`
-2. Add `antlr-4.11.0-complete.jar` to CLASSPATH, either:
+2. Add `antlr-4.11.1-complete.jar` to CLASSPATH, either:
   * Permanently: Using System Properties dialog > Environment variables > Create or append to `CLASSPATH` variable
   * Temporarily, at command line:
 ```
-SET CLASSPATH=.;C:\Javalib\antlr-4.11.0-complete.jar;%CLASSPATH%
+SET CLASSPATH=.;C:\Javalib\antlr-4.11.1-complete.jar;%CLASSPATH%
 ```
 3. Create short convenient commands for the ANTLR Tool, and TestRig, using batch files or doskey commands:
   * Batch files (in directory in system PATH) antlr4.bat and grun.bat
@@ -73,7 +73,7 @@ Either launch org.antlr.v4.Tool directly:
 
 ```
 $ java org.antlr.v4.Tool
-ANTLR Parser Generator Version 4.11.0
+ANTLR Parser Generator Version 4.11.1
 -o ___ specify output directory where all output is generated
 -lib ___ specify location of .tokens files
 ...
@@ -82,8 +82,8 @@ ANTLR Parser Generator Version 4.11.0
 or use -jar option on java:
 
 ```
-$ java -jar /usr/local/lib/antlr-4.11.0-complete.jar
-ANTLR Parser Generator Version 4.11.0
+$ java -jar /usr/local/lib/antlr-4.11.1-complete.jar
+ANTLR Parser Generator Version 4.11.1
 -o ___ specify output directory where all output is generated
 -lib ___ specify location of .tokens files
 ...

doc/releasing-antlr.md

@@ -80,8 +80,14 @@ We only have to copy the PHP runtime into the ANTLR repository to run the unitte
 ```
 cd ~/antlr/code/antlr-php-runtime/src
 git checkout dev # Should be the default
+git pull origin dev
 ... vi RuntimeMetaData.php ...
 git commit -a -m "Update PHP Runtime to latest version"
+git push origin dev
+git checkout master
+git pull origin master
+git merge dev
+git push origin master
 ```
 
 ## Build XPath parsers

doc/swift-target.md

@@ -131,7 +131,7 @@ Add Antlr4 as a dependency to your `Package.swift` file. For more information, p
 
 
 ```swift
-.package(name: "Antlr4", url: "https://github.com/antlr/antlr4", from: "4.11.0"
+.package(name: "Antlr4", url: "https://github.com/antlr/antlr4", from: "4.11.1"
 ```
 ## Swift access levels
 

docker/Dockerfile

@@ -2,7 +2,7 @@ FROM adoptopenjdk/openjdk11:alpine AS builder
 
 WORKDIR /opt/antlr4
 
-ARG ANTLR_VERSION="4.11.0"
+ARG ANTLR_VERSION="4.11.1"
 ARG MAVEN_OPTS="-Xmx1G"
 
 

runtime/CSharp/src/Antlr4.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Company>The ANTLR Organization</Company>
-    <Version>4.11.0</Version>
+    <Version>4.11.1</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
     <TargetFramework Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFramework>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;netstandard2.0</TargetFrameworks>

runtime/CSharp/src/Properties/AssemblyInfo.cs

@@ -6,4 +6,4 @@
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
-[assembly: AssemblyVersion("4.11.0")]
+[assembly: AssemblyVersion("4.11.1")]

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.11.0.jar -Dlanguage=CSharp grammar.g4``
+At minimal, the cmd line should look as follows: ``java -jar antlr4-4.11.1.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.
 

runtime/Cpp/VERSION

@@ -1 +1 @@
-4.11.0
+4.11.1

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.11.0-complete.jar)
+ set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.11.1-complete.jar)
 
  # generate lexer
  antlr4_generate(

runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake

@@ -46,7 +46,7 @@ else()
     set(ANTLR4_SHARED_LIBRARIES
         ${ANTLR4_OUTPUT_DIR}/libantlr4-runtime.dll.a)
     set(ANTLR4_RUNTIME_LIBRARIES
-        ${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.11.0.dll)
+        ${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.11.1.dll)
   elseif(APPLE)
     set(ANTLR4_RUNTIME_LIBRARIES
         ${ANTLR4_OUTPUT_DIR}/libantlr4-runtime.dylib)

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.11.0-complete.jar)
+               NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.11.1-complete.jar)
 endif()
 
 if(ANTLR_EXECUTABLE AND Java_JAVA_EXECUTABLE)

runtime/Cpp/cmake/README.md

@@ -29,8 +29,8 @@ set(ANTLR4_WITH_STATIC_CRT OFF)
 # By default the latest version of antlr4 will be used.  You can specify a
 # specific, stable version by setting a repository tag value or a link
 # to a zip file containing the libary source.
-# set(ANTLR4_TAG 4.11.0)
-# set(ANTLR4_ZIP_REPOSITORY https://github.com/antlr/antlr4/archive/refs/tags/4.11.0.zip)
+# set(ANTLR4_TAG 4.11.1)
+# set(ANTLR4_ZIP_REPOSITORY https://github.com/antlr/antlr4/archive/refs/tags/4.11.1.zip)
 
 # add external build for antlrcpp
 include(ExternalAntlr4Cpp)
@@ -39,7 +39,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.11.0-complete.jar)
+set(ANTLR_EXECUTABLE /home/user/antlr-4.11.1-complete.jar)
 # add macros to generate ANTLR Cpp code from grammar
 find_package(ANTLR REQUIRED)
 

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.11.0-complete.jar
+set LOCATION=antlr-4.11.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/Version.h

@@ -29,7 +29,7 @@
 
 #define ANTLRCPP_VERSION_MAJOR 4
 #define ANTLRCPP_VERSION_MINOR 11
-#define ANTLRCPP_VERSION_PATCH 0
+#define ANTLRCPP_VERSION_PATCH 1
 
 #define ANTLRCPP_MAKE_VERSION(major, minor, patch) ((major) * 100000 + (minor) * 1000 + (patch))
 

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.11.0';
+  static final String VERSION = '4.11.1';
 
   /// Gets the currently executing version of the ANTLR 4 runtime library.
   ///

runtime/Dart/pubspec.yaml

@@ -1,5 +1,5 @@
 name: "antlr4"
-version: "4.11.0"
+version: "4.11.1"
 description: "New Dart runtime for ANTLR4."
 homepage: "https://github.com/antlr/antlr4"
 license: "BSD-3-Clause"

runtime/Go/antlr/antlrdoc.go

@@ -27,7 +27,7 @@ Here is a general template for an ANTLR based recognizer in Go:
 	├── myproject
 	├── parser
 	│     ├── mygrammar.g4
-	│     ├── antlr-4.11.0-complete.jar
+	│     ├── antlr-4.11.1-complete.jar
 	│     ├── error_listeners.go
 	│     ├── generate.go
 	│     ├── generate.sh
@@ -47,7 +47,7 @@ And the generate.sh file will look similar to this:
 
 	#!/bin/sh
 
-	alias antlr4='java -Xmx500M -cp "./antlr4-4.11.0-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
+	alias antlr4='java -Xmx500M -cp "./antlr4-4.11.1-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
 	antlr4 -Dlanguage=Go -no-visitor -package tgram *.g4
 
 depending on whether you want visitors or listeners or any other ANTLR options.

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.11.0"
+	runtimeVersion := "4.11.1"
 	if runtimeVersion != toolVersion {
 		fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
 	}

runtime/Go/antlr/v4/antlrdoc.go

@@ -27,7 +27,7 @@ Here is a general template for an ANTLR based recognizer in Go:
 	├── myproject
 	├── parser
 	│     ├── mygrammar.g4
-	│     ├── antlr-4.11.0-complete.jar
+	│     ├── antlr-4.11.1-complete.jar
 	│     ├── error_listeners.go
 	│     ├── generate.go
 	│     ├── generate.sh
@@ -47,7 +47,7 @@ And the generate.sh file will look similar to this:
 
 	#!/bin/sh
 
-	alias antlr4='java -Xmx500M -cp "./antlr4-4.11.0-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
+	alias antlr4='java -Xmx500M -cp "./antlr4-4.11.1-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
 	antlr4 -Dlanguage=Go -no-visitor -package parser *.g4
 
 depending on whether you want visitors or listeners or any other ANTLR options.

runtime/Go/antlr/v4/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.11.0"
+	runtimeVersion := "4.11.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.11.1-SNAPSHOT";
+	public static final String VERSION = "4.11.1";
 
 	/**
 	 * Gets the currently executing version of the ANTLR 4 runtime library.

runtime/JavaScript/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "antlr4",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "type": "module",
   "description": "JavaScript runtime for ANTLR4",
   "main": "src/antlr4/index.js",

runtime/JavaScript/package.json

@@ -15,7 +15,7 @@ export default class Recognizer {
     }
 
     checkVersion(toolVersion) {
-        const runtimeVersion = "4.11.0";
+        const runtimeVersion = "4.11.1";
         if (runtimeVersion!==toolVersion) {
             console.log("ANTLR runtime and generated code versions disagree: "+runtimeVersion+"!="+toolVersion);
         }

runtime/JavaScript/src/antlr4/Recognizer.js

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-v = '4.11.0'
+v = '4.11.1'
 setup(
     name='antlr4-python2-runtime',
     version=v,

runtime/Python2/setup.py

@@ -30,7 +30,7 @@ def extractVersion(self, version):
         return major, minor
 
     def checkVersion(self, toolVersion):
-        runtimeVersion = "4.11.0"
+        runtimeVersion = "4.11.1"
         rvmajor, rvminor = self.extractVersion(runtimeVersion)
         tvmajor, tvminor = self.extractVersion(toolVersion)
         if rvmajor!=tvmajor or rvminor!=tvminor:

runtime/Python2/src/antlr4/Recognizer.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-v = '4.11.0'
+v = '4.11.1'
 
 setup(
     name='antlr4-python3-runtime',

runtime/Python3/setup.py

@@ -34,7 +34,7 @@ def extractVersion(self, version):
         return major, minor
 
     def checkVersion(self, toolVersion):
-        runtimeVersion = "4.11.0"
+        runtimeVersion = "4.11.1"
         rvmajor, rvminor = self.extractVersion(runtimeVersion)
         tvmajor, tvminor = self.extractVersion(toolVersion)
         if rvmajor!=tvmajor or rvminor!=tvminor:

runtime/Python3/src/antlr4/Recognizer.py

@@ -63,7 +63,7 @@ public class RuntimeMetaData {
     /// omitted, the `-` (hyphen-minus) appearing before it is also
     /// omitted.
     /// 
-    public static let VERSION: String = "4.11.0"
+    public static let VERSION: String = "4.11.1"
 
     /// 
     /// Gets the currently executing version of the ANTLR 4 runtime library.

runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift

@@ -31,7 +31,9 @@ class RuntimeMetaDataTests: XCTestCase {
         doGetMajorMinorVersionTest("4.10-SNAPSHOT", "4.10")
         doGetMajorMinorVersionTest("4.10.1", "4.10")
         doGetMajorMinorVersionTest("4.11.0", "4.11")
-        doGetMajorMinorVersionTest("4.11-SNAPSHOT", "4.11")
+        doGetMajorMinorVersionTest("4.11.1", "4.11")
+        doGetMajorMinorVersionTest("4.11.0-SNAPSHOT", "4.11")
+        doGetMajorMinorVersionTest("4.11.1-SNAPSHOT", "4.11")
     }
 }
 

runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift

@@ -8,6 +8,8 @@
 docker/Dockerfile
 runtime/Go/antlr/recognizer.go
 runtime/Go/antlr/v4/recognizer.go
+runtime/Go/antlr/v4/antlrdoc.go
+runtime/Go/antlr/antlrdoc.go
 runtime/Python3/setup.py
 runtime/Python3/src/antlr4/Recognizer.py
 runtime/Python2/setup.py
@@ -32,7 +34,6 @@ runtime/JavaScript/src/antlr4/Recognizer.js
 
 # Allow doc files to have multiple values updated
 * doc/swift-target.md
-* doc/dart-target.md
 # doc/releasing-antlr.md
 * doc/getting-started.md
 * doc/swift-target.md