Skip to content

Commit b91cecf

Browse files
committed
Update 4.13.1 -> 4.13.2
1 parent 35ff30d commit b91cecf

File tree

28 files changed

+51
-50
lines changed

28 files changed

+51
-50
lines changed

doc/getting-started.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ That command creates `antlr4` and `antlr4-parse` executables that, if necessary,
1414

1515
```bash
1616
$ antlr4
17-
Downloading antlr4-4.13.1-complete.jar
17+
Downloading antlr4-4.13.2-complete.jar
1818
ANTLR tool needs Java to run; install Java JRE 11 yes/no (default yes)? y
1919
Installed Java in /Users/parrt/.jre/jdk-11.0.15+10-jre; remove that dir to uninstall
20-
ANTLR Parser Generator Version 4.13.1
20+
ANTLR Parser Generator Version 4.13.2
2121
-o ___ specify output directory where all output is generated
2222
-lib ___ specify location of grammars, tokens files
2323
...
@@ -130,7 +130,7 @@ ExprBaseListener.h ExprLexer.h ExprListener.h ExprParser.h
130130

131131
ANTLR is really two things: a tool written in Java that translates your grammar to a parser/lexer in Java (or other target language) and the runtime library 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.
132132

133-
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.13.1-complete.jar, which has the tool and the runtime and any other support libraries (e.g., ANTLR v4 is written in v3).
133+
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.13.2-complete.jar, which has the tool and the runtime and any other support libraries (e.g., ANTLR v4 is written in v3).
134134

135135
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).
136136

@@ -140,38 +140,38 @@ If you are going to integrate ANTLR into your existing build system using mvn, a
140140
1. Download
141141
```
142142
$ cd /usr/local/lib
143-
$ curl -O https://www.antlr.org/download/antlr-4.13.1-complete.jar
143+
$ curl -O https://www.antlr.org/download/antlr-4.13.2-complete.jar
144144
```
145145
Or just download in browser from website:
146146
[https://www.antlr.org/download.html](https://www.antlr.org/download.html)
147147
and put it somewhere rational like `/usr/local/lib`.
148148

149-
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.13.1 support jdk 1.8
149+
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.13.2 support jdk 1.8
150150

151-
2. Add `antlr-4.13.1-complete.jar` to your `CLASSPATH`:
151+
2. Add `antlr-4.13.2-complete.jar` to your `CLASSPATH`:
152152
```
153-
$ export CLASSPATH=".:/usr/local/lib/antlr-4.13.1-complete.jar:$CLASSPATH"
153+
$ export CLASSPATH=".:/usr/local/lib/antlr-4.13.2-complete.jar:$CLASSPATH"
154154
```
155155
It's also a good idea to put this in your `.bash_profile` or whatever your startup script is.
156156

157157
3. Create aliases for the ANTLR Tool, and `TestRig`.
158158
```
159-
$ alias antlr4='java -Xmx500M -cp "/usr/local/lib/antlr-4.13.1-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
160-
$ alias grun='java -Xmx500M -cp "/usr/local/lib/antlr-4.13.1-complete.jar:$CLASSPATH" org.antlr.v4.gui.TestRig'
159+
$ alias antlr4='java -Xmx500M -cp "/usr/local/lib/antlr-4.13.2-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
160+
$ alias grun='java -Xmx500M -cp "/usr/local/lib/antlr-4.13.2-complete.jar:$CLASSPATH" org.antlr.v4.gui.TestRig'
161161
```
162162

163163
### WINDOWS
164164

165165
(*Thanks to Graham Wideman*)
166166

167167
0. Install Java (version 1.7 or higher)
168-
1. Download antlr-4.13.1-complete.jar (or whatever version) from [https://www.antlr.org/download.html](https://www.antlr.org/download.html)
168+
1. Download antlr-4.13.2-complete.jar (or whatever version) from [https://www.antlr.org/download.html](https://www.antlr.org/download.html)
169169
Save to your directory for 3rd party Java libraries, say `C:\Javalib`
170-
2. Add `antlr-4.13.1-complete.jar` to CLASSPATH, either:
170+
2. Add `antlr-4.13.2-complete.jar` to CLASSPATH, either:
171171
* Permanently: Using System Properties dialog > Environment variables > Create or append to `CLASSPATH` variable
172172
* Temporarily, at command line:
173173
```
174-
SET CLASSPATH=.;C:\Javalib\antlr-4.13.1-complete.jar;%CLASSPATH%
174+
SET CLASSPATH=.;C:\Javalib\antlr-4.13.2-complete.jar;%CLASSPATH%
175175
```
176176
3. Create short convenient commands for the ANTLR Tool, and TestRig, using batch files or doskey commands:
177177
* Batch files (in directory in system PATH) antlr4.bat and grun.bat
@@ -197,7 +197,7 @@ Either launch org.antlr.v4.Tool directly:
197197

198198
```
199199
$ java org.antlr.v4.Tool
200-
ANTLR Parser Generator Version 4.13.1
200+
ANTLR Parser Generator Version 4.13.2
201201
-o ___ specify output directory where all output is generated
202202
-lib ___ specify location of .tokens files
203203
...
@@ -206,8 +206,8 @@ ANTLR Parser Generator Version 4.13.1
206206
or use -jar option on java:
207207

