From 38a95da3976344019d2cdf2d4c106966166a781d Mon Sep 17 00:00:00 2001 From: parrt Date: Mon, 17 Dec 2018 14:32:39 -0800 Subject: [PATCH 1/2] manual edits of 4.7.1 -> 4.7.2 --- runtime/CSharp/README.md | 2 +- .../CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj | 2 +- .../CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs | 6 +++--- runtime/Cpp/VERSION | 2 +- runtime/Cpp/cmake/Antlr4Package.md | 2 +- runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake | 2 +- runtime/Cpp/cmake/FindANTLR.cmake | 2 +- runtime/Cpp/cmake/README.md | 2 +- runtime/Cpp/demo/generate.cmd | 2 +- runtime/Cpp/runtime/src/RuntimeMetaData.cpp | 2 +- runtime/Go/antlr/recognizer.go | 2 +- runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java | 2 +- runtime/JavaScript/src/antlr4/Recognizer.js | 2 +- runtime/JavaScript/src/antlr4/package.json | 2 +- runtime/Python2/setup.py | 4 ++-- runtime/Python2/src/antlr4/Recognizer.py | 2 +- runtime/Python2/tests/mocks/TestLexer.py | 4 ++-- runtime/Python3/setup.py | 4 ++-- runtime/Python3/src/antlr4/Recognizer.py | 2 +- runtime/Python3/src/antlr4/xpath/XPath.py | 2 +- runtime/Python3/test/parser/clexer.py | 2 +- runtime/Python3/test/parser/cparser.py | 2 +- runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift | 2 +- runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift | 2 ++ .../org/antlr/v4/tool/templates/codegen/Swift/Swift.stg | 2 +- tool/src/org/antlr/v4/codegen/target/CSharpTarget.java | 2 +- tool/src/org/antlr/v4/codegen/target/CppTarget.java | 2 +- tool/src/org/antlr/v4/codegen/target/GoTarget.java | 2 +- tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java | 2 +- tool/src/org/antlr/v4/codegen/target/Python2Target.java | 2 +- tool/src/org/antlr/v4/codegen/target/Python3Target.java | 2 +- tool/src/org/antlr/v4/codegen/target/SwiftTarget.java | 2 +- 32 files changed, 38 insertions(+), 36 deletions(-) diff --git a/runtime/CSharp/README.md b/runtime/CSharp/README.md index 3985a298b1..d272a6a060 100644 --- a/runtime/CSharp/README.md +++ b/runtime/CSharp/README.md @@ -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. diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj index bc6e6467e8..23cbfa49ff 100644 --- a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj +++ b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.dotnet.csproj @@ -1,7 +1,7 @@  The ANTLR Organization - 4.7.1.1 + 4.7.2 en-US netstandard1.3;net35 $(NoWarn);CS1591;CS1574;CS1580 diff --git a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs index 26b717a581..325bf90760 100644 --- a/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs +++ b/runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs @@ -42,8 +42,8 @@ // 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 diff --git a/runtime/Cpp/VERSION b/runtime/Cpp/VERSION index 7c66fca579..af9764a59e 100644 --- a/runtime/Cpp/VERSION +++ b/runtime/Cpp/VERSION @@ -1 +1 @@ -4.7.1 +4.7.2 diff --git a/runtime/Cpp/cmake/Antlr4Package.md b/runtime/Cpp/cmake/Antlr4Package.md index 929840cf74..ac9480db23 100644 --- 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.7.1-complete.jar) + set(ANTLR4_JAR_LOCATION ${PROJECT_SOURCE_DIR}/thirdparty/antlr/antlr-4.7.2-complete.jar) # generate lexer antlr4_generate( diff --git a/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake b/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake index ba540fcc3b..675cbf579a 100644 --- 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.7.1.dll) + ${ANTLR4_OUTPUT_DIR}/cygantlr4-runtime-4.7.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 index bb6c7b28f7..511064173d 100644 --- 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.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) diff --git a/runtime/Cpp/cmake/README.md b/runtime/Cpp/cmake/README.md index 7d74b66a83..e27c77e50a 100644 --- 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.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) diff --git a/runtime/Cpp/demo/generate.cmd b/runtime/Cpp/demo/generate.cmd index a571f60fde..826c1f6147 100644 --- 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.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 diff --git a/runtime/Cpp/runtime/src/RuntimeMetaData.cpp b/runtime/Cpp/runtime/src/RuntimeMetaData.cpp index 33d834dbb6..011f12a510 100755 --- 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.7.1"; +const std::string RuntimeMetaData::VERSION = "4.7.2"; std::string RuntimeMetaData::getRuntimeVersion() { return VERSION; diff --git a/runtime/Go/antlr/recognizer.go b/runtime/Go/antlr/recognizer.go index 188b9d9de1..9ea9f6f594 100644 --- 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.7.1" + runtimeVersion := "4.7.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 index bc2e47860a..05e81441b5 100644 --- 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. * */ - 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. diff --git a/runtime/JavaScript/src/antlr4/Recognizer.js b/runtime/JavaScript/src/antlr4/Recognizer.js index 1703a0eb64..bc2392529d 100644 --- a/runtime/JavaScript/src/antlr4/Recognizer.js +++ b/runtime/JavaScript/src/antlr4/Recognizer.js @@ -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); } diff --git a/runtime/JavaScript/src/antlr4/package.json b/runtime/JavaScript/src/antlr4/package.json index ac02fb1bed..afb4618dae 100644 --- a/runtime/JavaScript/src/antlr4/package.json +++ b/runtime/JavaScript/src/antlr4/package.json @@ -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", diff --git a/runtime/Python2/setup.py b/runtime/Python2/setup.py index 56e2c2fca9..78491005e7 100644 --- a/runtime/Python2/setup.py +++ b/runtime/Python2/setup.py @@ -2,12 +2,12 @@ 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' ) diff --git a/runtime/Python2/src/antlr4/Recognizer.py b/runtime/Python2/src/antlr4/Recognizer.py index a434c6e015..23693a9155 100644 --- 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.7.1" + runtimeVersion = "4.7.2" rvmajor, rvminor = self.extractVersion(runtimeVersion) tvmajor, tvminor = self.extractVersion(toolVersion) if rvmajor!=tvmajor or rvminor!=tvminor: diff --git a/runtime/Python2/tests/mocks/TestLexer.py b/runtime/Python2/tests/mocks/TestLexer.py index 91cfc0bff0..9c54007b2c 100644 --- a/runtime/Python2/tests/mocks/TestLexer.py +++ b/runtime/Python2/tests/mocks/TestLexer.py @@ -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 diff --git a/runtime/Python3/setup.py b/runtime/Python3/setup.py index 4c64cc2e05..5753df0cb7 100644 --- a/runtime/Python3/setup.py +++ b/runtime/Python3/setup.py @@ -2,7 +2,7 @@ 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 @@ 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' ) diff --git a/runtime/Python3/src/antlr4/Recognizer.py b/runtime/Python3/src/antlr4/Recognizer.py index f353b53311..01017351f6 100644 --- a/runtime/Python3/src/antlr4/Recognizer.py +++ b/runtime/Python3/src/antlr4/Recognizer.py @@ -33,7 +33,7 @@ def extractVersion(self, version): 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: diff --git a/runtime/Python3/src/antlr4/xpath/XPath.py b/runtime/Python3/src/antlr4/xpath/XPath.py index d3928711a6..c49e3ba941 100644 --- a/runtime/Python3/src/antlr4/xpath/XPath.py +++ b/runtime/Python3/src/antlr4/xpath/XPath.py @@ -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 diff --git a/runtime/Python3/test/parser/clexer.py b/runtime/Python3/test/parser/clexer.py index 4613fa8590..c35320593a 100644 --- a/runtime/Python3/test/parser/clexer.py +++ b/runtime/Python3/test/parser/clexer.py @@ -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 diff --git a/runtime/Python3/test/parser/cparser.py b/runtime/Python3/test/parser/cparser.py index b03a6ae073..1eb1d741b6 100644 --- a/runtime/Python3/test/parser/cparser.py +++ b/runtime/Python3/test/parser/cparser.py @@ -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 diff --git a/runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift b/runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift index c744eb7206..b5ca8ceda9 100644 --- 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.7.1" + public static let VERSION: String = "4.7.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 index 22ba06db64..c3845c922d 100644 --- a/runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift +++ b/runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift @@ -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") } } 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 index 088cf0c74c..7d74dc5d0a 100755 --- a/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg +++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg @@ -354,7 +354,7 @@ func getVocabulary() -> Vocabulary { override 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,._ATN,._decisionToDFA, ._sharedContextCache) } diff --git a/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java b/tool/src/org/antlr/v4/codegen/target/CSharpTarget.java index e7a23221bb..82f65c63d6 100644 --- 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.7.1"; + return "4.7.2"; } @Override diff --git a/tool/src/org/antlr/v4/codegen/target/CppTarget.java b/tool/src/org/antlr/v4/codegen/target/CppTarget.java index 6ef32c25da..839a362c15 100644 --- a/tool/src/org/antlr/v4/codegen/target/CppTarget.java +++ b/tool/src/org/antlr/v4/codegen/target/CppTarget.java @@ -50,7 +50,7 @@ public CppTarget(CodeGenerator gen) { } public String getVersion() { - return "4.7.1"; + return "4.7.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 index be4e3ccc3f..89a40de991 100644 --- 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.7.1"; + return "4.7.2"; } public Set getBadWords() { diff --git a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java b/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java index adbfc7c5bf..75886fd0d8 100644 --- 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.7.1"; + return "4.7.2"; } public Set getBadWords() { diff --git a/tool/src/org/antlr/v4/codegen/target/Python2Target.java b/tool/src/org/antlr/v4/codegen/target/Python2Target.java index 28dfaae607..1beaf8c20f 100644 --- 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.7.1"; + return "4.7.2"; } public Set getBadWords() { diff --git a/tool/src/org/antlr/v4/codegen/target/Python3Target.java b/tool/src/org/antlr/v4/codegen/target/Python3Target.java index 1dffc4e42e..753f67cdfc 100644 --- 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.7.1"; + return "4.7.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 index 5e285060d2..b19234439e 100644 --- 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.7.1"; // Java and tool versions move in lock step + return "4.7.2"; // Java and tool versions move in lock step } public Set getBadWords() { From 4ccf715bc42e8bdbea582a4aaf3126a6c39fac88 Mon Sep 17 00:00:00 2001 From: parrt Date: Mon, 17 Dec 2018 14:43:23 -0800 Subject: [PATCH 2/2] tweak script --- scripts/github_release_notes.py | 56 +++++++++++++++------------------ 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/scripts/github_release_notes.py b/scripts/github_release_notes.py index a0b12d2072..10b8cca8ce 100644 --- a/scripts/github_release_notes.py +++ b/scripts/github_release_notes.py @@ -19,36 +19,32 @@ issues = repo.get_issues(state="closed", milestone=milestone, sort="created", direction="desc") -# # dump bugs fixed -# print() -# print("## Issues fixed") -# for x in issues: -# labels = [l.name for l in x.labels] -# if x.pull_request is None and not ("type:improvement" in labels or "type:feature" in labels): -# print("* [%s](%s) (%s)" % (x.title, x.html_url, ", ".join([l.name for l in x.labels]))) -# -# -# print() -# # dump improvements closed for this release (issues or pulls) -# print("## Improvements, features") -# for x in issues: -# labels = [l.name for l in x.labels] -# if ("type:improvement" in labels or "type:feature" in labels): -# print("* [%s](%s) (%s)" % (x.title, x.html_url, ", ".join(labels))) -# -# print() -# -# -# # dump PRs closed for this release by target -# print("## Pull requests grouped by target") -# for target in TARGETS: -# print() -# print(f"### {target} target") -# for x in issues: -# labels = [l.name for l in x.labels] -# if x.pull_request is not None and f"target:{target}" in labels: -# print("* [%s](%s) (%s)" % (x.title, x.html_url, ", ".join(labels))) -# +# dump bugs fixed +print() +print("## Issues fixed") +for x in issues: + labels = [l.name for l in x.labels] + if x.pull_request is None and not ("type:improvement" in labels or "type:feature" in labels): + print("* [%s](%s) (%s)" % (x.title, x.html_url, ", ".join([l.name for l in x.labels]))) + +# dump improvements closed for this release (issues or pulls) +print() +print("## Improvements, features") +for x in issues: + labels = [l.name for l in x.labels] + if ("type:improvement" in labels or "type:feature" in labels): + print("* [%s](%s) (%s)" % (x.title, x.html_url, ", ".join(labels))) + +# dump PRs closed for this release by target +print() +print("## Pull requests grouped by target") +for target in TARGETS: + print() + print(f"### {target} target") + for x in issues: + labels = [l.name for l in x.labels] + if x.pull_request is not None and f"target:{target}" in labels: + print("* [%s](%s) (%s)" % (x.title, x.html_url, ", ".join(labels))) # dump contributors print()