Skip to content

Commit 6215f18

Browse files
parrtparrt
committed
rename 4.6.1 to 4.7 everywhere
1 parent 05dad18 commit 6215f18

File tree

37 files changed

+44
-44
lines changed

37 files changed

+44
-44
lines changed

‎antlr4-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.antlr</groupId>
1010
<artifactId>antlr4-master</artifactId>
11-
<version>4.6.1-SNAPSHOT</version>
11+
<version>4.7-SNAPSHOT</version>
1212
</parent>
1313
<artifactId>antlr4-maven-plugin</artifactId>
1414
<packaging>maven-plugin</packaging>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</parent>
1414
<groupId>org.antlr</groupId>
1515
<artifactId>antlr4-master</artifactId>
16-
<version>4.6.1-SNAPSHOT</version>
16+
<version>4.7-SNAPSHOT</version>
1717
<packaging>pom</packaging>
1818

1919
<name>ANTLR 4</name>

‎runtime-testsuite/annotations/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.antlr</groupId>
1111
<artifactId>antlr4-master</artifactId>
12-
<version>4.6.1-SNAPSHOT</version>
12+
<version>4.7-SNAPSHOT</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515
<artifactId>antlr4-runtime-test-annotations</artifactId>

‎runtime-testsuite/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.antlr</groupId>
1212
<artifactId>antlr4-master</artifactId>
13-
<version>4.6.1-SNAPSHOT</version>
13+
<version>4.7-SNAPSHOT</version>
1414
</parent>
1515
<artifactId>antlr4-runtime-testsuite</artifactId>
1616
<name>ANTLR 4 Runtime Tests (2nd generation)</name>

‎runtime-testsuite/processors/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.antlr</groupId>
1111
<artifactId>antlr4-master</artifactId>
12-
<version>4.6.1-SNAPSHOT</version>
12+
<version>4.7-SNAPSHOT</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515
<artifactId>antlr4-runtime-test-annotation-processors</artifactId>

‎runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444
// [assembly: AssemblyVersion("1.0.*")]
45-
[assembly: AssemblyVersion("4.6.1")]
45+
[assembly: AssemblyVersion("4.7")]
4646
#if !COMPACT
47-
[assembly: AssemblyFileVersion("4.6.1")]
48-
[assembly: AssemblyInformationalVersion("4.6.1")]
47+
[assembly: AssemblyFileVersion("4.7")]
48+
[assembly: AssemblyInformationalVersion("4.7")]
4949
#endif

‎runtime/CSharp/runtime/CSharp/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>Antlr4.Runtime.Standard</id>
5-
<version>4.6.1</version>
5+
<version>4.7</version>
66
<language>en-us</language>
77
<title>ANTLR 4 Standard Runtime</title>
88
<description>The standard C# ANTLR 4 runtime from the ANTLR Organization</description>

