diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2016-03-31 09:23:02 +0200 |
|---|---|---|
| committer | Emmanuel Bourg <ebourg@apache.org> | 2016-03-31 09:23:02 +0200 |
| commit | a098ea9f9fbd729a7b854028fb07aca8931af702 (patch) | |
| tree | 48ee4259ee773b948eb5b73dfc09dee04e3a9f3f /tool-testsuite | |
| parent | 1a7b7906cbb3c334e0e8fe1dfdb68f16fefa8555 (diff) | |
Imported Upstream version 4.5.3
Diffstat (limited to 'tool-testsuite')
3 files changed, 12 insertions, 7 deletions
diff --git a/tool-testsuite/pom.xml b/tool-testsuite/pom.xml index 81b4525..c7b1564 100644 --- a/tool-testsuite/pom.xml +++ b/tool-testsuite/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.antlr</groupId> <artifactId>antlr4-master</artifactId> - <version>4.5.2-1</version> + <version>4.5.4-SNAPSHOT</version> </parent> <artifactId>antlr4-tool-testsuite</artifactId> <name>ANTLR 4 Tool Tests</name> diff --git a/tool-testsuite/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java b/tool-testsuite/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java index 1a555c4..bff84ae 100644 --- a/tool-testsuite/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java +++ b/tool-testsuite/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java @@ -1,10 +1,9 @@ package org.antlr.v4.test.tool; +import org.antlr.v4.gui.TreeTextProvider; import org.antlr.v4.runtime.tree.ErrorNode; import org.antlr.v4.runtime.tree.Tree; import org.antlr.v4.runtime.tree.Trees; -import org.antlr.v4.gui.TreeTextProvider; -import org.antlr.v4.tool.GrammarInterpreterRuleContext; import java.util.Arrays; import java.util.List; @@ -17,10 +16,6 @@ public class InterpreterTreeTextProvider implements TreeTextProvider { public String getText(Tree node) { if ( node==null ) return "null"; String nodeText = Trees.getNodeText(node, ruleNames); - if ( node instanceof GrammarInterpreterRuleContext) { - GrammarInterpreterRuleContext ctx = (GrammarInterpreterRuleContext) node; - return nodeText+":"+ctx.getOuterAltNum(); - } if ( node instanceof ErrorNode) { return "<error "+nodeText+">"; } diff --git a/tool-testsuite/test/org/antlr/v4/test/tool/TestActionTranslation.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestActionTranslation.java index e3c44bb..dfe1704 100644 --- a/tool-testsuite/test/org/antlr/v4/test/tool/TestActionTranslation.java +++ b/tool-testsuite/test/org/antlr/v4/test/tool/TestActionTranslation.java @@ -31,6 +31,7 @@ package org.antlr.v4.test.tool; import org.antlr.v4.test.runtime.java.BaseTest; +import org.antlr.v4.tool.Grammar; import org.junit.Test; /** */ @@ -180,6 +181,15 @@ public class TestActionTranslation extends BaseTest { testActions(attributeTemplate, "finally", action, expected); } + @Test public void testEmptyActions() throws Exception { + String gS = + "grammar A;\n"+ + "a[] : 'a' ;\n" + + "c : a[] c[] ;\n"; + Grammar g = new Grammar(gS); + } + + @Test public void testDynamicRuleScopeRefInSubrule() throws Exception { String action = "$a::n;"; } |