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

rename 4.6.1 to 4.7 everywhere

This commit is contained in:
parrt 2017-02-23 14:48:58 -08:00
parent 05dad185f3
commit 6215f18ec3
37 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
antlr4-maven-plugin/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
</parent>
<artifactId>antlr4-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

2
pom.xml
View File

@ -13,7 +13,7 @@
</parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ANTLR 4</name>

2
runtime-testsuite/annotations/pom.xml
View File

@ -9,7 +9,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>antlr4-runtime-test-annotations</artifactId>

2
runtime-testsuite/pom.xml
View File

@ -10,7 +10,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
</parent>
<artifactId>antlr4-runtime-testsuite</artifactId>
<name>ANTLR 4 Runtime Tests (2nd generation)</name>

2
runtime-testsuite/processors/pom.xml
View File

@ -9,7 +9,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>antlr4-runtime-test-annotation-processors</artifactId>

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.6.1")]
[assembly: AssemblyVersion("4.7")]
#if !COMPACT
[assembly: AssemblyFileVersion("4.6.1")]
[assembly: AssemblyInformationalVersion("4.6.1")]
[assembly: AssemblyFileVersion("4.7")]
[assembly: AssemblyInformationalVersion("4.7")]
#endif

2
runtime/CSharp/runtime/CSharp/Package.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Antlr4.Runtime.Standard</id>
<version>4.6.1</version>
<version>4.7</version>
<language>en-us</language>
<title>ANTLR 4 Standard Runtime</title>
<description>The standard C# ANTLR 4 runtime from the ANTLR Organization</description>

2
runtime/CSharp/runtime/CSharp/project.json
View File