208208
```
209-
$ java -jar /usr/local/lib/antlr-4.13.1-complete.jar
210-
ANTLR Parser Generator Version 4.13.1
209+
$ java -jar /usr/local/lib/antlr-4.13.2-complete.jar
210+
ANTLR Parser Generator Version 4.13.2
211211
-o ___ specify output directory where all output is generated
212212
-lib ___ specify location of .tokens files
213213
...

doc/go-target.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ golang.org/x/exp
9191
```
9292

9393
A complete list of releases can be found on [the release page](https://github.com/antlr/antlr4/releases). The Go
94-
runtime will be tagged using standard Go tags, so release 4.13.1 in the `antlr4-go/antlr` repo, will be tagged with
95-
`v4.13.1` and go get will pick that up from the ANTLR repo.
94+
runtime will be tagged using standard Go tags, so release 4.13.2 in the `antlr4-go/antlr` repo, will be tagged with
95+
`v4.13.2` and go get will pick that up from the ANTLR repo.
9696

9797
#### 3. Configuring `go generate` in your project
9898

@@ -108,7 +108,7 @@ place the ANTLR grammar files in their own package in your project structure. He
108108
├── myproject
109109
├── parser
110110
│ ├── mygrammar.g4
111-
│ ├── antlr-4.13.1-complete.jar
111+
│ ├── antlr-4.13.2-complete.jar
112112
│ ├── generate.go
113113
│ └── generate.sh
114114
├── parsing # Generated code goes here
@@ -133,7 +133,7 @@ And the `generate.sh` file will look similar to this:
133133
```shell
134134
#!/bin/sh
135135

136-
alias antlr4='java -Xmx500M -cp "./antlr-4.13.1-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
136+
alias antlr4='java -Xmx500M -cp "./antlr-4.13.2-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
137137
antlr4 -Dlanguage=Go -no-visitor -package parsing *.g4
138138
```
139139

doc/swift-target.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Add Antlr4 as a dependency to your `Package.swift` file. For more information, p
131131

132132

133133
```swift
134-
.package(url: "https://github.com/antlr/antlr4", from: "4.13.1")
134+
.package(url: "https://github.com/antlr/antlr4", from: "4.13.2")
135135
```
136136

137137
## Swift access levels

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM eclipse-temurin:11 AS builder
22

33
WORKDIR /opt/antlr4
44

5-
ARG ANTLR_VERSION="4.13.1"
5+
ARG ANTLR_VERSION="4.13.2"
66
ARG MAVEN_OPTS="-Xmx1G"
77

88

runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/package_ts.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"@types/node": "^18.0.5"
55
},
66
"dependencies": {
7-
"antlr4": "^4.13.1"
7+
"antlr4": "^4.13.2"
88
}
99
}

runtime/CSharp/src/Antlr4.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Company>The ANTLR Organization</Company>
4-
<Version>4.13.1</Version>
4+
<Version>4.13.2</Version>
55
<NeutralLanguage>en-US</NeutralLanguage>
66
<TargetFramework Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFramework>
77
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;netstandard2.0</TargetFrameworks>

runtime/CSharp/src/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
using System.Reflection;
77

88
[assembly: CLSCompliant(true)]
9-
[assembly: AssemblyVersion("4.13.1")]
9+
[assembly: AssemblyVersion("4.13.2")]

runtime/CSharp/src/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ See the docs and the book to learn about writing lexer and parser grammars.
4141
### Step 4: Generate the C# code
4242

4343
This can be done either from the cmd line, or by adding a custom pre-build command in your project.
44-
At minimal, the cmd line should look as follows: ``java -jar antlr4-4.13.1.jar -Dlanguage=CSharp grammar.g4``
44+
At minimal, the cmd line should look as follows: ``java -jar antlr4-4.13.2.jar -Dlanguage=CSharp grammar.g4``
4545
This will generate the files, which you can then integrate in your project.
4646
This is just a quick start. The tool has many useful options to control generation, please refer to its documentation.
4747

runtime/Cpp/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.13.1
1+
4.13.2

