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

Remove redundant assignment, optimize autoloading and tweak code style

This commit is contained in:
Marcos Passos 2019-09-18 16:36:57 -03:00
parent 06705edafd
commit 24870012f5
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tool/resources/org/antlr/v4/tool/templates/codegen/PHP/PHP.stg
View File

@ -341,8 +341,9 @@ namespace <if(file.genPackage)><file.genPackage>\\<endif>Context {
<if (file.genListener)>use <if(file.genPackage)><file.genPackage>\\<endif><file.grammarName>Listener;<endif> <if (file.genListener)>use <if(file.genPackage)><file.genPackage>\\<endif><file.grammarName>Listener;<endif>
<namedActions.contexts> <namedActions.contexts>
<funcs :{ func | <func.ruleCtx> }; separator="\n\n"> <funcs :{ func | <func.ruleCtx><if(func.altLabelCtxs)>
<funcs :{ func | <func.altLabelCtxs:{l | <func.altLabelCtxs.(l)>}; separator="\n\n">}>
<func.altLabelCtxs:{l | <func.altLabelCtxs.(l)>}; separator="\n\n"><endif> }; separator="\n\n">
} }
>> >>
@ -371,7 +372,6 @@ public function action(?RuleContext $localContext, int $ruleIndex, int $actionIn
<recog.actionFuncs.values:{f| <recog.actionFuncs.values:{f|
case <f.ruleIndex>: case <f.ruleIndex>:
$this->action<f.name; format="cap">($localContext, $actionIndex); $this->action<f.name; format="cap">($localContext, $actionIndex);
break;}; separator="\n\n"> break;}; separator="\n\n">
} }
} }
@ -447,7 +447,7 @@ RuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs,namedActions,fina
{ {
$localContext = new Context\\<currentRule.ctxType>($this->ctx, $this->getState()<currentRule.args:{a | , $<a.name>}>); $localContext = new Context\\<currentRule.ctxType>($this->ctx, $this->getState()<currentRule.args:{a | , $<a.name>}>);
$this->enterRule($localContext, <currentRule.startState>, <parser.name>::RULE_<currentRule.name>); $this->enterRule($localContext, <currentRule.startState>, self::RULE_<currentRule.name>);
<namedActions.init> <namedActions.init>
<locals; separator="\n"> <locals; separator="\n">
@ -487,7 +487,7 @@ private function recursive<currentRule.name; format="cap">(int $precedence<args:
$localContext = new Context\\<currentRule.ctxType>($this->ctx, $parentState<currentRule.args:{a | , <a.name>}>); $localContext = new Context\\<currentRule.ctxType>($this->ctx, $parentState<currentRule.args:{a | , <a.name>}>);
$previousContext = $localContext; $previousContext = $localContext;
$startState = <currentRule.startState>; $startState = <currentRule.startState>;
$this->enterRecursionRule($localContext, <currentRule.startState>, <parser.name>::RULE_<currentRule.name>, $precedence); $this->enterRecursionRule($localContext, <currentRule.startState>, self::RULE_<currentRule.name>, $precedence);
<namedActions.init> <namedActions.init>
<locals; separator="\n"> <locals; separator="\n">
@ -644,7 +644,6 @@ do {
<alts:{alt| <alts:{alt|
case <i><if(!choice.ast.greedy)>+1<endif>: case <i><if(!choice.ast.greedy)>+1<endif>:
<alt> <alt>
break;}; separator="\n\n"> break;}; separator="\n\n">
default: default:
<error> <error>
@ -693,17 +692,17 @@ bitsetInlineComparison(s, bits) ::= <%
%> %>
cases(ttypes) ::= << cases(ttypes) ::= <<
<ttypes:{t | case <parser.name>::<t>:}; separator="\n"> <ttypes:{t | case self::<t>:}; separator="\n">
>> >>
InvokeRule(r, argExprsChunks) ::= << InvokeRule(r, argExprsChunks) ::= <<
$this->setState(<r.stateNumber>); $this->setState(<r.stateNumber>);
<if(r.labels)><r.labels:{l | <labelref(l)> = }><endif>$this-><if(r.ast.options.p)>recursive<endif><r.name; format="cap">(<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.name><endif>(<if(r.ast.options.p)><r.ast.options.p><if(argExprsChunks)>,<endif><endif><argExprsChunks>);
>> >>
MatchToken(m) ::= << MatchToken(m) ::= <<
$this->setState(<m.stateNumber>); $this->setState(<m.stateNumber>);
<if(m.labels)><m.labels:{l | <labelref(l)> = }><endif>$this->match(<parser.name>::<m.name>); <if(m.labels)><m.labels:{l | <labelref(l)> = }><endif>$this->match(self::<m.name>);
>> >>
MatchSet(m, expr, capture) ::= "<CommonSetStuff(m, expr, capture, false)>" MatchSet(m, expr, capture) ::= "<CommonSetStuff(m, expr, capture, false)>"
@ -1023,9 +1022,8 @@ $localContext-><label>[] = $previousContext;
$localContext-><label> = $previousContext; $localContext-><label> = $previousContext;
<endif> <endif>
<endif> <endif>
<if(label)>$localContext-><label> = $previousContext;<endif>
$this->pushNewRecursionContext($localContext, $startState, <parser.name>::RULE_<ruleName>); $this->pushNewRecursionContext($localContext, $startState, self::RULE_<ruleName>);
>> >>
recRuleLabeledAltStartAction(ruleName, currentAltLabel, label, isListLabel) ::= << recRuleLabeledAltStartAction(ruleName, currentAltLabel, label, isListLabel) ::= <<
@ -1038,7 +1036,7 @@ $localContext-><label> = $previousContext;
<endif> <endif>
<endif> <endif>
$this->pushNewRecursionContext($localContext, $startState, <parser.name>::RULE_<ruleName>); $this->pushNewRecursionContext($localContext, $startState, self::RULE_<ruleName>);
>> >>
recRuleReplaceContext(ctxName) ::= << recRuleReplaceContext(ctxName) ::= <<