@ -1,5 +1,5 @@
{
"version": "4.6.1-*",
"version": "4.7-*",
"frameworks": {
"netstandard1.3": {
"dependencies": {

2
runtime/Cpp/VERSION
View File

@ -1 +1 @@
4.6.1
4.7

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

@ -66,7 +66,7 @@ set(ANTLR4CPP_EXTERNAL_ROOT ${CMAKE_BINARY_DIR}/externals/antlr4cpp)
# external repository
# GIT_REPOSITORY https://github.com/antlr/antlr4.git
set(ANTLR4CPP_EXTERNAL_REPO "https://github.com/antlr/antlr4.git")
set(ANTLR4CPP_EXTERNAL_TAG "4.6.1")
set(ANTLR4CPP_EXTERNAL_TAG "4.7")
if(NOT EXISTS "${ANTLR4CPP_JAR_LOCATION}")
message(FATAL_ERROR "Unable to find antlr tool. ANTLR4CPP_JAR_LOCATION:${ANTLR4CPP_JAR_LOCATION}")

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.6.1-complete.jar
set LOCATION=antlr-4.7-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.6.1";
const std::string RuntimeMetaData::VERSION = "4.7";
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.6.1"
runtimeVersion := "4.7"
if runtimeVersion != toolVersion {
fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
}

2
runtime/Java/pom.xml
View File

@ -9,7 +9,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>antlr4-runtime</artifactId>

4
runtime/Java/src/org/antlr/v4/runtime/Parser.java
View File

@ -595,7 +595,7 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator> {
/** How to create a token leaf node associated with a parent.
* Typically, the terminal node to create is not a function of the parent.
*
* @since 4.6.1
* @since 4.7
*/
public TerminalNode createTerminalNode(ParserRuleContext parent, Token t) {
return new TerminalNodeImpl(t);
@ -604,7 +604,7 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator> {
/** How to create an error node, given a token, associated with a parent.
* Typically, the error node to create is not a function of the parent.
*
* @since 4.6.1
* @since 4.7
*/
public ErrorNode createErrorNode(ParserRuleContext parent, Token t) {
return new ErrorNodeImpl(t);

4
runtime/Java/src/org/antlr/v4/runtime/ParserRuleContext.java
View File

@ -127,7 +127,7 @@ public class ParserRuleContext extends RuleContext {
* because the existing interfaces do not have a setParent()
* method and I don't want to break backward compatibility for this.
*
* @since 4.6.1
* @since 4.7
*/
public <T extends ParseTree> T addAnyChild(T t) {
if ( children==null ) children = new ArrayList<>();
@ -147,7 +147,7 @@ public class ParserRuleContext extends RuleContext {
/** Add an error node child and force its parent to be this node.
*
* @since 4.6.1
* @since 4.7
*/
public ErrorNode addErrorNode(ErrorNode errorNode) {
errorNode.setParent(this);

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.6.1";
public static final String VERSION = "4.7";
/**
* Gets the currently executing version of the ANTLR 4 runtime library.

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

@ -19,7 +19,7 @@ public interface TerminalNode extends ParseTree {
* TerminalNodes anyway so I'm adding as it improves internal
* code quality.
*
* @since 4.6.1
* @since 4.7
*/
void setParent(RuleContext parent);
}

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

@ -21,7 +21,7 @@ Recognizer.ruleIndexMapCache = {};
Recognizer.prototype.checkVersion = function(toolVersion) {
var runtimeVersion = "4.6.1";
var runtimeVersion = "4.7";
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.6.1",
"version": "4.7",
"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 distutils.core import setup
setup(
name='antlr4-python2-runtime',
version='4.6.1',
version='4.7',
packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
package_dir={'': 'src'},
url='http://www.antlr.org',
license='BSD',
author='Eric Vergnaud, Terence Parr, Sam Harwell',
author_email='eric.vergnaud@wanadoo.fr',
description='ANTLR 4.6.1 runtime for Python 2.7.6'
description='ANTLR 4.7 runtime for Python 2.7.6'
)

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.6.1"
runtimeVersion = "4.7"
rvmajor, rvminor = self.extractVersion(runtimeVersion)
tvmajor, tvminor = self.extractVersion(toolVersion)
if rvmajor!=tvmajor or rvminor!=tvminor:

4
runtime/Python3/setup.py
View File

@ -2,12 +2,12 @@ from distutils.core import setup
setup(
name='antlr4-python3-runtime',
version='4.6.1',
version='4.7',
packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
package_dir={'': 'src'},
url='http://www.antlr.org',
license='BSD',
author='Eric Vergnaud, Terence Parr, Sam Harwell',
author_email='eric.vergnaud@wanadoo.fr',
description='ANTLR 4.6.1 runtime for Python 3.4.0'
description='ANTLR 4.7 runtime for Python 3.4.0'
)

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.6.1"
runtimeVersion = "4.7"
rvmajor, rvminor = self.extractVersion(runtimeVersion)
tvmajor, tvminor = self.extractVersion(toolVersion)
if rvmajor!=tvmajor or rvminor!=tvminor:

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

@ -66,7 +66,7 @@ public class RuntimeMetaData {
* omitted.</li>
* </ul>
*/
public static let VERSION: String = "4.6.1"
public static let VERSION: String = "4.7"
/**
* Gets the currently executing version of the ANTLR 4 runtime library.

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

@ -62,7 +62,7 @@ open class SwiftTestLexer: Lexer {
}
public override init(_ input: CharStream) {
RuntimeMetaData.checkVersion("4.6.1", RuntimeMetaData.VERSION)
RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION)
super.init(input)
_interp = LexerATNSimulator(self, SwiftTestLexer._ATN, SwiftTestLexer._decisionToDFA, SwiftTestLexer._sharedContextCache)
}

2
tool-codegen/pom.xml
View File

@ -9,7 +9,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
</parent>
<artifactId>antlr4-tool-codegen</artifactId>
<name>ANTLR 4 Tool Codegen</name>

2
tool-testsuite/pom.xml
View File

@ -10,7 +10,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
</parent>
<artifactId>antlr4-tool-testsuite</artifactId>
<name>ANTLR 4 Tool Tests</name>

2
tool/pom.xml
View File

@ -9,7 +9,7 @@
<parent>
<groupId>org.antlr</groupId>
<artifactId>antlr4-master</artifactId>
<version>4.6.1-SNAPSHOT</version>
<version>4.7-SNAPSHOT</version>
</parent>
<artifactId>antlr4</artifactId>
<name>ANTLR 4 Tool</name>

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

@ -362,7 +362,7 @@ open override func getVocabulary() -> Vocabulary {
}
public override init(_ input:TokenStream)throws {
RuntimeMetaData.checkVersion("4.6.1", RuntimeMetaData.VERSION)
RuntimeMetaData.checkVersion("4.7", 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.6.1";
return "4.7";
}
@Override

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

@ -6,9 +6,9 @@
package org.antlr.v4.codegen.target;
import org.antlr.v4.codegen.UnicodeEscapes;
import org.antlr.v4.codegen.CodeGenerator;
import org.antlr.v4.codegen.Target;
import org.antlr.v4.codegen.UnicodeEscapes;
import org.antlr.v4.tool.ErrorType;
import org.antlr.v4.tool.ast.GrammarAST;
import org.stringtemplate.v4.NumberRenderer;
@ -50,7 +50,7 @@ public class CppTarget extends Target {
}
public String getVersion() {
return "4.6.1";
return "4.7";
}
public boolean needsHeader() { return true; }

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

@ -61,7 +61,7 @@ public class GoTarget extends Target {
@Override
public String getVersion() {
return "4.6.1";
return "4.7";
}
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.6.1";
return "4.7";
}
public Set<String> getBadWords() {

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

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

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

@ -96,7 +96,7 @@ public class Python3Target extends Target {
@Override
public String getVersion() {
return "4.6.1";
return "4.7";
}
/** 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.6.1"; // Java and tool versions move in lock step
return "4.7"; // Java and tool versions move in lock step
}
public Set<String> getBadWords() {