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

Updated error message, updated TestAttributeChecks

This commit is contained in:
Sam Harwell 2013-01-15 08:54:07 -06:00
parent df7fb3de2f
commit 758e2422f5
2 changed files with 78 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/src/org/antlr/v4/tool/ErrorType.java
View File

@ -74,7 +74,7 @@ public enum ErrorType {
PARSER_RULES_NOT_ALLOWED(53, "parser rule '<arg>' not allowed in lexer", ErrorSeverity.ERROR), PARSER_RULES_NOT_ALLOWED(53, "parser rule '<arg>' not allowed in lexer", ErrorSeverity.ERROR),
REPEATED_PREQUEL(54, "repeated grammar prequel spec (option, token, or import); please merge", ErrorSeverity.ERROR), REPEATED_PREQUEL(54, "repeated grammar prequel spec (option, token, or import); please merge", ErrorSeverity.ERROR),
UNDEFINED_RULE_REF(56, "reference to undefined rule: <arg>", ErrorSeverity.ERROR), UNDEFINED_RULE_REF(56, "reference to undefined rule: <arg>", ErrorSeverity.ERROR),
UNDEFINED_RULE_IN_NONLOCAL_REF(57, "reference to undefined rule in nonlocal ref: <arg>::<arg2>", ErrorSeverity.ERROR), UNDEFINED_RULE_IN_NONLOCAL_REF(57, "reference to undefined rule '<arg>' in non-local ref '<arg3>'", ErrorSeverity.ERROR),
TOKEN_NAMES_MUST_START_UPPER(60, "token names must start with an uppercase letter: <arg>", ErrorSeverity.ERROR), TOKEN_NAMES_MUST_START_UPPER(60, "token names must start with an uppercase letter: <arg>", ErrorSeverity.ERROR),
UNKNOWN_SIMPLE_ATTRIBUTE(63, "unknown attribute reference '<arg>' in '<arg2>'", ErrorSeverity.ERROR), UNKNOWN_SIMPLE_ATTRIBUTE(63, "unknown attribute reference '<arg>' in '<arg2>'", ErrorSeverity.ERROR),
INVALID_RULE_PARAMETER_REF(64, "parameter '<arg>' of rule '<arg2>' is not accessible in this scope: <arg3>", ErrorSeverity.ERROR), INVALID_RULE_PARAMETER_REF(64, "parameter '<arg>' of rule '<arg2>' is not accessible in this scope: <arg3>", ErrorSeverity.ERROR),

156
tool/test/org/antlr/v4/test/TestAttributeChecks.java
View File

@ -136,94 +136,106 @@ public class TestAttributeChecks extends BaseTest {
}; };
String[] dynMembersChecks = { String[] dynMembersChecks = {
"$S", "", "$S", "error(63): A.g4:2:11: unknown attribute reference 'S' in '$S'\n",
"$S::i", "", "$S::i", "error(57): A.g4:2:11: reference to undefined rule 'S' in non-local ref '$S::i'\n",
"$S::i=$S::i", "", "$S::i=$S::i", "error(57): A.g4:2:11: reference to undefined rule 'S' in non-local ref '$S::i'\n" +
"error(57): A.g4:2:17: reference to undefined rule 'S' in non-local ref '$S::i'\n",
"$b::f", "error(54): A.g4:3:1: unknown dynamic scope: b in $b::f\n", "$b::f", "error(65): A.g4:2:14: unknown attribute 'f' for rule 'b' in '$b::f'\n",
"$S::j", "error(55): A.g4:3:4: unknown dynamically-scoped attribute for scope S: j in $S::j\n", "$S::j", "error(57): A.g4:2:11: reference to undefined rule 'S' in non-local ref '$S::j'\n",
"$S::j = 3;", "error(55): A.g4:3:4: unknown dynamically-scoped attribute for scope S: j in $S::j = 3;\n", "$S::j = 3;", "error(57): A.g4:2:11: reference to undefined rule 'S' in non-local ref '$S::j = 3;'\n",
"$S::j = $S::k;", "error(55): A.g4:3:4: unknown dynamically-scoped attribute for scope S: j in $S::j = $S::k;\n" + "$S::j = $S::k;", "error(57): A.g4:2:11: reference to undefined rule 'S' in non-local ref '$S::j = $S::k;'\n",
"error(55): A.g4:3:12: unknown dynamically-scoped attribute for scope S: k in $S::k\n",
}; };
String[] dynInitChecks = { String[] dynInitChecks = {
"$a", "", "$a", "error(67): A.g4:5:8: missing attribute access on rule reference 'a' in '$a'\n",
"$b", "", "$b", "error(63): A.g4:5:8: unknown attribute reference 'b' in '$b'\n",
"$lab", "", "$lab", "error(67): A.g4:5:8: missing attribute access on rule reference 'lab' in '$lab'\n",
"$b::f", "", "$b::f", "error(65): A.g4:5:11: unknown attribute 'f' for rule 'b' in '$b::f'\n",
"$S::i", "", "$S::i", "error(57): A.g4:5:8: reference to undefined rule 'S' in non-local ref '$S::i'\n",
"$S::i=$S::i", "", "$S::i=$S::i", "error(57): A.g4:5:8: reference to undefined rule 'S' in non-local ref '$S::i'\n" +
"$a::z", "", "error(57): A.g4:5:14: reference to undefined rule 'S' in non-local ref '$S::i'\n",
"$S", "", "$a::z", "error(65): A.g4:5:11: unknown attribute 'z' for rule 'a' in '$a::z'\n",
"$S", "error(63): A.g4:5:8: unknown attribute reference 'S' in '$S'\n",
"$S::j", "error(55): A.g4:8:11: unknown dynamically-scoped attribute for scope S: j in $S::j\n", "$S::j", "error(57): A.g4:5:8: reference to undefined rule 'S' in non-local ref '$S::j'\n",
"$S::j = 3;", "error(55): A.g4:8:11: unknown dynamically-scoped attribute for scope S: j in $S::j = 3;\n", "$S::j = 3;", "error(57): A.g4:5:8: reference to undefined rule 'S' in non-local ref '$S::j = 3;'\n",
"$S::j = $S::k;", "error(55): A.g4:8:11: unknown dynamically-scoped attribute for scope S: j in $S::j = $S::k;\n" + "$S::j = $S::k;", "error(57): A.g4:5:8: reference to undefined rule 'S' in non-local ref '$S::j = $S::k;'\n",
"error(55): A.g4:8:19: unknown dynamically-scoped attribute for scope S: k in $S::k\n",
}; };
String[] dynInlineChecks = { String[] dynInlineChecks = {
"$a", "", "$a", "error(67): A.g4:7:4: missing attribute access on rule reference 'a' in '$a'\n",
"$b", "", "$b", "error(67): A.g4:7:4: missing attribute access on rule reference 'b' in '$b'\n",
"$lab", "", "$lab", "error(67): A.g4:7:4: missing attribute access on rule reference 'lab' in '$lab'\n",
"$b::f", "", "$b::f", "error(65): A.g4:7:7: unknown attribute 'f' for rule 'b' in '$b::f'\n",
"$S", "", "$S::i", "error(57): A.g4:7:4: reference to undefined rule 'S' in non-local ref '$S::i'\n",
"$S::i", "", "$S::i=$S::i", "error(57): A.g4:7:4: reference to undefined rule 'S' in non-local ref '$S::i'\n" +
"$S::i=$S::i", "", "error(57): A.g4:7:10: reference to undefined rule 'S' in non-local ref '$S::i'\n",
"$a::z", "", "$a::z", "error(65): A.g4:7:7: unknown attribute 'z' for rule 'a' in '$a::z'\n",
"$S::j", "error(55): A.g4:10:7: unknown dynamically-scoped attribute for scope S: j in $S::j\n", "$S::j", "error(57): A.g4:7:4: reference to undefined rule 'S' in non-local ref '$S::j'\n",
"$S::j = 3;", "error(55): A.g4:10:7: unknown dynamically-scoped attribute for scope S: j in $S::j = 3;\n", "$S::j = 3;", "error(57): A.g4:7:4: reference to undefined rule 'S' in non-local ref '$S::j = 3;'\n",
"$S::j = $S::k;", "error(55): A.g4:10:7: unknown dynamically-scoped attribute for scope S: j in $S::j = $S::k;\n" + "$S::j = $S::k;", "error(57): A.g4:7:4: reference to undefined rule 'S' in non-local ref '$S::j = $S::k;'\n",
"error(55): A.g4:10:15: unknown dynamically-scoped attribute for scope S: k in $S::k\n", "$Q[-1]::y", "error(63): A.g4:7:4: unknown attribute reference 'Q' in '$Q'\n",
"$Q[-1]::y", "error(54): A.g4:10:4: unknown dynamic scope: Q in $Q[-1]::y\n", "$Q[-i]::y", "error(63): A.g4:7:4: unknown attribute reference 'Q' in '$Q'\n",
"$Q[-i]::y", "error(54): A.g4:10:4: unknown dynamic scope: Q in $Q[-i]::y\n", "$Q[i]::y", "error(63): A.g4:7:4: unknown attribute reference 'Q' in '$Q'\n",
"$Q[i]::y", "error(54): A.g4:10:4: unknown dynamic scope: Q in $Q[i]::y\n", "$Q[0]::y", "error(63): A.g4:7:4: unknown attribute reference 'Q' in '$Q'\n",
"$Q[0]::y", "error(54): A.g4:10:4: unknown dynamic scope: Q in $Q[0]::y\n", "$Q[-1]::y = 23;", "error(63): A.g4:7:4: unknown attribute reference 'Q' in '$Q'\n",
"$Q[-1]::y = 23;", "error(54): A.g4:10:4: unknown dynamic scope: Q in $Q[-1]::y = 23;\n", "$Q[-i]::y = 23;", "error(63): A.g4:7:4: unknown attribute reference 'Q' in '$Q'\n",
"$Q[-i]::y = 23;", "error(54): A.g4:10:4: unknown dynamic scope: Q in $Q[-i]::y = 23;\n", "$Q[i]::y = 23;", "error(63): A.g4:7:4: unknown attribute reference 'Q' in '$Q'\n",
"$Q[i]::y = 23;", "error(54): A.g4:10:4: unknown dynamic scope: Q in $Q[i]::y = 23;\n", "$Q[0]::y = 23;", "error(63): A.g4:7:4: unknown attribute reference 'Q' in '$Q'\n",
"$Q[0]::y = 23;", "error(54): A.g4:10:4: unknown dynamic scope: Q in $Q[0]::y = 23;\n", "$S[-1]::y", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n",
"$S[-1]::y", "error(55): A.g4:10:11: unknown dynamically-scoped attribute for scope S: y in $S[-1]::y\n", "$S[-i]::y", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n",
"$S[-i]::y", "error(55): A.g4:10:11: unknown dynamically-scoped attribute for scope S: y in $S[-i]::y\n", "$S[i]::y", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n",
"$S[i]::y", "error(55): A.g4:10:10: unknown dynamically-scoped attribute for scope S: y in $S[i]::y\n", "$S[0]::y", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n",
"$S[0]::y", "error(55): A.g4:10:10: unknown dynamically-scoped attribute for scope S: y in $S[0]::y\n", "$S[-1]::y = 23;", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n",
"$S[-1]::y = 23;", "error(55): A.g4:10:11: unknown dynamically-scoped attribute for scope S: y in $S[-1]::y = 23;\n", "$S[-i]::y = 23;", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n",
"$S[-i]::y = 23;", "error(55): A.g4:10:11: unknown dynamically-scoped attribute for scope S: y in $S[-i]::y = 23;\n", "$S[i]::y = 23;", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n",
"$S[i]::y = 23;", "error(55): A.g4:10:10: unknown dynamically-scoped attribute for scope S: y in $S[i]::y = 23;\n", "$S[0]::y = 23;", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n",
"$S[0]::y = 23;", "error(55): A.g4:10:10: unknown dynamically-scoped attribute for scope S: y in $S[0]::y = 23;\n", "$S[$S::y]::i", "error(63): A.g4:7:4: unknown attribute reference 'S' in '$S'\n" +
"$S[$S::y]::i", "error(55): A.g4:10:10: unknown dynamically-scoped attribute for scope S: y in $S::y\n" "error(57): A.g4:7:7: reference to undefined rule 'S' in non-local ref '$S::y'\n"
}; };
String[] dynFinallyChecks = { String[] dynFinallyChecks = {
"$a", "", "$a", "error(67): A.g4:10:14: missing attribute access on rule reference 'a' in '$a'\n",
"$b", "", "$b", "error(63): A.g4:10:14: unknown attribute reference 'b' in '$b'\n",
"$lab", "", "$lab", "error(67): A.g4:10:14: missing attribute access on rule reference 'lab' in '$lab'\n",
"$b::f", "", "$b::f", "error(65): A.g4:10:17: unknown attribute 'f' for rule 'b' in '$b::f'\n",
"$S", "", "$S", "error(63): A.g4:10:14: unknown attribute reference 'S' in '$S'\n",
"$S::i", "", "$S::i", "error(57): A.g4:10:14: reference to undefined rule 'S' in non-local ref '$S::i'\n",
"$S::i=$S::i", "", "$S::i=$S::i", "error(57): A.g4:10:14: reference to undefined rule 'S' in non-local ref '$S::i'\n" +
"$a::z", "", "error(57): A.g4:10:20: reference to undefined rule 'S' in non-local ref '$S::i'\n",
"$a::z", "error(65): A.g4:10:17: unknown attribute 'z' for rule 'a' in '$a::z'\n",
"$S::j", "error(55): A.g4:12:17: unknown dynamically-scoped attribute for scope S: j in $S::j\n", "$S::j", "error(57): A.g4:10:14: reference to undefined rule 'S' in non-local ref '$S::j'\n",
"$S::j = 3;", "error(55): A.g4:12:17: unknown dynamically-scoped attribute for scope S: j in $S::j = 3;\n", "$S::j = 3;", "error(57): A.g4:10:14: reference to undefined rule 'S' in non-local ref '$S::j = 3;'\n",
"$S::j = $S::k;", "error(55): A.g4:12:17: unknown dynamically-scoped attribute for scope S: j in $S::j = $S::k;\n" + "$S::j = $S::k;", "error(57): A.g4:10:14: reference to undefined rule 'S' in non-local ref '$S::j = $S::k;'\n",
"error(55): A.g4:12:25: unknown dynamically-scoped attribute for scope S: k in $S::k\n",
}; };
@Test public void testMembersActions() throws RecognitionException { @Test public void testMembersActions() throws RecognitionException {
testActions("members", membersChecks, attributeTemplate); testActions("members", membersChecks, attributeTemplate);
} }
@Test public void testDynamicMembersActions() throws RecognitionException {
testActions("members", dynMembersChecks, attributeTemplate);
}
@Test public void testInitActions() throws RecognitionException { @Test public void testInitActions() throws RecognitionException {
testActions("init", initChecks, attributeTemplate); testActions("init", initChecks, attributeTemplate);
} }
@Test public void testDynamicInitActions() throws RecognitionException {
testActions("init", dynInitChecks, attributeTemplate);
}
@Test public void testInlineActions() throws RecognitionException { @Test public void testInlineActions() throws RecognitionException {
testActions("inline", inlineChecks, attributeTemplate); testActions("inline", inlineChecks, attributeTemplate);
} }
@Test public void testDynamicInlineActions() throws RecognitionException {
testActions("inline", dynInlineChecks, attributeTemplate);
}
@Test public void testBadInlineActions() throws RecognitionException { @Test public void testBadInlineActions() throws RecognitionException {
testActions("inline", bad_inlineChecks, attributeTemplate); testActions("inline", bad_inlineChecks, attributeTemplate);
} }
@ -232,6 +244,10 @@ public class TestAttributeChecks extends BaseTest {
testActions("finally", finallyChecks, attributeTemplate); testActions("finally", finallyChecks, attributeTemplate);
} }
@Test public void testDynamicFinallyActions() throws RecognitionException {
testActions("finally", dynFinallyChecks, attributeTemplate);
}
@Test public void testTokenRef() throws RecognitionException { @Test public void testTokenRef() throws RecognitionException {
String grammar = String grammar =
"parser grammar S;\n" + "parser grammar S;\n" +
@ -242,24 +258,6 @@ public class TestAttributeChecks extends BaseTest {
testErrors(new String[] {grammar, expected}, false); testErrors(new String[] {grammar, expected}, false);
} }
@Test public void testNonDynamicAttributeOutsideRule() throws Exception {
String action = "public void foo() { $x; }";
}
@Test public void testNonDynamicAttributeOutsideRule2() throws Exception {
String action = "public void foo() { $x.y; }";
}
@Test public void testUnknownGlobalScope() throws Exception {
String action = "$Symbols::names.add($id.text);";
}
@Test public void testUnknownDynamicAttribute() throws Exception {
String action = "$a::x";
}
@Test public void testUnknownGlobalDynamicAttribute() throws Exception {
String action = "$Symbols::x";
}
public void testActions(String location, String[] pairs, String template) { public void testActions(String location, String[] pairs, String template) {
for (int i = 0; i < pairs.length; i+=2) { for (int i = 0; i < pairs.length; i+=2) {
String action = pairs[i]; String action = pairs[i];