Merge remote-tracking branch 'antlr/master' into optimized

Author: sharwell

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserErrors/InvalidEmptyInput.stg

@@ -20,7 +20,7 @@ Rule() ::= "start"
 Output() ::= ""
 
 Errors() ::= <<
-line 1:0 missing ID at '\<EOF>'<\n>
+line 1:0 mismatched input '\<EOF>' expecting ID<\n>
 >>
 
 grammar(grammarName) ::= <<

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserErrors/SingleTokenDeletionBeforeLoop.stg

@@ -22,5 +22,5 @@ line 1:3 token recognition error at: 'c'<\n>
 
 grammar(grammarName) ::= <<
 grammar <grammarName>;
-a : 'a' 'b'* ;
+a : 'a' 'b'* EOF ;
 >>

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserErrors/SingleTokenDeletionBeforeLoop2.stg

@@ -22,5 +22,5 @@ line 1:3 token recognition error at: 'c'<\n>
 
 grammar(grammarName) ::= <<
 grammar <grammarName>;
-a : 'a' ('b'|'z'{<Pass()>})*;
+a : 'a' ('b'|'z'{<Pass()>})* EOF ;
 >>

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserExec/Index.stg

@@ -31,6 +31,9 @@ TestTemplates ::= [
 	"MultipleEOFHandling": [],
 	"EOFInClosure": [],
 	"ReferenceToATN_1": [],
-	"ReferenceToATN_2": []
+	"ReferenceToATN_2": [],
 	//"AlternateQuotes": []
+	"OpenDeviceStatement_1": [],
+	"OpenDeviceStatement_2": [],
+	"OpenDeviceStatement_3": []
 ]

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserExec/OpenDeviceStatement.stg

@@ -0,0 +1,28 @@
+/*
+ * This is a regression test for antlr/antlr4#1545.
+ */
+
+TestType() ::= "Parser"
+
+Options ::= [
+	"Debug": false
+]
+
+Rule() ::= "statement"
+
+Output() ::= "OPEN DEVICE DEVICE<\n>"
+
+Errors() ::= ""
+
+grammar(grammarName, opt1) ::= <<
+grammar <grammarName>;
+program : statement+ '.' ;
+
+statement : 'OPEN' ( 'DEVICE' (  <opt1>  |  OPT2  |  OPT3  )? )+ {<writeln("$text")>} ;
+
+OPT1 : 'OPT-1';
+OPT2 : 'OPT-2';
+OPT3 : 'OPT-3';
+
+WS : (' '|'\n')+ -> channel(HIDDEN);
+>>

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserExec/OpenDeviceStatement_1.stg

@@ -0,0 +1,11 @@
+/*
+ * This is a regression test for antlr/antlr4#1545, case 1.
+ */
+
+import "OpenDeviceStatement.stg"
+
+Grammar ::= [
+	"OpenDeviceStatement": {<grammar("OpenDeviceStatement", "OPT1")>}
+]
+
+Input() ::= "OPEN DEVICE DEVICE"

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserExec/OpenDeviceStatement_2.stg

@@ -0,0 +1,11 @@
+/*
+ * This is a regression test for antlr/antlr4#1545, case 2.
+ */
+
+import "OpenDeviceStatement.stg"
+
+Grammar ::= [
+	"OpenDeviceStatement": {<grammar("OpenDeviceStatement", "(OPT1)")>}
+]
+
+Input() ::= "OPEN DEVICE DEVICE"

runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserExec/OpenDeviceStatement_3.stg

@@ -0,0 +1,11 @@
+/*
+ * This is a regression test for antlr/antlr4#1545, case 3.
+ */
+
+import "OpenDeviceStatement.stg"
+
+Grammar ::= [
+	"OpenDeviceStatement": {<grammar("OpenDeviceStatement", "(OPT1)")>}
+]
+
+Input() ::= "OPEN DEVICE DEVICE ."

runtime/Java/src/org/antlr/v4/runtime/DefaultErrorStrategy.java

@@ -231,10 +231,8 @@ public void sync(Parser recognizer) throws RecognitionException {
         int la = tokens.LA(1);
 
         // try cheaper subset first; might get lucky. seems to shave a wee bit off
-        if ( recognizer.getATN().nextTokens(s).contains(la) || la==Token.EOF ) return;
-
-		// Return but don't end recovery. only do that upon valid token match
-		if (recognizer.isExpectedToken(la)) {
+		IntervalSet nextTokens = recognizer.getATN().nextTokens(s);
+		if (nextTokens.contains(Token.EPSILON) || nextTokens.contains(la)) {
 			return;
 		}
 

tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg

@@ -529,7 +529,7 @@ switch (_input.LA(1)) {
 	<alt>
 	break;}; separator="\n">
 default:
-	<error>
+	break;
 }
 >>
 

tool/test/org/antlr/v4/test/tool/TestParseErrors.java

@@ -125,7 +125,7 @@ public class TestParseErrors extends BaseTest {
 	@Test public void testSingleTokenDeletionBeforeLoop() throws Exception {
 		String grammar =
 			"grammar T;\n" +
-			"a : 'a' 'b'*;";
+			"a : 'a' 'b'* EOF ;";
 		String found = execParser("T.g4", grammar, "TParser", "TLexer", "a", "aabc", false);
 		String expecting = "line 1:1 extraneous input 'a' expecting {<EOF>, 'b'}\n" +
 			"line 1:3 token recognition error at: 'c'\n";
@@ -172,7 +172,7 @@ public class TestParseErrors extends BaseTest {
 	@Test public void testSingleTokenDeletionBeforeLoop2() throws Exception {
 		String grammar =
 			"grammar T;\n" +
-			"a : 'a' ('b'|'z'{;})*;";
+			"a : 'a' ('b'|'z'{;})* EOF ;";
 		String found = execParser("T.g4", grammar, "TParser", "TLexer", "a", "aabc", false);
 		String expecting = "line 1:1 extraneous input 'a' expecting {<EOF>, 'b', 'z'}\n" +
 			"line 1:3 token recognition error at: 'c'\n";
@@ -249,7 +249,7 @@ public void testInvalidEmptyInput() throws Exception {
 		String result = execParser("T.g4", grammar, "TParser", "TLexer", "start", "", true);
 		String expecting = "";
 		assertEquals(expecting, result);
-		assertEquals("line 1:0 missing ID at '<EOF>'\n", this.stderrDuringParse);
+		assertEquals("line 1:0 mismatched input '<EOF>' expecting ID\n", this.stderrDuringParse);
 	}
 
 	/**