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

Throw error if lexer does not contain non-fragment rules, extend TestToolSyntaxErrors testA, fix #3000

This commit is contained in:
Ivan Kochurkin 2020-12-29 16:32:22 +03:00
parent 92bee7d929
commit 67f6089261
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java
View File

@ -13,16 +13,21 @@ import org.junit.Before;
import org.junit.Test;
public class TestToolSyntaxErrors extends BaseJavaToolTest {
static String[] A = {
// INPUT
static String[] A = {
// INPUT
"grammar A;\n" +
"",
// YIELDS
"error(" + ErrorType.NO_RULES.code + "): A.g4::: grammar A has no rules\n",
"error(" + ErrorType.NO_RULES.code + "): A.g4::: grammar A has no non-fragment rules\n",
"lexer grammar A;\n" +
"",
"error(" + ErrorType.NO_RULES.code + "): A.g4::: grammar A has no rules\n",
"error(" + ErrorType.NO_RULES.code + "): A.g4::: grammar A has no non-fragment rules\n",
"lexer grammar A;\n" +
"fragment FRAGMENT: 'FRAGMENT';\n" +
"",
"error(" + ErrorType.NO_RULES.code + "): A.g4::: grammar A has no non-fragment rules\n",
"A;",
"error(" + ErrorType.SYNTAX_ERROR.code + "): A.g4:1:0: syntax error: 'A' came as a complete surprise to me\n",

11
tool/src/org/antlr/v4/semantics/BasicSemanticChecks.java
View File

@ -321,7 +321,16 @@ public class BasicSemanticChecks extends GrammarTreeVisitor {
}
void checkNumRules(GrammarAST rulesNode) {
if ( rulesNode.getChildCount()==0 ) {
Boolean emptyGrammar = true;
for (Rule rule : ruleCollector.rules.values()) {
if (!rule.isFragment()) {
emptyGrammar = false;
break;
}
}
if (emptyGrammar) {
GrammarAST root = (GrammarAST)rulesNode.getParent();
GrammarAST IDNode = (GrammarAST)root.getChild(0);
g.tool.errMgr.grammarError(ErrorType.NO_RULES, g.fileName,

2
tool/src/org/antlr/v4/tool/ErrorType.java
View File

@ -341,7 +341,7 @@ public enum ErrorType {
* <li>implicitly generated grammar <em>grammar</em> has no rules</li>
* </ul>
*/
NO_RULES(99, "<if(arg2.implicitLexerOwner)>implicitly generated <endif>grammar <arg> has no rules", ErrorSeverity.ERROR),
NO_RULES(99, "<if(arg2.implicitLexerOwner)>implicitly generated <endif>grammar <arg> has no non-fragment rules", ErrorSeverity.ERROR),
/**
* Compiler Error 105.
*