Merge pull request #991 from michaelpj/sync-before-predict

Reinstitute `sync` calls before `adaptivePredict`
antlr · Nov 19, 2015 · 05b5032 · 05b5032
2 parents 3fa8cfe + 42cb08f
commit 05b5032
Show file tree

Hide file tree

Showing 13 changed files with 280 additions and 25 deletions.
diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserErrors/Index.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/templates/ParserErrors/Index.stg
@@ -11,6 +11,8 @@ TestTemplates ::= [
 	"LL2": [],
 	"LL3": [],
 	"LLStar": [],
+	"SingleTokenDeletionBeforeAlt": [],
+	"SingleTokenDeletionBeforePredict": [],
 	"SingleTokenDeletionBeforeLoop": [],
 	"MultiTokenDeletionBeforeLoop": [],
 	"SingleTokenDeletionDuringLoop": [],

diff --git a/...sources/org/antlr/v4/test/runtime/templates/ParserErrors/SingleTokenDeletionBeforeAlt.stg b/...sources/org/antlr/v4/test/runtime/templates/ParserErrors/SingleTokenDeletionBeforeAlt.stg
@@ -0,0 +1,28 @@
+TestType() ::= "Parser"
+
+Options ::= [
+	"Debug": false
+]
+
+Grammar ::= [
+	"T": {<grammar("T")>}
+]
+
+Input() ::= "ac"
+
+Rule() ::= "a"
+
+Output() ::= <<
+>>
+
+Errors() ::= <<
+line 1:0 extraneous input 'a' expecting {'b', 'c'}<\n>
+>>
+
+grammar(grammarName) ::= <<
+grammar <grammarName>;
+a : ('b' | 'c')
+;
+q : 'a'
+;
+>>
diff --git a/...ces/org/antlr/v4/test/runtime/templates/ParserErrors/SingleTokenDeletionBeforePredict.stg b/...ces/org/antlr/v4/test/runtime/templates/ParserErrors/SingleTokenDeletionBeforePredict.stg
@@ -0,0 +1,28 @@
+TestType() ::= "Parser"
+
+Options ::= [
+	"Debug": false
+]
+
+Grammar ::= [
+	"T": {<grammar("T")>}
+]
+
+Input() ::= "caaab"
+
+Rule() ::= "a"
+
+Output() ::= <<
+>>
+
+Errors() ::= <<
+line 1:0 extraneous input 'c' expecting 'a'<\n>
+>>
+
+grammar(grammarName) ::= <<
+grammar <grammarName>;
+a : 'a'+ 'b'
+  | 'a'+ 'c'
+;
+q : 'e' ;
+>>
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java
@@ -370,6 +370,24 @@ public void testSingleTokenDeletion() throws Exception {
 
 		assertEquals("line 1:1 extraneous input 'a' expecting 'b'\n", this.stderrDuringParse);
 
+	}
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforeAlt() throws Exception {
+		mkdir(tmpdir);
+		StringBuilder grammarBuilder = new StringBuilder(38);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : ('b' | 'c')\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'a'\n");
+		grammarBuilder.append(";");
+		String grammar = grammarBuilder.toString();
+		String input ="ac";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer", "a", input, false);
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'a' expecting {'b', 'c'}\n", this.stderrDuringParse);
+
 	}
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test
@@ -404,6 +422,24 @@ public void testSingleTokenDeletionBeforeLoop2() throws Exception {
 			"line 1:1 extraneous input 'a' expecting {<EOF>, 'b', 'z'}\n" +
 			"line 1:3 token recognition error at: 'c'\n", this.stderrDuringParse);
 
+	}
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforePredict() throws Exception {
+		mkdir(tmpdir);
+		StringBuilder grammarBuilder = new StringBuilder(48);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : 'a'+ 'b'\n");
+		grammarBuilder.append("  | 'a'+ 'c'\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'e' ;");
+		String grammar = grammarBuilder.toString();
+		String input ="caaab";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer", "a", input, false);
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'c' expecting 'a'\n", this.stderrDuringParse);
+
 	}
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test

diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserErrors.java
@@ -456,6 +456,28 @@ public void testSingleTokenDeletion() throws Exception {
 
 	}
 
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforeAlt() throws Exception {
+		mkdir(tmpdir);
+
+		StringBuilder grammarBuilder = new StringBuilder(38);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : ('b' | 'c')\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'a'\n");
+		grammarBuilder.append(";");
+		String grammar = grammarBuilder.toString();
+
+
+		String input ="ac";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer", "a", input, false);
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'a' expecting {'b', 'c'}\n", this.stderrDuringParse);
+
+	}
+
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test
 	public void testSingleTokenDeletionBeforeLoop() throws Exception {
@@ -498,6 +520,28 @@ public void testSingleTokenDeletionBeforeLoop2() throws Exception {
 
 	}
 
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforePredict() throws Exception {
+		mkdir(tmpdir);
+
+		StringBuilder grammarBuilder = new StringBuilder(48);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : 'a'+ 'b'\n");
+		grammarBuilder.append("  | 'a'+ 'c'\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'e' ;");
+		String grammar = grammarBuilder.toString();
+
+
+		String input ="caaab";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer", "a", input, false);
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'c' expecting 'a'\n", this.stderrDuringParse);
+
+	}
+
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test
 	public void testSingleTokenDeletionConsumption() throws Exception {

diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/javascript/node/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/javascript/node/TestParserErrors.java
@@ -414,6 +414,26 @@ public void testSingleTokenDeletion() throws Exception {
 
 		assertEquals("line 1:1 extraneous input 'a' expecting 'b'\n", this.stderrDuringParse);
 
+	}
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforeAlt() throws Exception {
+		mkdir(tmpdir);
+		StringBuilder grammarBuilder = new StringBuilder(38);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : ('b' | 'c')\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'a'\n");
+		grammarBuilder.append(";");
+		String grammar = grammarBuilder.toString();
+		String input ="ac";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer",
+		                          "TListener", "TVisitor",
+		                          "a", input, false);
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'a' expecting {'b', 'c'}\n", this.stderrDuringParse);
+
 	}
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test
@@ -452,6 +472,26 @@ public void testSingleTokenDeletionBeforeLoop2() throws Exception {
 			"line 1:1 extraneous input 'a' expecting {<EOF>, 'b', 'z'}\n" +
 			"line 1:3 token recognition error at: 'c'\n", this.stderrDuringParse);
 
+	}
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforePredict() throws Exception {
+		mkdir(tmpdir);
+		StringBuilder grammarBuilder = new StringBuilder(48);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : 'a'+ 'b'\n");
+		grammarBuilder.append("  | 'a'+ 'c'\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'e' ;");
+		String grammar = grammarBuilder.toString();
+		String input ="caaab";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer",
+		                          "TListener", "TVisitor",
+		                          "a", input, false);
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'c' expecting 'a'\n", this.stderrDuringParse);
+
 	}
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test

diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/python2/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/python2/TestParserErrors.java
@@ -476,6 +476,29 @@ public void testSingleTokenDeletion() throws Exception {
 
 	}
 
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforeAlt() throws Exception {
+		mkdir(tmpdir);
+
+		StringBuilder grammarBuilder = new StringBuilder(38);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : ('b' | 'c')\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'a'\n");
+		grammarBuilder.append(";");
+		String grammar = grammarBuilder.toString();
+
+
+		String input ="ac";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer", "TListener", "TVisitor", "a", input, false);
+
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'a' expecting {'b', 'c'}\n", this.stderrDuringParse);
+
+	}
+
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test
 	public void testSingleTokenDeletionBeforeLoop() throws Exception {
@@ -520,6 +543,29 @@ public void testSingleTokenDeletionBeforeLoop2() throws Exception {
 
 	}
 
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforePredict() throws Exception {
+		mkdir(tmpdir);
+
+		StringBuilder grammarBuilder = new StringBuilder(48);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : 'a'+ 'b'\n");
+		grammarBuilder.append("  | 'a'+ 'c'\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'e' ;");
+		String grammar = grammarBuilder.toString();
+
+
+		String input ="caaab";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer", "TListener", "TVisitor", "a", input, false);
+
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'c' expecting 'a'\n", this.stderrDuringParse);
+
+	}
+
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test
 	public void testSingleTokenDeletionConsumption() throws Exception {

diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/python3/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/python3/TestParserErrors.java
@@ -476,6 +476,29 @@ public void testSingleTokenDeletion() throws Exception {
 
 	}
 
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforeAlt() throws Exception {
+		mkdir(tmpdir);
+
+		StringBuilder grammarBuilder = new StringBuilder(38);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : ('b' | 'c')\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'a'\n");
+		grammarBuilder.append(";");
+		String grammar = grammarBuilder.toString();
+
+
+		String input ="ac";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer", "TListener", "TVisitor", "a", input, false);
+
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'a' expecting {'b', 'c'}\n", this.stderrDuringParse);
+
+	}
+
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test
 	public void testSingleTokenDeletionBeforeLoop() throws Exception {
@@ -520,6 +543,29 @@ public void testSingleTokenDeletionBeforeLoop2() throws Exception {
 
 	}
 
+	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
+	@Test
+	public void testSingleTokenDeletionBeforePredict() throws Exception {
+		mkdir(tmpdir);
+
+		StringBuilder grammarBuilder = new StringBuilder(48);
+		grammarBuilder.append("grammar T;\n");
+		grammarBuilder.append("a : 'a'+ 'b'\n");
+		grammarBuilder.append("  | 'a'+ 'c'\n");
+		grammarBuilder.append(";\n");
+		grammarBuilder.append("q : 'e' ;");
+		String grammar = grammarBuilder.toString();
+
+
+		String input ="caaab";
+		String found = execParser("T.g4", grammar, "TParser", "TLexer", "TListener", "TVisitor", "a", input, false);
+
+		assertEquals("", found);
+
+		assertEquals("line 1:0 extraneous input 'c' expecting 'a'\n", this.stderrDuringParse);
+
+	}
+
 	/* This file and method are generated by TestGenerator, any edits will be overwritten by the next generation. */
 	@Test
 	public void testSingleTokenDeletionConsumption() throws Exception {

diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/CSharp/CSharp.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/CSharp/CSharp.stg
@@ -537,7 +537,6 @@ CodeBlockForAlt(currentAltCodeBlock, locals, preamble, ops) ::= <<
 
 LL1AltBlock(choice, preamble, alts, error) ::= <<
 State = <choice.stateNumber>;
-<!ErrorHandler.sync(this);!>
 <if(choice.label)><labelref(choice.label)> = TokenStream.Lt(1);<endif>
 <preamble; separator="\n">
 switch (TokenStream.La(1)) {
@@ -551,7 +550,6 @@ default:
 
 LL1OptionalBlock(choice, alts, error) ::= <<
 State = <choice.stateNumber>;
-<!ErrorHandler.sync(this);!>
 switch (TokenStream.La(1)) {
 <choice.altLook,alts:{look,alt| <cases(ttypes=look)>
 	<alt>
@@ -563,7 +561,6 @@ default:
 
 LL1OptionalBlockSingleAlt(choice, expr, alts, preamble, error, followExpr) ::= <<
 State = <choice.stateNumber>;
-<!ErrorHandler.sync(this);!>
 <preamble; separator="\n">
 if (<expr>) {
 	<alts; separator="\n">
@@ -599,7 +596,7 @@ do {
 
 AltBlock(choice, preamble, alts, error) ::= <<
 State = <choice.stateNumber>;
-<!ErrorHandler.sync(this);!>
+ErrorHandler.Sync(this);
 <if(choice.label)><labelref(choice.label)> = TokenStream.Lt(1);<endif>
 <preamble; separator="\n">
 switch ( Interpreter.AdaptivePredict(TokenStream,<choice.decision>,Context) ) {
@@ -612,7 +609,7 @@ case <i>:
 
 OptionalBlock(choice, alts, error) ::= <<
 State = <choice.stateNumber>;
-<!ErrorHandler.sync(this);!>
+ErrorHandler.Sync(this);
 switch ( Interpreter.AdaptivePredict(TokenStream,<choice.decision>,Context) ) {
 <alts:{alt |
 case <i><if(!choice.ast.greedy)>+1<endif>: