Fix weird error if rule has tree name, fixes #1960

Remove backward compatibility exception v3TreeGrammarException
antlr · Dec 27, 2021 · 7b22bc5 · 7b22bc5
1 parent 13a0add
commit 7b22bc5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 36 deletions.
diff --git a/tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java
@@ -839,4 +839,11 @@ public void AllErrorCodesDistinct() {
 
 		super.testErrors(pair, true);
 	}
+
+	@Test public void testRuleNamesAsTree() {
+		String grammar = "" +
+				"grammar T;\n" +
+				"tree : 'X';";
+		super.testErrors(new String[] { grammar, "" }, true);
+	}
 }
diff --git a/tool/src/org/antlr/v4/Tool.java b/tool/src/org/antlr/v4/Tool.java
@@ -24,7 +24,6 @@
 import org.antlr.v4.parse.GrammarTreeVisitor;
 import org.antlr.v4.parse.ToolANTLRLexer;
 import org.antlr.v4.parse.ToolANTLRParser;
-import org.antlr.v4.parse.v3TreeGrammarException;
 import org.antlr.v4.runtime.RuntimeMetaData;
 import org.antlr.v4.runtime.misc.LogManager;
 import org.antlr.v4.runtime.misc.IntegerList;
@@ -657,20 +656,15 @@ public GrammarRootAST parse(String fileName, CharStream in) {
 			lexer.tokens = tokens;
 			ToolANTLRParser p = new ToolANTLRParser(tokens, this);
 			p.setTreeAdaptor(adaptor);
-			try {
-				ParserRuleReturnScope r = p.grammarSpec();
-				GrammarAST root = (GrammarAST)r.getTree();
-				if ( root instanceof GrammarRootAST) {
-					((GrammarRootAST)root).hasErrors = lexer.getNumberOfSyntaxErrors()>0 || p.getNumberOfSyntaxErrors()>0;
-					assert ((GrammarRootAST)root).tokenStream == tokens;
-					if ( grammarOptions!=null ) {
-						((GrammarRootAST)root).cmdLineOptions = grammarOptions;
-					}
-					return ((GrammarRootAST)root);
+			ParserRuleReturnScope r = p.grammarSpec();
+			GrammarAST root = (GrammarAST) r.getTree();
+			if (root instanceof GrammarRootAST) {
+				((GrammarRootAST) root).hasErrors = lexer.getNumberOfSyntaxErrors() > 0 || p.getNumberOfSyntaxErrors() > 0;
+				assert ((GrammarRootAST) root).tokenStream == tokens;
+				if (grammarOptions != null) {
+					((GrammarRootAST) root).cmdLineOptions = grammarOptions;
 				}
-			}
-			catch (v3TreeGrammarException e) {
-				errMgr.grammarError(ErrorType.V3_TREE_GRAMMAR, fileName, e.location);
+				return ((GrammarRootAST) root);
 			}
 			return null;
 		}

diff --git a/tool/src/org/antlr/v4/parse/ANTLRLexer.g b/tool/src/org/antlr/v4/parse/ANTLRLexer.g
@@ -446,7 +446,6 @@ FRAGMENT     : 'fragment'             ;
 LEXER        : 'lexer'                ;
 PARSER       : 'parser'               ;
 GRAMMAR      : 'grammar'              ;
-TREE_GRAMMAR : 'tree' WSNLCHARS* 'grammar' ;
 PROTECTED    : 'protected'            ;
 PUBLIC       : 'public'               ;
 PRIVATE      : 'private'              ;

diff --git a/tool/src/org/antlr/v4/parse/ANTLRParser.g b/tool/src/org/antlr/v4/parse/ANTLRParser.g
@@ -197,7 +197,6 @@ if ( options!=null ) {
 
 grammarType
 @after {
-	if ( $tg!=null ) throw new v3TreeGrammarException(tg);
 	if ( $t!=null ) ((GrammarRootAST)$tree).grammarType = $t.type;
 	else ((GrammarRootAST)$tree).grammarType=COMBINED;
 }
@@ -207,8 +206,6 @@ grammarType
 
 		// A combined lexer and parser specification
 		| 	g=GRAMMAR          -> GRAMMAR<GrammarRootAST>[$g, "COMBINED_GRAMMAR", getTokenStream()]
-		|   tg=TREE_GRAMMAR
-
 		)
     ;
 

diff --git a/tool/src/org/antlr/v4/parse/v3TreeGrammarException.java b/tool/src/org/antlr/v4/parse/v3TreeGrammarException.java
diff --git a/tool/src/org/antlr/v4/tool/ErrorType.java b/tool/src/org/antlr/v4/tool/ErrorType.java
@@ -1123,6 +1123,7 @@ public enum ErrorType {
 	 * instead offers automatically generated parse tree listeners and visitors
 	 * as a more maintainable alternative.</p>
 	 */
+	@Deprecated
 	V3_TREE_GRAMMAR(200, "tree grammars are not supported in ANTLR 4", ErrorSeverity.ERROR),
 	/**
 	 * Compiler Warning 201.