‎runtime/CSharp/runtime/CSharp/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "4.6.1-*",
2+
"version": "4.7-*",
33
"frameworks": {
44
"netstandard1.3": {
55
"dependencies": {

‎runtime/Cpp/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.6.1
1+
4.7

‎runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ set(ANTLR4CPP_EXTERNAL_ROOT ${CMAKE_BINARY_DIR}/externals/antlr4cpp)
6666
# external repository
6767
# GIT_REPOSITORY https://github.com/antlr/antlr4.git
6868
set(ANTLR4CPP_EXTERNAL_REPO "https://github.com/antlr/antlr4.git")
69-
set(ANTLR4CPP_EXTERNAL_TAG "4.6.1")
69+
set(ANTLR4CPP_EXTERNAL_TAG "4.7")
7070

7171
if(NOT EXISTS "${ANTLR4CPP_JAR_LOCATION}")
7272
message(FATAL_ERROR "Unable to find antlr tool. ANTLR4CPP_JAR_LOCATION:${ANTLR4CPP_JAR_LOCATION}")

‎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.6.1-complete.jar
9+
set LOCATION=antlr-4.7-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/RuntimeMetaData.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using namespace antlr4;
99

10-
const std::string RuntimeMetaData::VERSION = "4.6.1";
10+
const std::string RuntimeMetaData::VERSION = "4.7";
1111

1212
std::string RuntimeMetaData::getRuntimeVersion() {
1313
return VERSION;

‎runtime/Go/antlr/recognizer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var tokenTypeMapCache = make(map[string]int)
4949
var ruleIndexMapCache = make(map[string]int)
5050

5151
func (b *BaseRecognizer) checkVersion(toolVersion string) {
52-
runtimeVersion := "4.6.1"
52+
runtimeVersion := "4.7"
5353
if runtimeVersion != toolVersion {
5454
fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
5555
}

‎runtime/Java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.antlr</groupId>
1111
<artifactId>antlr4-master</artifactId>
12-
<version>4.6.1-SNAPSHOT</version>
12+
<version>4.7-SNAPSHOT</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515
<artifactId>antlr4-runtime</artifactId>

‎runtime/Java/src/org/antlr/v4/runtime/Parser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ public Token consume() {
595595
/** How to create a token leaf node associated with a parent.
596596
* Typically, the terminal node to create is not a function of the parent.
597597
*
598-
* @since 4.6.1
598+
* @since 4.7
599599
*/
600600
public TerminalNode createTerminalNode(ParserRuleContext parent, Token t) {
601601
return new TerminalNodeImpl(t);
@@ -604,7 +604,7 @@ public TerminalNode createTerminalNode(ParserRuleContext parent, Token t) {
604604
/** How to create an error node, given a token, associated with a parent.
605605
* Typically, the error node to create is not a function of the parent.
606606
*
607-
* @since 4.6.1
607+
* @since 4.7
608608
*/
609609
public ErrorNode createErrorNode(ParserRuleContext parent, Token t) {
610610
return new ErrorNodeImpl(t);

‎runtime/Java/src/org/antlr/v4/runtime/ParserRuleContext.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void exitRule(ParseTreeListener listener) { }
127127
* because the existing interfaces do not have a setParent()
128128
* method and I don't want to break backward compatibility for this.
129129
*
130-
* @since 4.6.1
130+
* @since 4.7
131131
*/
132132
public <T extends ParseTree> T addAnyChild(T t) {
133133
if ( children==null ) children = new ArrayList<>();
@@ -147,7 +147,7 @@ public TerminalNode addChild(TerminalNode t) {
147147

148148
/** Add an error node child and force its parent to be this node.
149149
*
150-
* @since 4.6.1
150+
* @since 4.7
151151
*/
152152
public ErrorNode addErrorNode(ErrorNode errorNode) {
153153
errorNode.setParent(this);

‎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.6.1";
70+
public static final String VERSION = "4.7";
7171

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

‎runtime/Java/src/org/antlr/v4/runtime/tree/TerminalNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public interface TerminalNode extends ParseTree {
1919
* TerminalNodes anyway so I'm adding as it improves internal
2020
* code quality.
2121
*
22-
* @since 4.6.1
22+
* @since 4.7
2323
*/
2424
void setParent(RuleContext parent);
2525
}

‎runtime/JavaScript/src/antlr4/Recognizer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Recognizer.ruleIndexMapCache = {};
2121

2222

2323
Recognizer.prototype.checkVersion = function(toolVersion) {
24-
var runtimeVersion = "4.6.1";
24+
var runtimeVersion = "4.7";
2525
if (runtimeVersion!==toolVersion) {
2626
console.log("ANTLR runtime and generated code versions disagree: "+runtimeVersion+"!="+toolVersion);
2727
}

‎runtime/JavaScript/src/antlr4/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "antlr4",
3-
"version": "4.6.1",
3+
"version": "4.7",
44
"description": "JavaScript runtime for ANTLR4",
55
"main": "src/antlr4/index.js",
66
"repository": "antlr/antlr4.git",

‎runtime/Python2/setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
setup(
44
name='antlr4-python2-runtime',
5-
version='4.6.1',
5+
version='4.7',
66
packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
77
package_dir={'': 'src'},
88
url='http://www.antlr.org',
99
license='BSD',
1010
author='Eric Vergnaud, Terence Parr, Sam Harwell',
1111
author_email='[email protected]',
12-
description='ANTLR 4.6.1 runtime for Python 2.7.6'
12+
description='ANTLR 4.7 runtime for Python 2.7.6'
1313
)

‎runtime/Python2/src/antlr4/Recognizer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def extractVersion(self, version):
3030
return major, minor
3131

3232
def checkVersion(self, toolVersion):
33-
runtimeVersion = "4.6.1"
33+
runtimeVersion = "4.7"
3434
rvmajor, rvminor = self.extractVersion(runtimeVersion)
3535
tvmajor, tvminor = self.extractVersion(toolVersion)
3636
if rvmajor!=tvmajor or rvminor!=tvminor:

‎runtime/Python3/setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
setup(
44
name='antlr4-python3-runtime',
5-
version='4.6.1',
5+
version='4.7',
66
packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
77
package_dir={'': 'src'},
88
url='http://www.antlr.org',
99
license='BSD',
1010
author='Eric Vergnaud, Terence Parr, Sam Harwell',
1111
author_email='[email protected]',
12-
description='ANTLR 4.6.1 runtime for Python 3.4.0'
12+
description='ANTLR 4.7 runtime for Python 3.4.0'
1313
)

‎runtime/Python3/src/antlr4/Recognizer.py

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

3535
def checkVersion(self, toolVersion):
36-
runtimeVersion = "4.6.1"
36+
runtimeVersion = "4.7"
3737
rvmajor, rvminor = self.extractVersion(runtimeVersion)
3838
tvmajor, tvminor = self.extractVersion(toolVersion)
3939
if rvmajor!=tvmajor or rvminor!=tvminor:

‎runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class RuntimeMetaData {
6666
* omitted.</li>
6767
* </ul>
6868
*/
69-
public static let VERSION: String = "4.6.1"
69+
public static let VERSION: String = "4.7"
7070

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

‎runtime/Swift/Tests/Antlr4Tests/SwiftTestLexer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ open class SwiftTestLexer: Lexer {
6262
}
6363

6464
public override init(_ input: CharStream) {
65-
RuntimeMetaData.checkVersion("4.6.1", RuntimeMetaData.VERSION)
65+
RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION)
6666
super.init(input)
6767
_interp = LexerATNSimulator(self, SwiftTestLexer._ATN, SwiftTestLexer._decisionToDFA, SwiftTestLexer._sharedContextCache)
6868
}

‎tool-codegen/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.antlr</groupId>
1111
<artifactId>antlr4-master</artifactId>
12-
<version>4.6.1-SNAPSHOT</version>
12+
<version>4.7-SNAPSHOT</version>
1313
</parent>
1414
<artifactId>antlr4-tool-codegen</artifactId>
1515
<name>ANTLR 4 Tool Codegen</name>

‎tool-testsuite/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.antlr</groupId>
1212
<artifactId>antlr4-master</artifactId>
13-
<version>4.6.1-SNAPSHOT</version>
13+
<version>4.7-SNAPSHOT</version>
1414
</parent>
1515
<artifactId>antlr4-tool-testsuite</artifactId>
1616
<name>ANTLR 4 Tool Tests</name>

‎tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.antlr</groupId>
1111
<artifactId>antlr4-master</artifactId>
12-
<version>4.6.1-SNAPSHOT</version>
12+
<version>4.7-SNAPSHOT</version>
1313
</parent>
1414
<artifactId>antlr4</artifactId>
1515
<name>ANTLR 4 Tool</name>

‎tool/resources/org/antlr/v4/tool/templates/codegen/Swift/Swift.stg

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ open override func getVocabulary() -> Vocabulary {
362362
}
363363

364364
public override init(_ input:TokenStream)throws {
365-
RuntimeMetaData.checkVersion("4.6.1", RuntimeMetaData.VERSION)
365+
RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION)
366366
try super.init(input)
367367
_interp = ParserATNSimulator(self,<p.name>._ATN,<p.name>._decisionToDFA, <parser.name>._sharedContextCache)
368368
}

‎tool/src/org/antlr/v4/codegen/target/CSharpTarget.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public CSharpTarget(CodeGenerator gen) {
2828

2929
@Override
3030
public String getVersion() {
31-
return "4.6.1";
31+
return "4.7";
3232
}
3333

3434
@Override

‎tool/src/org/antlr/v4/codegen/target/CppTarget.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
package org.antlr.v4.codegen.target;
88

9-
import org.antlr.v4.codegen.UnicodeEscapes;
109
import org.antlr.v4.codegen.CodeGenerator;
1110
import org.antlr.v4.codegen.Target;
11+
import org.antlr.v4.codegen.UnicodeEscapes;
1212
import org.antlr.v4.tool.ErrorType;
1313
import org.antlr.v4.tool.ast.GrammarAST;
1414
import org.stringtemplate.v4.NumberRenderer;
@@ -50,7 +50,7 @@ public CppTarget(CodeGenerator gen) {
5050
}
5151

5252
public String getVersion() {
53-
return "4.6.1";
53+
return "4.7";
5454
}
5555

5656
public boolean needsHeader() { return true; }

‎tool/src/org/antlr/v4/codegen/target/GoTarget.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public GoTarget(CodeGenerator gen) {
6161

6262
@Override
6363
public String getVersion() {
64-
return "4.6.1";
64+
return "4.7";
6565
}
6666

6767
public Set<String> getBadWords() {

‎tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public JavaScriptTarget(CodeGenerator gen) {
5151

5252
@Override
5353
public String getVersion() {
54-
return "4.6.1";
54+
return "4.7";
5555
}
5656

5757
public Set<String> getBadWords() {

‎tool/src/org/antlr/v4/codegen/target/Python2Target.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public boolean supportsOverloadedMethods() {
9494

9595
@Override
9696
public String getVersion() {
97-
return "4.6.1";
97+
return "4.7";
9898
}
9999

100100
public Set<String> getBadWords() {

‎tool/src/org/antlr/v4/codegen/target/Python3Target.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public boolean supportsOverloadedMethods() {
9696

9797
@Override
9898
public String getVersion() {
99-
return "4.6.1";
99+
return "4.7";
100100
}
101101

102102
/** Avoid grammar symbols in this set to prevent conflicts in gen'd code. */

‎tool/src/org/antlr/v4/codegen/target/SwiftTarget.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public SwiftTarget(CodeGenerator gen) {
8787

8888
@Override
8989
public String getVersion() {
90-
return "4.6.1"; // Java and tool versions move in lock step
90+
return "4.7"; // Java and tool versions move in lock step
9191
}
9292

9393
public Set<String> getBadWords() {

0 commit comments

Comments
 (0)