Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set version to 4.10 #3460

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/swift-target.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ and Swift is currently not ABI stable. We currently support SPM-based
projects by creating temporary local repository.

```swift
.package(name: "Antlr4", url: "https://github.com/antlr/antlr4", from: "4.9.3"
.package(name: "Antlr4", url: "https://github.com/antlr/antlr4", from: "4.10"
```
## Swift access levels

Expand Down
2 changes: 1 addition & 1 deletion runtime/CSharp/src/Antlr4.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Company>The ANTLR Organization</Company>
<Version>4.9.3</Version>
<Version>4.10</Version>
<NeutralLanguage>en-US</NeutralLanguage>
<TargetFramework Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFramework>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;netstandard2.0</TargetFrameworks>
Expand Down
2 changes: 1 addition & 1 deletion runtime/CSharp/src/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
using System.Reflection;

[assembly: CLSCompliant(true)]
[assembly: AssemblyVersion("4.9.3")]
[assembly: AssemblyVersion("4.10")]
2 changes: 1 addition & 1 deletion runtime/CSharp/src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.jar -Dlanguage=CSharp grammar.g4``
At minimal, the cmd line should look as follows: ``java -jar antlr4-4.10.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.

Expand Down
2 changes: 1 addition & 1 deletion runtime/CSharp/src/Tree/Xpath/XPathLexer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
using Antlr4.Runtime.Misc;
using DFA = Antlr4.Runtime.Dfa.DFA;

[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.9.3")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.10")]
[System.CLSCompliant(false)]
public partial class XPathLexer : Lexer
{
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cpp/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.9.3
4.10
2 changes: 1 addition & 1 deletion runtime/Cpp/cmake/Antlr4Package.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3-complete.jar)
set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.10-complete.jar)

# generate lexer
antlr4_generate(
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.dll)
${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.10.dll)
elseif(APPLE)
set(ANTLR4_RUNTIME_LIBRARIES
${ANTLR4_OUTPUT_DIR}/libantlr4-runtime.dylib)
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cpp/cmake/FindANTLR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.3-complete.jar)
NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.10-complete.jar)
endif()

