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

fix regression 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9896]
This commit is contained in:
parrt 2012-01-22 09:55:13 -08:00
parent 9ffe9d2ee3
commit 89ad588023
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tool/src/org/antlr/v4/codegen/ActionTranslator.java
View File

@ -177,6 +177,15 @@ public class ActionTranslator implements ActionSplitterListener {
chunks.add(new QRetValueRef(getRuleLabel(x.getText()), y.getText())); break; chunks.add(new QRetValueRef(getRuleLabel(x.getText()), y.getText())); break;
} }
case PREDEFINED_RULE: case PREDEFINED_RULE:
if ( factory.getCurrentRuleFunction()!=null &&
factory.getCurrentRuleFunction().name.equals(x.getText()) )
{
chunks.add(getRulePropertyRef(y));
}
else {
chunks.add(getRulePropertyRef(x, y));
}
break;
case TOKEN: case TOKEN:
chunks.add(getTokenPropertyRef(x, y)); chunks.add(getTokenPropertyRef(x, y));
break; break;