jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

manual edits of 4.7.1 -> 4.7.2

This commit is contained in:
parrt 2018-12-17 14:32:39 -08:00
parent b3f00ca72a
commit 38a95da397
32 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/CSharp/README.md
View File

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

2
runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Company>The ANTLR Organization</Company>
<Version>4.7.1.1</Version>
<Version>4.7.2</Version>
<NeutralLanguage>en-US</NeutralLanguage>
<TargetFrameworks>netstandard1.3;net35</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591;CS1574;CS1580</NoWarn>

6
runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs
View File

@ -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.7.1")]
[assembly: AssemblyVersion("4.7.2")]
#if !COMPACT
[assembly: AssemblyFileVersion("4.7.1")]
[assembly: AssemblyInformationalVersion("4.7.1")]
[assembly: AssemblyFileVersion("4.7.2")]
[assembly: AssemblyInformationalVersion("4.7.2")]
#endif

2
runtime/Cpp/VERSION
View File

@ -1 +1 @@
4.7.1
4.7.2

2
runtime/Cpp/cmake/Antlr4Package.md
View File

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

2
runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
View File

@ -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.7.1.dll)
${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.7.2.dll)
elseif(APPLE)
set(ANTLR4_RUNTIME_LIBRARIES
${ANTLR4_OUTPUT_DIR}/libantlr4-runtime.dylib)

2
runtime/Cpp/cmake/FindANTLR.cmake
View File

@ -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.7.1-complete.jar)
NAMES antlr.jar antlr4.jar antlr-4.jar antlr-4.7.2-complete.jar)
endif()
if(ANTLR_EXECUTABLE AND Java_JAVA_EXECUTABLE)

2
runtime/Cpp/cmake/README.md
View File

@ -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.7.1-complete.jar)
set(ANTLR_EXECUTABLE /home/user/antlr-4.7.2-complete.jar)
# add macros to generate ANTLR Cpp code from grammar
find_package(ANTLR REQUIRED)

2
runtime/Cpp/demo/generate.cmd
View File

@ -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.7.1-complete.jar
set LOCATION=antlr-4.7.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

2
runtime/Cpp/runtime/src/RuntimeMetaData.cpp
View File

