Adjust expect of test

Author: Jeckerson

.github/workflows/main.yml

@@ -95,7 +95,7 @@ jobs:
         run: |
           phpize
 
-          if [ "${{ matrix.ccov}}" = "ON" ]; then
+          if [ "${{ matrix.ccov }}" = "ON" ]; then
             ./configure \
               --enable-zephir-parser \
               --enable-zephir-parser-debug \

parser/parser.h

@@ -896,23 +896,23 @@ static void xx_ret_return_statement(zval *ret, zval *expr, xx_scanner_state *sta
 	parser_add_int(ret, "char", state->active_char);
 }
 
-static void xx_ret_require_statement(zval *ret, zval *expr, xx_scanner_state *state)
+static void xx_ret_require_once_statement(zval *ret, zval *expr, xx_scanner_state *state)
 {
 	array_init(ret);
 
-	parser_add_str(ret, "type", "require");
+	parser_add_str(ret, "type", "require_once");
 	parser_add_zval(ret, "expr", expr);
 
 	parser_add_str(ret, "file", state->active_file);
 	parser_add_int(ret, "line", state->active_line);
 	parser_add_int(ret, "char", state->active_char);
 }
 
-static void xx_ret_require_once_statement(zval *ret, zval *expr, xx_scanner_state *state)
+static void xx_ret_require_statement(zval *ret, zval *expr, xx_scanner_state *state)
 {
 	array_init(ret);
 
-	parser_add_str(ret, "type", "require_once");
+	parser_add_str(ret, "type", "require");
 	parser_add_zval(ret, "expr", expr);
 
 	parser_add_str(ret, "file", state->active_file);

parser/scanner.re

@@ -351,18 +351,18 @@ int xx_get_token(xx_scanner_state *s, xx_scanner_token *token) {
 			return 0;
 		}
 
-		'require' {
-			s->active_char += sizeof("require")-1;
-			token->opcode = XX_T_REQUIRE;
-			return 0;
-		}
-
 		'require_once' {
 			s->active_char += sizeof("require_once")-1;
 			token->opcode = XX_T_REQUIRE_ONCE;
 			return 0;
 		}
 
+		'require' {
+			s->active_char += sizeof("require")-1;
+			token->opcode = XX_T_REQUIRE;
+			return 0;
+		}
+
 		'clone' {
 			s->active_char += sizeof("clone")-1;
 			token->opcode = XX_T_CLONE;

parser/zephir.lemon

@@ -40,8 +40,8 @@
 
 %left INTERNAL PUBLIC PROTECTED STATIC PRIVATE SCOPED .
 %left COMMA .
-%right REQUIRE .
 %right REQUIRE_ONCE .
+%right REQUIRE .
 %right DOUBLEARROW .
 %right QUESTION .
 %right LIKELY UNLIKELY .
@@ -982,11 +982,11 @@ xx_statement(R) ::= xx_return_statement(S) . {
 	R = S;
 }
 
-xx_statement(R) ::= xx_require_statement(S) . {
+xx_statement(R) ::= xx_require_once_statement(S) . {
 	R = S;
 }
 
-xx_statement(R) ::= xx_require_once_statement(S) . {
+xx_statement(R) ::= xx_require_statement(S) . {
 	R = S;
 }
 
@@ -1532,16 +1532,16 @@ xx_return_statement(R) ::= RETURN DOTCOMMA . {
 	xx_ret_return_statement(&R, NULL, status->scanner_state);
 }
 
-/* require statement */
-xx_require_statement(R) ::= REQUIRE xx_common_expr(E) DOTCOMMA . {
-	xx_ret_require_statement(&R, &E, status->scanner_state);
-}
-
 /* require_once statement */
 xx_require_once_statement(R) ::= REQUIRE_ONCE xx_common_expr(E) DOTCOMMA . {
 	xx_ret_require_once_statement(&R, &E, status->scanner_state);
 }
 
+/* require statement */
+xx_require_statement(R) ::= REQUIRE xx_common_expr(E) DOTCOMMA . {
+	xx_ret_require_statement(&R, &E, status->scanner_state);
+}
+
 /* unset {expr} */
 xx_unset_statement(R) ::= UNSET xx_common_expr(E) DOTCOMMA . {
 	xx_ret_unset_statement(&R, &E, status->scanner_state);
@@ -1641,14 +1641,14 @@ xx_common_expr(R) ::= ISSET xx_common_expr(O1) . {
 	xx_ret_expr(&R, "isset", &O1, NULL, NULL, status->scanner_state);
 }
 
-xx_common_expr(R) ::= REQUIRE xx_common_expr(O1) . {
-	xx_ret_expr(&R, "require", &O1, NULL, NULL, status->scanner_state);
-}
-
 xx_common_expr(R) ::= REQUIRE_ONCE xx_common_expr(O1) . {
 	xx_ret_expr(&R, "require_once", &O1, NULL, NULL, status->scanner_state);
 }
 
+xx_common_expr(R) ::= REQUIRE xx_common_expr(O1) . {
+	xx_ret_expr(&R, "require", &O1, NULL, NULL, status->scanner_state);
+}
+
 xx_common_expr(R) ::= CLONE xx_common_expr(O1) . {
 	xx_ret_expr(&R, "clone", &O1, NULL, NULL, status->scanner_state);
 }

tests/statements/require_once.phpt

@@ -16,7 +16,7 @@ var_dump($ir[0]["statements"][0]);
 --EXPECT--
 array(5) {
   ["type"]=>
-  string(7) "require_once"
+  string(12) "require_once"
   ["expr"]=>
   array(5) {
     ["type"]=>
@@ -28,7 +28,7 @@ array(5) {
     ["line"]=>
     int(2)
     ["char"]=>
-    int(13)
+    int(18)
   }
   ["file"]=>
   string(11) "(eval code)"