progress

tool/test/org/antlr/v4/testgen/Generator.java

@@ -105,16 +105,125 @@ public class Generator {
 
 	private Collection<TestFile> buildTests() throws Exception {
 		List<TestFile> list = new ArrayList<TestFile>();
-		list.add(buildLexerExec());
-		list.add(buildParserExec());
 		list.add(buildCompositeLexers());
 		list.add(buildCompositeParsers());
 		list.add(buildFullContextParsing());
 		list.add(buildLeftRecursion());
 		list.add(buildLexerErrors());
+		list.add(buildLexerExec());
 		list.add(buildListeners());
-		return list;
+		list.add(buildParserErrors());
-		
+		list.add(buildParserExec());
+		return list;		
+	}
+
+	private TestFile buildParserErrors() throws Exception {
+		TestFile file = new TestFile("ParserErrors");
+		file.addParserTest(input, "TokenMismatch", "T", "a", 
+				"aa", 
+				"",
+				"line 1:1 mismatched input 'a' expecting 'b'\n");
+		file.addParserTest(input, "SingleTokenDeletion", "T", "a", 
+				"aab", 
+				"",
+				"line 1:1 extraneous input 'a' expecting 'b'\n");
+		file.addParserTest(input, "SingleTokenDeletionExpectingSet", "T", "a",
+				"aab", 
+				"",
+				"line 1:1 extraneous input 'a' expecting {'b', 'c'}\n");
+		file.addParserTest(input, "SingleTokenInsertion", "T", "a",
+				"ac",
+				"",
+				"line 1:1 missing 'b' at 'c'\n");
+		file.addParserTest(input, "ConjuringUpToken", "T", "a", 
+				"ac", 
+				"conjured=[@-1,-1:-1='<missing 'b'>',<1>,1:1]\n",
+				null);
+		file.addParserTest(input, "SingleSetInsertion", "T", "a", 
+				"ad", 
+				"",
+				"line 1:1 missing {'b', 'c'} at 'd'\n");
+		file.addParserTest(input, "ConjuringUpTokenFromSet", "T", "a", 
+				"ad", 
+				"conjured=[@-1,-1:-1='<missing 'b'>',<1>,1:1]\n",
+				null);
+		file.addParserTest(input, "LL2", "T", "a",
+				"ae", 
+				"",
+				"line 1:1 no viable alternative at input 'ae'\n");
+		file.addParserTest(input, "LL3", "T", "a", 
+				"abe", 
+				"",
+				"line 1:2 no viable alternative at input 'abe'\n");
+		file.addParserTest(input, "LLStar", "T", "a", 
+				"aaae", 
+				"",
+				"line 1:3 no viable alternative at input 'aaae'\n");
+		file.addParserTest(input, "SingleTokenDeletionBeforeLoop", "T", "a",
+				"aabc", 
+				"",
+				"line 1:1 extraneous input 'a' expecting {<EOF>, 'b'}\n" +
+				"line 1:3 token recognition error at: 'c'\n");
+		file.addParserTest(input, "MultiTokenDeletionBeforeLoop", "T", "a",
+				"aacabc", 
+				"",
+				"line 1:1 extraneous input 'a' expecting {'b', 'c'}\n");
+		file.addParserTest(input, "SingleTokenDeletionDuringLoop", "T", "a", 
+				"ababbc", 
+				"",
+				"line 1:2 extraneous input 'a' expecting {'b', 'c'}\n");
+		file.addParserTest(input, "MultiTokenDeletionDuringLoop", "T", "a", 
+				"abaaababc", 
+				"",
+				"line 1:2 extraneous input 'a' expecting {'b', 'c'}\n" +
+				"line 1:6 extraneous input 'a' expecting {'b', 'c'}\n");
+		file.addParserTest(input, "SingleTokenDeletionBeforeLoop2", "T", "a", 
+				"aabc", 
+				"",
+				"line 1:1 extraneous input 'a' expecting {<EOF>, 'b', 'z'}\n" +
+				"line 1:3 token recognition error at: 'c'\n");
+		file.addParserTest(input, "MultiTokenDeletionBeforeLoop2", "T", "a", 
+				"aacabc", 
+				"",
+				"line 1:1 extraneous input 'a' expecting {'b', 'z', 'c'}\n");
+		file.addParserTest(input, "SingleTokenDeletionDuringLoop2", "T", "a",
+				"ababbc", 
+				"",
+				"line 1:2 extraneous input 'a' expecting {'b', 'z', 'c'}\n");
+		file.addParserTest(input, "MultiTokenDeletionDuringLoop2", "T", "a", 
+				"abaaababc", 
+				"",
+				"line 1:2 extraneous input 'a' expecting {'b', 'z', 'c'}\n" +
+				"line 1:6 extraneous input 'a' expecting {'b', 'z', 'c'}\n");
+		file.addParserTest(input, "LL1ErrorInfo", "T", "start", 
+				"dog and software", 
+				"{'hardware', 'software'}\n",
+				null);
+		file.addParserTest(input, "InvalidEmptyInput", "T", "start", 
+				"", 
+				"",
+				"line 1:0 missing ID at '<EOF>'\n");
+		file.addParserTest(input, "ContextListGetters", "T", "s",
+				"abab", 
+				"abab\n",
+				null);
+		file.addParserTestsWithErrors(input, "DuplicatedLeftRecursiveCall", "T", "start", 
+				"xx", "", null,
+				"xxx", "", null,
+				"xxxx", "", null);
+		file.addParserTest(input, "InvalidATNStateRemoval", "T", "start", 
+				"x:x", 
+				"",
+				null);
+		// "a." matches 'a' to rule e but then realizes '.' won't match.
+		// previously would cause noviablealt. now prediction pretends to
+		// have "a' predict 2nd alt of e. Will get syntax error later so
+		// let it get farther.
+		file.addParserTest(input, "NoViableAltAvoidance", "T", "s", 
+				"a.", 
+				"",
+				"line 1:1 mismatched input '.' expecting '!'\n");
+		return file;
 	}
 
 	private TestFile buildListeners() throws Exception {

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/ConjuringUpToken.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' x='b' {<writeln("\"conjured=\"+$x")>} 'c' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/ConjuringUpTokenFromSet.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' x=('b'|'c') {<writeln("\"conjured=\"+$x")>} 'd' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/ContextListGetters.st

@@ -0,0 +1,8 @@
+grammar <grammarName>;
+@parser::members{
+<declareContextListGettersFunction()>
+}
+s : (a | b)+;
+a : 'a' {<write("'a'")>};
+b : 'b' {<write("'b'")>};
+;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/DuplicatedLeftRecursiveCall.st

@@ -0,0 +1,6 @@
+grammar <grammarName>;
+start : expr EOF;
+expr : 'x'
+     | expr expr
+     ;
+;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/InvalidATNStateRemoval.st

@@ -0,0 +1,6 @@
+grammar <grammarName>;
+start : ID ':' expr;
+expr : primary expr? {<pass()>} | expr '->' ID;
+primary : ID;
+ID : [a-z]+;
+;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/InvalidEmptyInput.st

@@ -0,0 +1,4 @@
+grammar <grammarName>;
+start : ID+;
+ID : [a-z]+;
+;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/LL1ErrorInfo.st

@@ -0,0 +1,14 @@
+grammar <grammarName>;
+start : animal (AND acClass)? service EOF;
+animal : (DOG | CAT );
+service : (HARDWARE | SOFTWARE) ;
+AND : 'and';
+DOG : 'dog';
+CAT : 'cat';
+HARDWARE: 'hardware';
+SOFTWARE: 'software';
+WS : ' ' -> skip ;
+acClass
+@init
+{<getExpectedTokenNames():writeln()>}
+  : ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/LL2.st

@@ -0,0 +1,5 @@
+grammar <grammarName>;
+a : 'a' 'b'
+  | 'a' 'c'
+;
+q : 'e' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/LL3.st

@@ -0,0 +1,5 @@
+grammar <grammarName>;
+a : 'a' 'b'* 'c'
+  | 'a' 'b' 'd'
+;
+q : 'e' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/LLStar.st

@@ -0,0 +1,5 @@
+grammar <grammarName>;
+a : 'a'+ 'b'
+  | 'a'+ 'c'
+;
+q : 'e' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/MultiTokenDeletionBeforeLoop.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' 'b'* 'c';

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/MultiTokenDeletionBeforeLoop2.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' ('b'|'z'{<pass()>})* 'c';

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/MultiTokenDeletionDuringLoop.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' 'b'* 'c' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/MultiTokenDeletionDuringLoop2.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' ('b'|'z'{<pass()>})* 'c' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/NoViableAltAvoidance.st

@@ -0,0 +1,7 @@
+grammar <grammarName>;
+s : e '!' ;
+e : 'a' 'b'
+  | 'a'
+  ;
+DOT : '.' ;
+WS : [ \t\r\n]+ -> skip;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/SingleSetInsertion.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' ('b'|'c') 'd' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/SingleTokenDeletion.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' 'b' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/SingleTokenDeletionBeforeLoop.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' 'b'* ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/SingleTokenDeletionBeforeLoop2.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' ('b'|'z'{<pass()>})*;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/SingleTokenDeletionDuringLoop.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' 'b'* 'c' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/SingleTokenDeletionDuringLoop2.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' ('b'|'z'{<pass()>})* 'c' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/SingleTokenDeletionExpectingSet.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' ('b'|'c') ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/SingleTokenInsertion.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' 'b' 'c' ;

tool/test/org/antlr/v4/testgen/grammars/ParserErrors/TokenMismatch.st

@@ -0,0 +1,2 @@
+grammar <grammarName>;
+a : 'a' 'b' ;