enable more tests & fix PHP & Dart target - potentially

Signed-off-by: Alex Lüpges <[email protected]>
antlr · Nov 30, 2023 · fe4d260 · fe4d260
1 parent e3ca726
commit fe4d260
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...s/org/antlr/v4/test/runtime/descriptors/LeftRecursion/IndirectExpressionsWithAttr_int.txt b/...s/org/antlr/v4/test/runtime/descriptors/LeftRecursion/IndirectExpressionsWithAttr_int.txt
@@ -31,11 +31,11 @@ s
 [skip]
 ##Cpp
 ##CSharp
-Dart
+##Dart
 ##Go
 ##Java
 ##JavaScript
 ##PHP
 ##Python3
-Swift
+##Swift
 TypeScript
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Dart/Dart.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Dart/Dart.stg
@@ -317,7 +317,7 @@ bool _<r.name>_sempred(dynamic _localctx, int predIndex) {
 
 RuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs,namedActions,finallyAction,postamble,exceptions) ::= <<
 
-<if(currentRule.modifiers)><currentRule.modifiers:{f | <f> }><else><endif><currentRule.ctxType> <currentRule.escapedName>(<[args, currentRule.hasDelegatedPrecedence:{_|{int _dp=0\}}]; separator=", ">) {
+<if(currentRule.modifiers)><currentRule.modifiers:{f | <f> }><else><endif><currentRule.ctxType> <currentRule.escapedName>(<[args, currentRule.hasDelegatedPrecedence:{_|{int dp=0\}}]; separator=", ">) {
   dynamic _localctx = <currentRule.ctxType>(context, state<currentRule.args:{a | , <a.escapedName>}>);
   enterRule(_localctx, <currentRule.startState>, RULE_<currentRule.name>);
   <namedActions.init>
@@ -541,7 +541,7 @@ cases(tokens) ::= <<
 
 InvokeRule(r, argExprsChunks) ::=<<
 state = <r.stateNumber>;
-<if(r.labels)><r.labels:{l | <labelref(l)> = }><endif><r.escapedName>(<[r.ast.options.p, argExprsChunks, r.ast.options.dp]; separator=",">);
+<if(r.labels)><r.labels:{l | <labelref(l)> = }><endif><r.escapedName>(<[{<if(r.ast.options.pv)>dp<else><r.ast.options.p><endif>}, argExprsChunks, r.ast.options.dp]; separator=",">);
 >>
 
 MatchToken(m) ::= <<

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
@@ -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.pv)>$<endif><r.ast.options.p>}, argExprsChunks, r.ast.options.dp]; separator=",">);
+<if(r.labels)><r.labels:{l | <labelref(l)> = }><endif>$this-><if(r.ast.options.p&&!r.ast.options.pv)>recursive<r.name; format="cap"><else><r.name><endif>(<[{<if(r.ast.options.pv)>$<endif><r.ast.options.p>}, argExprsChunks, r.ast.options.dp]; separator=",">);
 >>
 
 MatchToken(m) ::= <<