Introduce grammar name and type autodetection in tests

Support of several [grammar] sections (for grammars with separated lexer and parser) Add more checks to tests Signed-off-by: Ivan Kochurkin <[email protected]>
antlr · Feb 10, 2024 · caad8fc · caad8fc
1 parent 1bb23c2
commit caad8fc
Show file tree

Hide file tree

Showing 379 changed files with 841 additions and 1,922 deletions.
diff --git a/...g/antlr/v5/test/runtime/descriptors/CompositeLexers/LexerDelegatorInvokesDelegateRule.txt b/...g/antlr/v5/test/runtime/descriptors/CompositeLexers/LexerDelegatorInvokesDelegateRule.txt
@@ -1,6 +1,3 @@
-[type]
-Lexer
-
 [grammar]
 lexer grammar M;
 import S;

diff --git a/...antlr/v5/test/runtime/descriptors/CompositeLexers/LexerDelegatorRuleOverridesDelegate.txt b/...antlr/v5/test/runtime/descriptors/CompositeLexers/LexerDelegatorRuleOverridesDelegate.txt
@@ -1,6 +1,3 @@
-[type]
-Lexer
-
 [grammar]
 lexer grammar M;
 import S;

diff --git a/...es/org/antlr/v5/test/runtime/descriptors/CompositeParsers/BringInLiteralsFromDelegate.txt b/...es/org/antlr/v5/test/runtime/descriptors/CompositeParsers/BringInLiteralsFromDelegate.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...ources/org/antlr/v5/test/runtime/descriptors/CompositeParsers/CombinedImportsCombined.txt b/...ources/org/antlr/v5/test/runtime/descriptors/CompositeParsers/CombinedImportsCombined.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...rces/org/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatesSeeSameTokenType.txt b/...rces/org/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatesSeeSameTokenType.txt
@@ -10,9 +10,6 @@ public static final int B=5;
 public static final int WS=7;
 public static final int A=4;
 
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S,T;

diff --git a/...g/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorAccessesDelegateMembers.txt b/...g/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorAccessesDelegateMembers.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M; // uses no rules from the import
 import S;

diff --git a/...s/org/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorInvokesDelegateRule.txt b/...s/org/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorInvokesDelegateRule.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...tlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorInvokesDelegateRuleWithArgs.txt b/...tlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorInvokesDelegateRuleWithArgs.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...est/runtime/descriptors/CompositeParsers/DelegatorInvokesDelegateRuleWithReturnStruct.txt b/...est/runtime/descriptors/CompositeParsers/DelegatorInvokesDelegateRuleWithReturnStruct.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/.../test/runtime/descriptors/CompositeParsers/DelegatorInvokesFirstVersionOfDelegateRule.txt b/.../test/runtime/descriptors/CompositeParsers/DelegatorInvokesFirstVersionOfDelegateRule.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S,T;

diff --git a/...org/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorRuleOverridesDelegate.txt b/...org/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorRuleOverridesDelegate.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...rg/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorRuleOverridesDelegates.txt b/...rg/antlr/v5/test/runtime/descriptors/CompositeParsers/DelegatorRuleOverridesDelegates.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S, T;

diff --git a/...5/test/runtime/descriptors/CompositeParsers/DelegatorRuleOverridesLookaheadInDelegate.txt b/...5/test/runtime/descriptors/CompositeParsers/DelegatorRuleOverridesLookaheadInDelegate.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...g/antlr/v5/test/runtime/descriptors/CompositeParsers/ImportLexerWithOnlyFragmentRules.txt b/...g/antlr/v5/test/runtime/descriptors/CompositeParsers/ImportLexerWithOnlyFragmentRules.txt
@@ -2,9 +2,6 @@
 This is a regression test for antlr/antlr4#248 "Including grammar with only
 fragments breaks generated lexer".  https://github.com/antlr/antlr4/issues/248
 
-[type]
-Parser
-
 [grammar]
 grammar Test;
 import Unicode;

diff --git a/...rg/antlr/v5/test/runtime/descriptors/CompositeParsers/ImportedGrammarWithEmptyOptions.txt b/...rg/antlr/v5/test/runtime/descriptors/CompositeParsers/ImportedGrammarWithEmptyOptions.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...sources/org/antlr/v5/test/runtime/descriptors/CompositeParsers/ImportedRuleWithAction.txt b/...sources/org/antlr/v5/test/runtime/descriptors/CompositeParsers/ImportedRuleWithAction.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...ite/resources/org/antlr/v5/test/runtime/descriptors/CompositeParsers/KeywordVSIDOrder.txt b/...ite/resources/org/antlr/v5/test/runtime/descriptors/CompositeParsers/KeywordVSIDOrder.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar M;
 import S;

diff --git a/...s/org/antlr/v5/test/runtime/descriptors/FullContextParsing/AmbigYieldsCtxSensitiveDFA.txt b/...s/org/antlr/v5/test/runtime/descriptors/FullContextParsing/AmbigYieldsCtxSensitiveDFA.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<DumpDFA()>}

diff --git a/...te/resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/AmbiguityNoLoop.txt b/...te/resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/AmbiguityNoLoop.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 prog

