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

Fix unit tests which included implicitly defined string literal tokens

This commit is contained in:
Sam Harwell 2012-04-04 09:39:44 -05:00
parent 9ce85cc6e4
commit 251490cfc9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tool/test/org/antlr/v4/test/TestATNConstruction.java
View File

@ -360,14 +360,14 @@ public class TestATNConstruction extends BaseTest {
@Test public void testNestedAstar() throws Exception { @Test public void testNestedAstar() throws Exception {
Grammar g = new Grammar( Grammar g = new Grammar(
"parser grammar P;\n"+ "parser grammar P;\n"+
"a : (',' ID*)*;"); "a : (COMMA ID*)*;");
String expecting = String expecting =
"RuleStart_a_0->StarLoopEntry_13\n" + "RuleStart_a_0->StarLoopEntry_13\n" +
"StarLoopEntry_13->StarBlockStart_11\n" + "StarLoopEntry_13->StarBlockStart_11\n" +
"StarLoopEntry_13->s14\n" + "StarLoopEntry_13->s14\n" +
"StarBlockStart_11->s2\n" + "StarBlockStart_11->s2\n" +
"s14->RuleStop_a_1\n" + "s14->RuleStop_a_1\n" +
"s2-','->StarLoopEntry_8\n" + "s2-COMMA->StarLoopEntry_8\n" +
"RuleStop_a_1-EOF->s16\n" + "RuleStop_a_1-EOF->s16\n" +
"StarLoopEntry_8->StarBlockStart_6\n" + "StarLoopEntry_8->StarBlockStart_6\n" +
"StarLoopEntry_8->s9\n" + "StarLoopEntry_8->s9\n" +

3
tool/test/org/antlr/v4/test/TestSymbolIssues.java
View File

@ -46,7 +46,8 @@ public class TestSymbolIssues extends BaseTest {
"error(69): B.g4:4:4: label s conflicts with rule with same name\n" + "error(69): B.g4:4:4: label s conflicts with rule with same name\n" +
"error(69): B.g4:4:9: label b conflicts with rule with same name\n" + "error(69): B.g4:4:9: label b conflicts with rule with same name\n" +
"error(70): B.g4:4:15: label X conflicts with token with same name\n" + "error(70): B.g4:4:15: label X conflicts with token with same name\n" +
"error(75): B.g4:6:9: label x type mismatch with previous definition: TOKEN_LIST_LABEL!=TOKEN_LABEL\n" "error(75): B.g4:6:9: label x type mismatch with previous definition: TOKEN_LIST_LABEL!=TOKEN_LABEL\n" +
"error(126): B.g4:4:20: cannot create implicit token for string literal '.' in non-combined grammar\n"
}; };
static String[] D = { static String[] D = {