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

Move initialization of finallyAction to fillNamedActions - factory cannot provide context information for the Action construction before the constructor completes

This commit is contained in:
Sam Harwell 2012-10-26 15:46:22 -05:00
parent 8494007025
commit f4a3d6f3a8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tool/src/org/antlr/v4/codegen/model/RuleFunction.java
View File

@ -125,7 +125,6 @@ public class RuleFunction extends OutputModelObject {
exceptions.add(new ExceptionClause(factory, catchArg, catchAction));
}
}
if ( r.finallyAction!=null ) finallyAction = new Action(factory, r.finallyAction);
startState = factory.getGrammar().atn.ruleToStartState[r.index];
}
@ -157,6 +156,10 @@ public class RuleFunction extends OutputModelObject {
}
public void fillNamedActions(OutputModelFactory factory, Rule r) {
if ( r.finallyAction!=null ) {
finallyAction = new Action(factory, r.finallyAction);
}
namedActions = new HashMap<String, Action>();
for (String name : r.namedActions.keySet()) {
ActionAST ast = r.namedActions.get(name);

8
tool/test/org/antlr/v4/test/TestActionTranslation.java
View File

@ -124,15 +124,13 @@ public class TestActionTranslation extends BaseTest {
@Test public void testRefToTextAttributeForCurrentRule() throws Exception {
String action = "$a.text; $text";
// this is the expected translation for all cases
String expected =
"_input.getText(_localctx.start, _input.LT(-1)); _input.getText(_localctx.start, _input.LT(-1))";
testActions(attributeTemplate, "init", action, expected);
expected =
"_input.getText(_localctx.start, _input.LT(-1)); _input.getText(_localctx.start, _input.LT(-1))";
testActions(attributeTemplate, "inline", action, expected);
expected =
"(_localctx.a!=null?_input.getText(_localctx.a.start,_localctx.a.stop):null);" +
" _input.getText(_localctx.start, _input.LT(-1))";
testActions(attributeTemplate, "finally", action, expected);
}