Merge pull request antlr#1691 from parrt/4.6.1-to-4.7

parrt · web-flow · commit ec428d112403 · 2017-02-23T14:52:40.000-08:00
rename 4.6.1 to 4.7 everywhere
diff --git a/antlr4-maven-plugin/pom.xml b/antlr4-maven-plugin/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
@@ -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>
diff --git a/runtime-testsuite/annotations/pom.xml b/runtime-testsuite/annotations/pom.xml
@@ -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>
diff --git a/runtime-testsuite/pom.xml b/runtime-testsuite/pom.xml
@@ -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>
diff --git a/runtime-testsuite/processors/pom.xml b/runtime-testsuite/processors/pom.xml
@@ -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>
diff --git 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.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
diff --git a/runtime/CSharp/runtime/CSharp/Package.nuspec b/runtime/CSharp/runtime/CSharp/Package.nuspec
@@ -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>
diff --git a/runtime/CSharp/runtime/CSharp/project.json b/runtime/CSharp/runtime/CSharp/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.6.1-*",
+  "version": "4.7-*",
   "frameworks": {
     "netstandard1.3": {
       "dependencies": {
diff --git a/runtime/Cpp/VERSION b/runtime/Cpp/VERSION
@@ -1 +1 @@
-4.6.1
+4.7
diff --git a/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake b/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake
@@ -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}")
diff --git 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.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
diff --git 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.6.1";
+const std::string RuntimeMetaData::VERSION = "4.7";
 
 std::string RuntimeMetaData::getRuntimeVersion() {
   return VERSION;
diff --git 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.6.1"
+	runtimeVersion := "4.7"
 	if runtimeVersion != toolVersion {
 		fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
 	}
diff --git a/runtime/Java/pom.xml b/runtime/Java/pom.xml
@@ -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>
diff --git a/runtime/Java/src/org/antlr/v4/runtime/Parser.java b/runtime/Java/src/org/antlr/v4/runtime/Parser.java
@@ -595,7 +595,7 @@ public Token consume() {
 	/** 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 TerminalNode createTerminalNode(ParserRuleContext parent, Token t) {
 	/** 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);
diff --git a/runtime/Java/src/org/antlr/v4/runtime/ParserRuleContext.java b/runtime/Java/src/org/antlr/v4/runtime/ParserRuleContext.java
@@ -127,7 +127,7 @@ public void exitRule(ParseTreeListener listener) { }
 	 *  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 TerminalNode addChild(TerminalNode t) {
 
 	/** 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);
diff --git 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.</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.
diff --git a/runtime/Java/src/org/antlr/v4/runtime/tree/TerminalNode.java b/runtime/Java/src/org/antlr/v4/runtime/tree/TerminalNode.java
@@ -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);
 }
diff --git 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.6.1";
+    var runtimeVersion = "4.7";
     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
@@ -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",
diff --git a/runtime/Python2/setup.py b/runtime/Python2/setup.py
@@ -2,12 +2,12 @@
 
 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'
 )
diff --git 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.6.1"
+        runtimeVersion = "4.7"
         rvmajor, rvminor = self.extractVersion(runtimeVersion)
         tvmajor, tvminor = self.extractVersion(toolVersion)
         if rvmajor!=tvmajor or rvminor!=tvminor:
diff --git a/runtime/Python3/setup.py b/runtime/Python3/setup.py
@@ -2,12 +2,12 @@
 
 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'
 )
diff --git 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.6.1"
+        runtimeVersion = "4.7"
         rvmajor, rvminor = self.extractVersion(runtimeVersion)
         tvmajor, tvminor = self.extractVersion(toolVersion)
         if rvmajor!=tvmajor or rvminor!=tvminor:
diff --git a/runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift b/runtime/Swift/Sources/Antlr4/RuntimeMetaData.swift
@@ -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.
diff --git a/runtime/Swift/Tests/Antlr4Tests/SwiftTestLexer.swift b/runtime/Swift/Tests/Antlr4Tests/SwiftTestLexer.swift
@@ -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)
 	}
diff --git a/tool-codegen/pom.xml b/tool-codegen/pom.xml
@@ -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>
diff --git a/tool-testsuite/pom.xml b/tool-testsuite/pom.xml
@@ -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>
diff --git a/tool/pom.xml b/tool/pom.xml
@@ -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>
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
@@ -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)
 }
diff --git 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.6.1";
+        return "4.7";
     }
 
 	@Override
diff --git a/tool/src/org/antlr/v4/codegen/target/CppTarget.java b/tool/src/org/antlr/v4/codegen/target/CppTarget.java
@@ -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 CppTarget(CodeGenerator gen) {
 	}
 
 	public String getVersion() {
-		return "4.6.1";
+		return "4.7";
 	}
 
     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
@@ -61,7 +61,7 @@ public GoTarget(CodeGenerator gen) {
 
 	@Override
 	public String getVersion() {
-		return "4.6.1";
+		return "4.7";
 	}
 
 	public Set<String> getBadWords() {
diff --git 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.6.1";
+        return "4.7";
     }
 
     public Set<String> getBadWords() {
diff --git a/tool/src/org/antlr/v4/codegen/target/Python2Target.java b/tool/src/org/antlr/v4/codegen/target/Python2Target.java
@@ -94,7 +94,7 @@ public boolean supportsOverloadedMethods() {
 
 	@Override
 	public String getVersion() {
-		return "4.6.1";
+		return "4.7";
 	}
 
 	public Set<String> getBadWords() {
diff --git a/tool/src/org/antlr/v4/codegen/target/Python3Target.java b/tool/src/org/antlr/v4/codegen/target/Python3Target.java
@@ -96,7 +96,7 @@ public boolean supportsOverloadedMethods() {
 
 	@Override
 	public String getVersion() {
-		return "4.6.1";
+		return "4.7";
 	}
 
 	/** 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
@@ -87,7 +87,7 @@ public SwiftTarget(CodeGenerator gen) {
 
     @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() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "4.6.1-*",`
	`2`	`+ "version": "4.7-*",`
`3`	`3`	`"frameworks": {`
`4`	`4`	`"netstandard1.3": {`
`5`	`5`	`"dependencies": {`