runtime/Cpp/cmake/Antlr4Package.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ target_link_libraries( Parsertest PRIVATE
9696
find_package(antlr4-generator REQUIRED)
9797
9898
# Set path to generator
99-
set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.13.1-complete.jar)
99+
set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.13.2-complete.jar)
100100
101101
# generate lexer
102102
antlr4_generate(

runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ else()
4646
set(ANTLR4_SHARED_LIBRARIES
4747
${ANTLR4_OUTPUT_DIR}/libantlr4-runtime.dll.a)
4848
set(ANTLR4_RUNTIME_LIBRARIES
49-
${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.13.1.dll)
49+
${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.13.2.dll)
5050
elseif(APPLE)
5151
set(ANTLR4_RUNTIME_LIBRARIES
5252
${ANTLR4_OUTPUT_DIR}/libantlr4-runtime.dylib)

runtime/Cpp/cmake/FindANTLR.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ find_package(Java QUIET COMPONENTS Runtime)
22

33
if(NOT ANTLR_EXECUTABLE)
44
find_program(ANTLR_EXECUTABLE
5-
NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.13.1-complete.jar)
5+
NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.13.2-complete.jar)
66
endif()
77

88
if(ANTLR_EXECUTABLE AND Java_JAVA_EXECUTABLE)

runtime/Cpp/cmake/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ set(ANTLR4_WITH_STATIC_CRT OFF)
2929
# By default the latest version of antlr4 will be used. You can specify a
3030
# specific, stable version by setting a repository tag value or a link
3131
# to a zip file containing the libary source.
32-
# set(ANTLR4_TAG 4.13.1)
33-
# set(ANTLR4_ZIP_REPOSITORY https://github.com/antlr/antlr4/archive/refs/tags/4.13.1.zip)
32+
# set(ANTLR4_TAG 4.13.2)
33+
# set(ANTLR4_ZIP_REPOSITORY https://github.com/antlr/antlr4/archive/refs/tags/4.13.2.zip)
3434
3535
# add external build for antlrcpp
3636
include(ExternalAntlr4Cpp)
@@ -39,7 +39,7 @@ include_directories(${ANTLR4_INCLUDE_DIRS})
3939
4040
# set variable pointing to the antlr tool that supports C++
4141
# this is not required if the jar file can be found under PATH environment
42-
set(ANTLR_EXECUTABLE /home/user/antlr-4.13.1-complete.jar)
42+
set(ANTLR_EXECUTABLE /home/user/antlr-4.13.2-complete.jar)
4343
# add macros to generate ANTLR Cpp code from grammar
4444
find_package(ANTLR REQUIRED)
4545

runtime/Cpp/demo/generate.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
:: Download the ANLTR jar and place it in the same folder as this script (or adjust the LOCATION var accordingly).
88

9-
set LOCATION=antlr-4.13.1-complete.jar
9+
set LOCATION=antlr-4.13.2-complete.jar
1010
java -jar %LOCATION% -Dlanguage=Cpp -listener -visitor -o generated/ -package antlrcpptest TLexer.g4 TParser.g4
1111
::java -jar %LOCATION% -Dlanguage=Cpp -listener -visitor -o generated/ -package antlrcpptest -XdbgST TLexer.g4 TParser.g4
1212
::java -jar %LOCATION% -Dlanguage=Java -listener -visitor -o generated/ -package antlrcpptest TLexer.g4 TParser.g4

runtime/Cpp/runtime/src/Version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#define ANTLRCPP_VERSION_MAJOR 4
3131
#define ANTLRCPP_VERSION_MINOR 13
32-
#define ANTLRCPP_VERSION_PATCH 1
32+
#define ANTLRCPP_VERSION_PATCH 2
3333

3434
#define ANTLRCPP_MAKE_VERSION(major, minor, patch) ((major) * 100000 + (minor) * 1000 + (patch))
3535

runtime/Dart/lib/src/runtime_meta_data.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class RuntimeMetaData {
6666
/// omitted, the {@code -} (hyphen-minus) appearing before it is also
6767
/// omitted.</li>
6868
/// </ul>
69-
static final String VERSION = '4.13.1';
69+
static final String VERSION = '4.13.2';
7070

7171
/// Gets the currently executing version of the ANTLR 4 runtime library.
7272
///

runtime/Dart/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "antlr4"
2-
version: "4.13.1"
2+
version: "4.13.2"
33
description: "New Dart runtime for ANTLR4."
44
homepage: "https://github.com/antlr/antlr4"
55
license: "BSD-3-Clause"

runtime/Go/antlr/v4/antlrdoc.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ANTLR4 that it is compatible with (I.E. uses the /v4 path).
1717
However, this was found to be problematic, as it meant that with the runtime embedded so far underneath the root
1818
of the repo, the `go get` and related commands could not properly resolve the location of the go runtime source code.
1919
This meant that the reference to the runtime in your `go.mod` file would refer to the correct source code, but would not
20-
list the release tag such as @4.13.1 - this was confusing, to say the least.
20+
list the release tag such as @4.13.2 - this was confusing, to say the least.
2121
2222
As of 4.13.0, the runtime is now available as a go module in its own repo, and can be imported as `github.com/antlr4-go/antlr`
2323
(the go get command should also be used with this path). See the main documentation for the ANTLR4 project for more information,
@@ -49,7 +49,7 @@ Here is a general/recommended template for an ANTLR based recognizer in Go:
4949
.
5050
├── parser
5151
│ ├── mygrammar.g4
52-
│ ├── antlr-4.13.1-complete.jar
52+
│ ├── antlr-4.13.2-complete.jar
5353
│ ├── generate.go
5454
│ └── generate.sh
5555
├── parsing - generated code goes here
@@ -71,7 +71,7 @@ And the generate.sh file will look similar to this:
7171
7272
#!/bin/sh
7373
74-
alias antlr4='java -Xmx500M -cp "./antlr4-4.13.1-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
74+
alias antlr4='java -Xmx500M -cp "./antlr4-4.13.2-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
7575
antlr4 -Dlanguage=Go -no-visitor -package parsing *.g4
7676
7777
depending on whether you want visitors or listeners or any other ANTLR options. Not that another option here

runtime/Go/antlr/v4/recognizer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ var tokenTypeMapCache = make(map[string]int)
5656
var ruleIndexMapCache = make(map[string]int)
5757

5858
func (b *BaseRecognizer) checkVersion(toolVersion string) {
59-
runtimeVersion := "4.13.1"
59+
runtimeVersion := "4.13.2"
6060
if runtimeVersion != toolVersion {
6161
fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
6262
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class RuntimeMetaData {
6767
* omitted.</li>
6868
* </ul>
6969
*/
70-
public static final String VERSION = "4.13.1";
70+
public static final String VERSION = "4.13.2";
7171

7272
/**
7373
* Gets the currently executing version of the ANTLR 4 runtime library.

runtime/JavaScript/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

runtime/JavaScript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "antlr4",
3-
"version": "4.13.1",
3+
"version": "4.13.2",
44
"type": "module",
55
"description": "JavaScript runtime for ANTLR4",
66
"browser": "dist/antlr4.web.mjs",

runtime/JavaScript/spec/rewriter/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ANTLR_VERSION = 4.13.1
1+
ANTLR_VERSION = 4.13.2
22
ANTLR_JAR = .antlr/antlr-$(ANTLR_VERSION)-complete.jar
33

44
.antlr:

runtime/JavaScript/src/antlr4/Recognizer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default class Recognizer {
1515
}
1616

1717
checkVersion(toolVersion) {
18-
const runtimeVersion = "4.13.1";
18+
const runtimeVersion = "4.13.2";
1919
if (runtimeVersion!==toolVersion) {
2020
console.log("ANTLR runtime and generated code versions disagree: "+runtimeVersion+"!="+toolVersion);
2121
}

runtime/Python3/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "antlr4-python3-runtime"
7-
version = "4.13.1"
7+
version = "4.13.2"
88
authors = [{name = "Eric Vergnaud", email = "[email protected]"}, {name = "Terence Parr"}, {name = "Sam Harwell"}]
99
license = {text = "BSD"}
10-
description = "ANTLR 4.13.1 runtime for Python 3"
10+
description = "ANTLR 4.13.2 runtime for Python 3"
1111
urls = {Homepage = "http://www.antlr.org"}
1212
dependencies = ["typing ; python_version<'3.5'"]
1313

runtime/Python3/src/antlr4/Recognizer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def extractVersion(self, version):
3434
return major, minor
3535

3636
def checkVersion(self, toolVersion):
37-
runtimeVersion = "4.13.1"
37+
runtimeVersion = "4.13.2"
3838
rvmajor, rvminor = self.extractVersion(runtimeVersion)
3939
tvmajor, tvminor = self.extractVersion(toolVersion)
4040
if rvmajor!=tvmajor or rvminor!=tvminor:

runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class RuntimeMetaData {
6363
/// omitted, the `-` (hyphen-minus) appearing before it is also
6464
/// omitted.
6565
///
66-
public static let VERSION: String = "4.13.1"
66+
public static let VERSION: String = "4.13.2"
6767

6868
///
6969
/// Gets the currently executing version of the ANTLR 4 runtime library.

scripts/files-to-update.txt

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ runtime-testsuite/resources/org/antlr/v4/test/runtime/helpers/package_ts.json
3838
* doc/getting-started.md
3939
* doc/swift-target.md
4040
* doc/getting-started.md
41+
* doc/go-target.md
4142

4243
# runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift This is special so must manually edit
4344

0 commit comments

Comments
 (0)