diff --git a/.../org/antlr/v5/test/runtime/descriptors/FullContextParsing/CtxSensitiveDFATwoDiffInput.txt b/.../org/antlr/v5/test/runtime/descriptors/FullContextParsing/CtxSensitiveDFATwoDiffInput.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<DumpDFA()>}

diff --git a/.../resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/CtxSensitiveDFA_1.txt b/.../resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/CtxSensitiveDFA_1.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<DumpDFA()>}

diff --git a/.../resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/CtxSensitiveDFA_2.txt b/.../resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/CtxSensitiveDFA_2.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<DumpDFA()>}

diff --git a/...te/resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/ExprAmbiguity_1.txt b/...te/resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/ExprAmbiguity_1.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s

diff --git a/...te/resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/ExprAmbiguity_2.txt b/...te/resources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/ExprAmbiguity_2.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s

diff --git a/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_1.txt b/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_1.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s

diff --git a/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_2.txt b/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_2.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s

diff --git a/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_3.txt b/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_3.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s

diff --git a/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_4.txt b/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_4.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s

diff --git a/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_5.txt b/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_5.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s

diff --git a/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_6.txt b/...g/antlr/v5/test/runtime/descriptors/FullContextParsing/FullContextIF_THEN_ELSEParse_6.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s

diff --git a/...s/org/antlr/v5/test/runtime/descriptors/FullContextParsing/LoopsSimulateTailRecursion.txt b/...s/org/antlr/v5/test/runtime/descriptors/FullContextParsing/LoopsSimulateTailRecursion.txt
@@ -2,9 +2,6 @@
 Tests predictions for the following case involving closures.
 http://www.antlr.org/wiki/display/~admin/2011/12/29/Flaw+in+ANTLR+v3+LL(*)+analysis+algorithm
 
-[type]
-Parser
-
 [grammar]
 grammar T;
 prog

diff --git a/...ources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/SLLSeesEOFInLLGrammar.txt b/...ources/org/antlr/v5/test/runtime/descriptors/FullContextParsing/SLLSeesEOFInLLGrammar.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<DumpDFA()>}

diff --git a/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_1.txt b/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_1.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar Expr;
 prog:   stat ;

diff --git a/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_2.txt b/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_2.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar Expr;
 prog:   stat ;

diff --git a/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_3.txt b/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_3.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar Expr;
 prog:   stat ;

diff --git a/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_4.txt b/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_4.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar Expr;
 prog:   stat ;

diff --git a/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_5.txt b/...ime-testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/AmbigLR_5.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar Expr;
 prog:   stat ;

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_1.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_1.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...stsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_10.txt b/...stsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_10.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_2.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_2.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_3.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_3.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_4.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_4.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_5.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_5.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_6.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_6.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_7.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_7.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_8.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_8.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_9.txt b/...estsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Declarations_9.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : declarator EOF ; // must indicate EOF can follow

diff --git a/...s/org/antlr/v5/test/runtime/descriptors/LeftRecursion/DirectCallToLeftRecursiveRule_1.txt b/...s/org/antlr/v5/test/runtime/descriptors/LeftRecursion/DirectCallToLeftRecursiveRule_1.txt
@@ -2,9 +2,6 @@
 This is a regression test for "Support direct calls to left-recursive
 rules".  https://github.com/antlr/antlr4/issues/161
 
-[type]
-Parser
-
 [grammar]
 grammar T;
 a @after {<ToStringTree("$ctx"):writeln()>} : a ID

diff --git a/...s/org/antlr/v5/test/runtime/descriptors/LeftRecursion/DirectCallToLeftRecursiveRule_2.txt b/...s/org/antlr/v5/test/runtime/descriptors/LeftRecursion/DirectCallToLeftRecursiveRule_2.txt
@@ -2,9 +2,6 @@
 This is a regression test for "Support direct calls to left-recursive
 rules".  https://github.com/antlr/antlr4/issues/161
 
-[type]
-Parser
-
 [grammar]
 grammar T;
 a @after {<ToStringTree("$ctx"):writeln()>} : a ID

diff --git a/...s/org/antlr/v5/test/runtime/descriptors/LeftRecursion/DirectCallToLeftRecursiveRule_3.txt b/...s/org/antlr/v5/test/runtime/descriptors/LeftRecursion/DirectCallToLeftRecursiveRule_3.txt
@@ -2,9 +2,6 @@
 This is a regression test for "Support direct calls to left-recursive
 rules".  https://github.com/antlr/antlr4/issues/161
 
-[type]
-Parser
-
 [grammar]
 grammar T;
 a @after {<ToStringTree("$ctx"):writeln()>} : a ID

diff --git a/...testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Expressions_1.txt b/...testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Expressions_1.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : e EOF ; // must indicate EOF can follow

diff --git a/...testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Expressions_2.txt b/...testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Expressions_2.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : e EOF ; // must indicate EOF can follow

diff --git a/...testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Expressions_3.txt b/...testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Expressions_3.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : e EOF ; // must indicate EOF can follow

diff --git a/...testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Expressions_4.txt b/...testsuite/resources/org/antlr/v5/test/runtime/descriptors/LeftRecursion/Expressions_4.txt
@@ -1,6 +1,3 @@
-[type]
-Parser
-
 [grammar]
 grammar T;
 s @after {<ToStringTree("$ctx"):writeln()>} : e EOF ; // must indicate EOF can follow