if(ANTLR_EXECUTABLE AND Java_JAVA_EXECUTABLE)
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cpp/cmake/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3-complete.jar)
set(ANTLR_EXECUTABLE /home/user/antlr-4.10-complete.jar)
# add macros to generate ANTLR Cpp code from grammar
find_package(ANTLR REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion runtime/Cpp/demo/generate.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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.3-complete.jar
set LOCATION=antlr-4.10-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
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cpp/runtime/src/RuntimeMetaData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using namespace antlr4;

const std::string RuntimeMetaData::VERSION = "4.9.3";
const std::string RuntimeMetaData::VERSION = "4.10";

std::string RuntimeMetaData::getRuntimeVersion() {
return VERSION;
Expand Down
2 changes: 1 addition & 1 deletion runtime/Dart/lib/src/runtime_meta_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.3';
static final String VERSION = '4.10';

/// Gets the currently executing version of the ANTLR 4 runtime library.
///
Expand Down
2 changes: 1 addition & 1 deletion runtime/Dart/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "antlr4"
version: "4.9.3"
version: "4.10"
description: "New Dart runtime for ANTLR4."
homepage: "https://github.com/antlr/antlr4"
license: "BSD-3-Clause"
Expand Down
2 changes: 1 addition & 1 deletion runtime/Go/antlr/recognizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.3"
runtimeVersion := "4.10"
if runtimeVersion != toolVersion {
fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
}
Expand Down
2 changes: 1 addition & 1 deletion runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class RuntimeMetaData {
* omitted.</li>
* </ul>
*/
public static final String VERSION = "4.9.3";
public static final String VERSION = "4.10";

/**
* Gets the currently executing version of the ANTLR 4 runtime library.
Expand Down
4 changes: 2 additions & 2 deletions runtime/JavaScript/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion runtime/JavaScript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "antlr4",
"version": "4.9.3",
"version": "4.10",
"description": "JavaScript runtime for ANTLR4",
"main": "src/antlr4/index.js",
"repository": "antlr/antlr4.git",
Expand Down
2 changes: 1 addition & 1 deletion runtime/JavaScript/src/antlr4/Recognizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Recognizer {
}

checkVersion(toolVersion) {
const runtimeVersion = "4.9.3";
const runtimeVersion = "4.10";
if (runtimeVersion!==toolVersion) {
console.log("ANTLR runtime and generated code versions disagree: "+runtimeVersion+"!="+toolVersion);
}
Expand Down
4 changes: 2 additions & 2 deletions runtime/Python2/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

setup(
name='antlr4-python2-runtime',
version='4.9.3',
version='4.10',
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.3 runtime for Python 2.7.12'
description='ANTLR 4.10 runtime for Python 2.7.12'
)
2 changes: 1 addition & 1 deletion runtime/Python2/src/antlr4/Recognizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def extractVersion(self, version):
return major, minor

def checkVersion(self, toolVersion):
runtimeVersion = "4.9.3"
runtimeVersion = "4.10"
rvmajor, rvminor = self.extractVersion(runtimeVersion)
tvmajor, tvminor = self.extractVersion(toolVersion)
if rvmajor!=tvmajor or rvminor!=tvminor:
Expand Down
4 changes: 2 additions & 2 deletions runtime/Python3/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='antlr4-python3-runtime',
version='4.9.3',
version='4.10',
packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
package_dir={'': 'src'},
install_requires=[
Expand All @@ -13,5 +13,5 @@
author='Eric Vergnaud, Terence Parr, Sam Harwell',
author_email='eric.vergnaud@wanadoo.fr',
entry_points={'console_scripts': ['pygrun=antlr4._pygrun:main']},
description='ANTLR 4.9.3 runtime for Python 3.7'
description='ANTLR 4.10 runtime for Python 3.7'
)
2 changes: 1 addition & 1 deletion runtime/Python3/src/antlr4/Recognizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def extractVersion(self, version):
return major, minor

def checkVersion(self, toolVersion):
runtimeVersion = "4.9.3"
runtimeVersion = "4.10"
rvmajor, rvminor = self.extractVersion(runtimeVersion)
tvmajor, tvminor = self.extractVersion(toolVersion)
if rvmajor!=tvmajor or rvminor!=tvminor:
Expand Down
2 changes: 1 addition & 1 deletion runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class RuntimeMetaData {
/// omitted, the `-` (hyphen-minus) appearing before it is also
/// omitted.
///
public static let VERSION: String = "4.9.3"
public static let VERSION: String = "4.10"

///
/// Gets the currently executing version of the ANTLR 4 runtime library.
Expand Down
2 changes: 2 additions & 0 deletions runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class RuntimeMetaDataTests: XCTestCase {
doGetMajorMinorVersionTest("4.9.1", "4.9")
doGetMajorMinorVersionTest("4.9.2", "4.9")
doGetMajorMinorVersionTest("4.9.3", "4.9")
doGetMajorMinorVersionTest("4.10", "4.10")
doGetMajorMinorVersionTest("4-SNAPSHOT", "4")
doGetMajorMinorVersionTest("4.-SNAPSHOT", "4.")
doGetMajorMinorVersionTest("4.7-SNAPSHOT", "4.7")
Expand All @@ -28,6 +29,7 @@ class RuntimeMetaDataTests: XCTestCase {
doGetMajorMinorVersionTest("4.9.1-SNAPSHOT", "4.9")
doGetMajorMinorVersionTest("4.9.2-SNAPSHOT", "4.9")
doGetMajorMinorVersionTest("4.9.3-SNAPSHOT", "4.9")
doGetMajorMinorVersionTest("4.10-SNAPSHOT", "4.10")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ func getVocabulary() -> Vocabulary {

override <accessLevelNotOpen(parser)>
init(_ input:TokenStream) throws {
RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION)
RuntimeMetaData.checkVersion("4.10", RuntimeMetaData.VERSION)
try super.init(input)
_interp = ParserATNSimulator(self,<p.name>._ATN,<p.name>._decisionToDFA, <parser.name>._sharedContextCache)
}
Expand Down