rule name 'state' conflict with Python runtime.

Signed-off-by: cyqw <cyqw@163.com>
antlr · Jul 28, 2024 · e8bf978 · e8bf978
1 parent 88a0c7a
commit e8bf978
Show file tree

Hide file tree

Showing 15 changed files with 144 additions and 17 deletions.
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_1.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_1.txt
@@ -0,0 +1,19 @@
+[type]
+Parser
+
+[grammar]
+grammar T;
+
+program : state*{<writeln("$text")>} EOF ;
+state: 'break;' | 'continue;' | 'return;' ;
+
+[start]
+program
+
+[input]
+break;continue;return;
+
+[output]
+"""break;continue;return;
+"""
+
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_2.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_2.txt
@@ -0,0 +1,19 @@
+[type]
+Parser
+
+[grammar]
+grammar T;
+
+program : sempred*{<writeln("$text")>} EOF ;
+sempred: 'break;' | 'continue;' | 'return;' ;
+
+[start]
+program
+
+[input]
+break;continue;return;
+
+[output]
+"""break;continue;return;
+"""
+
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_3.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_3.txt
@@ -0,0 +1,19 @@
+[type]
+Parser
+
+[grammar]
+grammar T;
+
+program : action*{<writeln("$text")>} EOF ;
+action: 'break;' | 'continue;' | 'return;' ;
+
+[start]
+program
+
+[input]
+break;continue;return;
+
+[output]
+"""break;continue;return;
+"""
+
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_4.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_4.txt
@@ -0,0 +1,19 @@
+[type]
+Parser
+
+[grammar]
+grammar T;
+
+program : ruleIndexMap*{<writeln("$text")>} EOF ;
+ruleIndexMap: 'break;' | 'continue;' | 'return;' ;
+
+[start]
+program
+
+[input]
+break;continue;return;
+
+[output]
+"""break;continue;return;
+"""
+
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_5.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_5.txt
@@ -0,0 +1,19 @@
+[type]
+Parser
+
+[grammar]
+grammar T;
+
+program : addErrorListener*{<writeln("$text")>} EOF ;
+addErrorListener: 'break;' | 'continue;' | 'return;' ;
+
+[start]
+program
+
+[input]
+break;continue;return;
+
+[output]
+"""break;continue;return;
+"""
+
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_6.txt b/runtime-testsuite/resources/org/antlr/v4/test/runtime/descriptors/ParserExec/Keyword_6.txt
@@ -0,0 +1,19 @@
+[type]
+Parser
+
+[grammar]
+grammar T;
+
+program : reset*{<writeln("$text")>} EOF ;
+reset: 'break;' | 'continue;' | 'return;' ;
+
+[start]
+program
+
+[input]
+break;continue;return;
+
+[output]
+"""break;continue;return;
+"""
+
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/PHP/PHP.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/PHP/PHP.stg
@@ -449,7 +449,7 @@ RuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs,namedActions,fina
 /**
  * @throws RecognitionException
  */
