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

Updated testLabelsForTokensWithMixedTypes. 

Removed excess testLabelsForTokensWithMixedTypesLRWithLabels and testLabelsForTokensWithMixedTypesLRWithoutLabels.
This commit is contained in:
Ivan Kochurkin 2017-01-07 18:17:40 +03:00
parent 385e96784d
commit a46db4b0b7
1 changed files with 27 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
tool-testsuite/test/org/antlr/v4/test/tool/TestSymbolIssues.java
View File

@ -292,21 +292,36 @@ public class TestSymbolIssues extends BaseJavaToolTest {
String[] test = {
"grammar L;\n" +
"\n" +
"rule1 // Correct (Alternatives)\n" +
" : t1 = a #aLabel\n" +
" | t1 = b #bLabel\n" +
"rule1 // Correct (Alternatives)\n" +
" : t1=a #aLabel\n" +
" | t1=b #bLabel\n" +
" ;\n" +
"rule2 //Incorrect type casting in generated code (RULE_LABEL)\n" +
" : t2 = a | t2 = b\n" +
" : t2=a | t2=b\n" +
" ;\n" +
"rule3\n" +
" : t3 += a+ b t3 += c+ //Incorrect type casting in generated code (RULE_LIST_LABEL)\n" +
" : t3+=a+ b t3+=c+ //Incorrect type casting in generated code (RULE_LIST_LABEL)\n" +
" ;\n" +
"rule4\n" +
" : a t4 = A b t4 = B c // Correct (TOKEN_LABEL)\n" +
" : a t4=A b t4=B c // Correct (TOKEN_LABEL)\n" +
" ;\n" +
"rule5\n" +
" : a t5 += A b t5 += B c // Correct (TOKEN_LIST_LABEL)\n" +
" : a t5+=A b t5+=B c // Correct (TOKEN_LIST_LABEL)\n" +
" ;\n" +
"rule6 // Correct (https://github.com/antlr/antlr4/issues/1543)\n" +
" : t6=a #t6_1_Label\n" +
" | t6=rule6 b (t61=c)? t62=rule6 #t6_2_Label\n" +
" | t6=A a (t61=B)? t62=A #t6_3_Label\n" +
" ;\n" +
"rule7 // Incorrect (https://github.com/antlr/antlr4/issues/1543)\n" +
" : a\n" +
" | t7=rule7 b (t71=c)? t72=rule7 \n" +
" | t7=A a (t71=B)? t72=A \n" +
" ;\n" +
"rule8 // Correct (https://github.com/antlr/antlr4/issues/1543)\n" +
" : a\n" +
" | t8=rule8 a t8=rule8\n" +
" | t8=rule8 b t8=rule8\n" +
" ;\n" +
"a: A;\n" +
"b: B;\n" +
@ -315,51 +330,12 @@ public class TestSymbolIssues extends BaseJavaToolTest {
"B: 'b';\n" +
"C: 'c';\n",
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:8:15: label t2=b type mismatch with previous definition: t2=a\n" +
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:11:17: label t3+=c type mismatch with previous definition: t3+=a\n"
};
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:8:13: label t2=b type mismatch with previous definition: t2=a\n" +
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:11:15: label t3+=c type mismatch with previous definition: t3+=a\n" +
testErrors(test, false);
}
// https://github.com/antlr/antlr4/issues/1543
@Test public void testLabelsForTokensWithMixedTypesLRWithLabels() {
String[] test = {
"grammar L;\n" +
"\n" +
"expr\n" +
" : left=A '+' right=A #primary\n" +
" | left=expr '-' right=expr #sub\n" +
" ;\n" +
"\n" +
"A: 'a';\n" +
"B: 'b';\n" +
"C: 'c';\n",
""
};
testErrors(test, false);
}
// https://github.com/antlr/antlr4/issues/1543
@Test
@Ignore
public void testLabelsForTokensWithMixedTypesLRWithoutLabels() {
String[] test = {
"grammar L;\n" +
"\n" +
"expr\n" +
" : left=A '+' right=A\n" +
" | left=expr '-' right=expr\n" +
" ;\n" +
"\n" +
"A: 'a';\n" +
"B: 'b';\n" +
"C: 'c';\n",
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:5:7: label left=expr type mismatch with previous definition: left=A\n" +
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:5:19: label right=expr type mismatch with previous definition: right=A\n"
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:24:0: label t7 type mismatch with previous definition: TOKEN_LABEL!=RULE_LABEL\n" +
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:24:0: label t71 type mismatch with previous definition: RULE_LABEL!=TOKEN_LABEL\n" +
"error(" + ErrorType.LABEL_TYPE_CONFLICT.code + "): L.g4:24:0: label t72 type mismatch with previous definition: RULE_LABEL!=TOKEN_LABEL\n"
};
testErrors(test, false);