@ -7,7 +7,7 @@
using namespace antlr4;
const std::string RuntimeMetaData::VERSION = "4.7.1";
const std::string RuntimeMetaData::VERSION = "4.7.2";
std::string RuntimeMetaData::getRuntimeVersion() {
return VERSION;

2
runtime/Go/antlr/recognizer.go
View File

@ -49,7 +49,7 @@ var tokenTypeMapCache = make(map[string]int)
var ruleIndexMapCache = make(map[string]int)
func (b *BaseRecognizer) checkVersion(toolVersion string) {
runtimeVersion := "4.7.1"
runtimeVersion := "4.7.2"
if runtimeVersion != toolVersion {
fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
}

2
runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java
View File

@ -67,7 +67,7 @@ public class RuntimeMetaData {
* omitted.</li>
* </ul>
*/
public static final String VERSION = "4.7.1";
public static final String VERSION = "4.7.2";
/**
* Gets the currently executing version of the ANTLR 4 runtime library.

2
runtime/JavaScript/src/antlr4/Recognizer.js
View File

@ -21,7 +21,7 @@ Recognizer.ruleIndexMapCache = {};
Recognizer.prototype.checkVersion = function(toolVersion) {
var runtimeVersion = "4.7.1";
var runtimeVersion = "4.7.2";
if (runtimeVersion!==toolVersion) {
console.log("ANTLR runtime and generated code versions disagree: "+runtimeVersion+"!="+toolVersion);
}

2
runtime/JavaScript/src/antlr4/package.json
View File

@ -1,6 +1,6 @@
{
"name": "antlr4",
"version": "4.7.1",
"version": "4.7.2",
"description": "JavaScript runtime for ANTLR4",
"main": "src/antlr4/index.js",
"repository": "antlr/antlr4.git",

4
runtime/Python2/setup.py
View File

@ -2,12 +2,12 @@ from setuptools import setup
setup(
name='antlr4-python2-runtime',
version='4.7.1',
version='4.7.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.7.1 runtime for Python 2.7.12'
description='ANTLR 4.7.2 runtime for Python 2.7.12'
)

2
runtime/Python2/src/antlr4/Recognizer.py
View File

@ -30,7 +30,7 @@ class Recognizer(object):
return major, minor
def checkVersion(self, toolVersion):
runtimeVersion = "4.7.1"
runtimeVersion = "4.7.2"
rvmajor, rvminor = self.extractVersion(runtimeVersion)
tvmajor, tvminor = self.extractVersion(toolVersion)
if rvmajor!=tvmajor or rvminor!=tvminor:

4
runtime/Python2/tests/mocks/TestLexer.py
View File

@ -39,7 +39,7 @@ class TestLexer(Lexer):
def __init__(self, input=None):
super(TestLexer, self).__init__(input)
self.checkVersion("4.7.1")
self.checkVersion("4.7.2")
self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
self._actions = None
self._predicates = None
@ -95,7 +95,7 @@ class TestLexer2(Lexer):
def __init__(self, input=None):
super(TestLexer2, self).__init__(input)
self.checkVersion("4.7.1")
self.checkVersion("4.7.2")
self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
self._actions = None
self._predicates = None

4
runtime/Python3/setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup
setup(
name='antlr4-python3-runtime',
version='4.7.1',
version='4.7.2',
packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
package_dir={'': 'src'},
install_requires=[
@ -12,5 +12,5 @@ setup(
license='BSD',
author='Eric Vergnaud, Terence Parr, Sam Harwell',
author_email='eric.vergnaud@wanadoo.fr',
description='ANTLR 4.7.1 runtime for Python 3.6.3'
description='ANTLR 4.7.2 runtime for Python 3.6.3'
)

2
runtime/Python3/src/antlr4/Recognizer.py
View File

@ -33,7 +33,7 @@ class Recognizer(object):
return major, minor
def checkVersion(self, toolVersion):
runtimeVersion = "4.7.1"
runtimeVersion = "4.7.2"
rvmajor, rvminor = self.extractVersion(runtimeVersion)
tvmajor, tvminor = self.extractVersion(toolVersion)
if rvmajor!=tvmajor or rvminor!=tvminor:

2
runtime/Python3/src/antlr4/xpath/XPath.py
View File

@ -119,7 +119,7 @@ class XPathLexer(Lexer):
def __init__(self, input=None):
super().__init__(input)
self.checkVersion("4.7.1")
self.checkVersion("4.7.2")
self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
self._actions = None
self._predicates = None

2
runtime/Python3/test/parser/clexer.py
View File

@ -792,7 +792,7 @@ class CLexer(Lexer):
def __init__(self, input=None):
super().__init__(input)
self.checkVersion("4.7.1")
self.checkVersion("4.7.2")
self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
self._actions = None
self._predicates = None

2
runtime/Python3/test/parser/cparser.py
View File

@ -915,7 +915,7 @@ class CParser ( Parser ):
def __init__(self, input:TokenStream):
super().__init__(input)
self.checkVersion("4.7.1")
self.checkVersion("4.7.2")
self._interp = ParserATNSimulator(self, self.atn, self.decisionsToDFA, self.sharedContextCache)
self._predicates = None

2
runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift
View File

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

2
runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift
View File

@ -14,10 +14,12 @@ class RuntimeMetaDataTests: XCTestCase {
doGetMajorMinorVersionTest("4.", "4.")
doGetMajorMinorVersionTest("4.7", "4.7")
doGetMajorMinorVersionTest("4.7.1", "4.7")
doGetMajorMinorVersionTest("4.7.2", "4.7")
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")
}
}

2
tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg
View File

@ -354,7 +354,7 @@ func getVocabulary() -> Vocabulary {
override <accessLevelNotOpen(parser)>
init(_ input:TokenStream) throws {
RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION)
RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION)
try super.init(input)
_interp = ParserATNSimulator(self,<p.name>._ATN,<p.name>._decisionToDFA, <parser.name>._sharedContextCache)
}

2
tool/src/org/antlr/v4/codegen/target/CSharpTarget.java
View File

@ -28,7 +28,7 @@ public class CSharpTarget extends Target {
@Override
public String getVersion() {
return "4.7.1";
return "4.7.2";
}
@Override

2
tool/src/org/antlr/v4/codegen/target/CppTarget.java
View File

@ -50,7 +50,7 @@ public class CppTarget extends Target {
}
public String getVersion() {
return "4.7.1";
return "4.7.2";
}
public boolean needsHeader() { return true; }

2
tool/src/org/antlr/v4/codegen/target/GoTarget.java
View File

@ -71,7 +71,7 @@ public class GoTarget extends Target {
@Override
public String getVersion() {
return "4.7.1";
return "4.7.2";
}
public Set<String> getBadWords() {

2
tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java
View File

@ -51,7 +51,7 @@ public class JavaScriptTarget extends Target {
@Override
public String getVersion() {
return "4.7.1";
return "4.7.2";
}
public Set<String> getBadWords() {

2
tool/src/org/antlr/v4/codegen/target/Python2Target.java
View File

@ -95,7 +95,7 @@ public class Python2Target extends Target {
@Override
public String getVersion() {
return "4.7.1";
return "4.7.2";
}
public Set<String> getBadWords() {

2
tool/src/org/antlr/v4/codegen/target/Python3Target.java
View File

@ -97,7 +97,7 @@ public class Python3Target extends Target {
@Override
public String getVersion() {
return "4.7.1";
return "4.7.2";
}
/** Avoid grammar symbols in this set to prevent conflicts in gen'd code. */

2
tool/src/org/antlr/v4/codegen/target/SwiftTarget.java
View File

@ -87,7 +87,7 @@ public class SwiftTarget extends Target {
@Override
public String getVersion() {
return "4.7.1"; // Java and tool versions move in lock step
return "4.7.2"; // Java and tool versions move in lock step
}
public Set<String> getBadWords() {