-<if(currentRule.modifiers)><currentRule.modifiers:{f | <f> }><endif>public function <currentRule.name>(<args; separator=",">): Context\\<currentRule.ctxType>
+<if(currentRule.modifiers)><currentRule.modifiers:{f | <f> }><endif>public function <currentRule.escapedName>(<args; separator=",">): Context\\<currentRule.ctxType>
 {
     $localContext = new Context\\<currentRule.ctxType>($this->ctx, $this->getState()<currentRule.args:{a | , $<a.name>}>);
 
@@ -701,7 +701,7 @@ cases(tokens) ::= <<
 
 InvokeRule(r, argExprsChunks) ::= <<
 $this->setState(<r.stateNumber>);
-<if(r.labels)><r.labels:{l | <labelref(l)> = }><endif>$this-><if(r.ast.options.p)>recursive<r.name; format="cap"><else><r.name><endif>(<if(r.ast.options.p)><r.ast.options.p><if(argExprsChunks)>,<endif><endif><argExprsChunks>);
+<if(r.labels)><r.labels:{l | <labelref(l)> = }><endif>$this-><if(r.ast.options.p)>recursive<r.name; format="cap"><else><r.escapedName><endif>(<if(r.ast.options.p)><r.ast.options.p><if(argExprsChunks)>,<endif><endif><argExprsChunks>);
 >>
 
 MatchToken(m) ::= <<

diff --git a/tool/src/org/antlr/v4/codegen/target/CppTarget.java b/tool/src/org/antlr/v4/codegen/target/CppTarget.java
@@ -48,7 +48,7 @@ public class CppTarget extends Target {
 		"using", "virtual", "void", "volatile", "wchar_t", "while",
 		"xor", "xor_eq", 
 
-		"rule", "parserRule"
+		"rule", "parserRule", "reset"
 	));
 
 	public CppTarget(CodeGenerator gen) {

diff --git a/tool/src/org/antlr/v4/codegen/target/DartTarget.java b/tool/src/org/antlr/v4/codegen/target/DartTarget.java
@@ -36,7 +36,15 @@ public class DartTarget extends Target {
 		"deferred", "hide", "return", "with",
 		"do", "if", "set", "yield",
 
-		"rule", "parserRule"
+		"rule", "parserRule",
+		"interpreter", "state", "ruleNames", "vocabulary", "ruleIndexMap", "getTokenType", "grammarFileName", "getATN",
+		"parseInfo", "getErrorHeader", "addErrorListener", "removeErrorListener",  "removeErrorListeners","errorListeners",
+		"errorListenerDispatch", "sempred", "precpred", "action", "inputStream", "tokenFactory",
+
+		"errorHandler", "context", "buildParseTree", "matchedEOF", "reset", "match", "matchWildcard", "trimParseTree",
+		"addParseListener", "removeParseListener", "removeParseListeners", "triggerEnterRuleEvent", "triggerExitRuleEvent",
+		"numberOfSyntaxErrors", "currentToken", "notifyErrorListeners", "consume", "createTerminalNode", "createErrorNode",
+		"addContextToParseTree", "enterRule", "exitRule", "enterOuterAlt", "precedence", "enterRecursionRule"
 	));
 
 	public DartTarget(CodeGenerator gen) {

diff --git a/tool/src/org/antlr/v4/codegen/target/GoTarget.java b/tool/src/org/antlr/v4/codegen/target/GoTarget.java
@@ -11,13 +11,13 @@
 import org.antlr.v4.parse.ANTLRParser;
 import org.antlr.v4.tool.Grammar;
 import org.stringtemplate.v4.ST;
-import org.stringtemplate.v4.STGroup;
-import org.stringtemplate.v4.StringRenderer;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 public class GoTarget extends Target {
 	protected static final HashSet<String> reservedWords = new HashSet<>(Arrays.asList(
@@ -50,7 +50,8 @@ public class GoTarget extends Target {
 		// then clashes with the GetStart() or GetStop() method that is generated by the code gen for the rule. So, we need to
 		// convert it. This is not ideal as it will still probably confuse authors of parse listeners etc. but the code will
 		// compile. This is a proof of Hyrum's law.
-		"start", "stop", "exception"
+		"start", "stop", "exception",
+		"sempred", "precpred", "addErrorListener"
 	));
 
 	private static final boolean DO_GOFMT = !Boolean.parseBoolean(System.getenv("ANTLR_GO_DISABLE_GOFMT"))

diff --git a/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java b/tool/src/org/antlr/v4/codegen/target/JavaScriptTarget.java
@@ -35,7 +35,8 @@ public class JavaScriptTarget extends Target {
 		"null", "true", "false",
 
 		// misc
-		"rule", "parserRule"
+		"rule", "parserRule",
+		"state", "reset"
 	));
 
 	public JavaScriptTarget(CodeGenerator gen) {

diff --git a/tool/src/org/antlr/v4/codegen/target/JavaTarget.java b/tool/src/org/antlr/v4/codegen/target/JavaTarget.java
@@ -9,9 +9,10 @@
 import org.antlr.v4.codegen.CodeGenerator;
 import org.antlr.v4.codegen.Target;
 import org.stringtemplate.v4.STGroup;
-import org.stringtemplate.v4.StringRenderer;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 public class JavaTarget extends Target {
 	/**
@@ -30,7 +31,7 @@ public class JavaTarget extends Target {
 		"void", "volatile", "while",
 
 		// misc
-		"rule", "parserRule"
+		"rule", "parserRule", "reset"
 	));
 
 	public JavaTarget(CodeGenerator gen) {

diff --git a/tool/src/org/antlr/v4/codegen/target/PHPTarget.java b/tool/src/org/antlr/v4/codegen/target/PHPTarget.java
@@ -38,7 +38,8 @@ public class PHPTarget extends Target {
 		"__LINE__", "__METHOD__", "__NAMESPACE__", "__TRAIT__",
 
 		// misc
-		"rule", "parserRule"
+		"rule", "parserRule",
+		"state", "reset", "action", "sempred", "addErrorListener"
 	));
 
 	protected static final Map<Character, String> targetCharValueEscape;

diff --git a/tool/src/org/antlr/v4/codegen/target/Python3Target.java b/tool/src/org/antlr/v4/codegen/target/Python3Target.java
@@ -39,7 +39,8 @@ public class Python3Target extends Target {
 		"True", "False", "None",
 
 		// misc
-		"rule", "parserRule"
+		"rule", "parserRule",
+		"state", "reset"
 	));
 
 	protected static final Map<Character, String> targetCharValueEscape;

diff --git a/tool/src/org/antlr/v4/codegen/target/TypeScriptTarget.java b/tool/src/org/antlr/v4/codegen/target/TypeScriptTarget.java
@@ -6,7 +6,6 @@
 
 import org.antlr.v4.codegen.CodeGenerator;
 import org.antlr.v4.codegen.Target;
-import org.antlr.v4.misc.CharSupport;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -75,7 +74,8 @@ public class TypeScriptTarget extends Target {
 			"while",
 			"with",
 			"yield",
-			"of"
+			"of",
+		    "state", "reset"
 	));
 
 	public TypeScriptTarget(CodeGenerator gen) {
@@ -86,7 +86,7 @@ public TypeScriptTarget(CodeGenerator gen) {
 	protected Set<String> getReservedWords() {
 		return reservedWords;
 	}
-	
+
 	@Override
 	public int getInlineTestSetWordSize() {
 		return 32;