Improve error recovery quality

In particular, support recovering from a missing trailing semicolon, while keeping the rest of the expression.
nikic · Apr 20, 2016 · 96cbd48 · 96cbd48
1 parent e45e31c
commit 96cbd48
Show file tree

Hide file tree

Showing 7 changed files with 1,435 additions and 1,337 deletions.
diff --git a/grammar/php5.y b/grammar/php5.y
@@ -183,6 +183,7 @@ non_empty_statement:
     | T_THROW expr ';'                                      { $$ = Stmt\Throw_[$2]; }
     | T_GOTO T_STRING ';'                                   { $$ = Stmt\Goto_[$2]; }
     | T_STRING ':'                                          { $$ = Stmt\Label[$1]; }
+    | expr error                                            { $$ = $1; }
     | error                                                 { $$ = array(); /* means: no statement */ }
 ;
 

diff --git a/grammar/php7.y b/grammar/php7.y
@@ -179,6 +179,7 @@ non_empty_statement:
     | T_THROW expr ';'                                      { $$ = Stmt\Throw_[$2]; }
     | T_GOTO T_STRING ';'                                   { $$ = Stmt\Goto_[$2]; }
     | T_STRING ':'                                          { $$ = Stmt\Label[$1]; }
+    | expr error                                            { $$ = $1; }
     | error                                                 { $$ = array(); /* means: no statement */ }
 ;
 

diff --git a/lib/PhpParser/Parser/Php5.php b/lib/PhpParser/Parser/Php5.php
diff --git a/lib/PhpParser/Parser/Php7.php b/lib/PhpParser/Parser/Php7.php
diff --git a/test/code/parser/errorHandling/eofError.test b/test/code/parser/errorHandling/eofError.test
@@ -4,15 +4,29 @@ Error positions
 -----
 Syntax error, unexpected EOF from 1:10 to 1:10
 array(
+    0: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+    )
 )
 -----
 <?php foo /* bar */
 -----
 Syntax error, unexpected EOF from 1:20 to 1:20
 array(
-    0: Stmt_Nop(
+    0: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+    )
+    1: Stmt_Nop(
         comments: array(
             0: /* bar */
         )
     )
-)
+)
diff --git a/test/code/parser/errorHandling/recovery.test b/test/code/parser/errorHandling/recovery.test
@@ -10,6 +10,33 @@ Syntax error, unexpected T_STRING from 4:1 to 4:3
 Syntax error, unexpected T_STRING from 5:1 to 5:3
 Syntax error, unexpected EOF from 5:6 to 5:6
 array(
+    0: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: foo
+            )
+        )
+        args: array(
+        )
+    )
+    1: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: bar
+            )
+        )
+        args: array(
+        )
+    )
+    2: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: baz
+            )
+        )
+        args: array(
+        )
+    )
 )
 -----
 <?php
@@ -23,13 +50,22 @@ array(
     0: Expr_FuncCall(
         name: Name(
             parts: array(
-                0: bar
+                0: foo
             )
         )
         args: array(
         )
     )
     1: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: bar
+            )
+        )
+        args: array(
+        )
+    )
+    2: Expr_FuncCall(
         name: Name(
             parts: array(
                 0: baz
@@ -58,6 +94,15 @@ array(
         )
     )
     1: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: bar
+            )
+        )
+        args: array(
+        )
+    )
+    2: Expr_FuncCall(
         name: Name(
             parts: array(
                 0: baz
@@ -81,6 +126,9 @@ array(
             )
         )
     )
+    1: Scalar_LNumber(
+        value: 1
+    )
 )
 -----
 <?php
@@ -97,6 +145,9 @@ array(
         )
         returnType: null
         stmts: array(
+            0: Scalar_LNumber(
+                value: 1
+            )
         )
     )
 )

diff --git a/test/code/parser/stmt/namespace/groupUseErrors.test b/test/code/parser/stmt/namespace/groupUseErrors.test
@@ -34,6 +34,20 @@ use Foo {Bar, Baz};
 -----
 Syntax error, unexpected '{', expecting ',' or ';' from 3:9 to 3:9
 array(
+    0: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: Bar
+            )
+        )
+    )
+    1: Expr_ConstFetch(
+        name: Name(
+            parts: array(
+                0: Baz
+            )
+        )
+    )
 )
 -----
 <?php
@@ -42,4 +56,11 @@ use Foo\{\Bar};
 -----
 Syntax error, unexpected T_NS_SEPARATOR, expecting T_STRING or T_FUNCTION or T_CONST from 3:10 to 3:10
 array(
+    0: Expr_ConstFetch(
+        name: Name_FullyQualified(
+            parts: array(
+                0: Bar
+            )
+        )
+    )
 )