Skip to content

Commit 0b7215b

Browse files
GirgiasGirgias
committed
Apply Ilija parser patch
1 parent 05be44d commit 0b7215b

25 files changed

+52
-78
lines changed

‎Zend/tests/exit/ast_print_assert_die_const.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313

1414
?>
1515
--EXPECT--
16-
AssertionError: assert(0 && die)
16+
AssertionError: assert(0 && \exit())

‎Zend/tests/exit/ast_print_assert_die_function.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313

1414
?>
1515
--EXPECT--
16-
AssertionError: assert(0 && die())
16+
AssertionError: assert(0 && \exit())

‎Zend/tests/exit/ast_print_assert_exit_const.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313

1414
?>
1515
--EXPECT--
16-
AssertionError: assert(0 && exit)
16+
AssertionError: assert(0 && \exit())

‎Zend/tests/exit/ast_print_assert_exit_function.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ try {
1313

1414
?>
1515
--EXPECT--
16-
AssertionError: assert(0 && exit())
16+
AssertionError: assert(0 && \exit())

‎Zend/tests/exit/define_die_constant.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ var_dump(die);
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot define constant with name die in %s on line %d
12+
Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d

‎Zend/tests/exit/define_die_constant_namespace.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ var_dump(die);
1111

1212
?>
1313
--EXPECTF--
14-
Fatal error: Cannot define constant with name die in %s on line %d
14+
Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d

‎Zend/tests/exit/define_die_function.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ function die() { }
77

88
?>
99
--EXPECTF--
10-
Fatal error: Defining a custom die() function is not allowed, as the function has special semantics in %s on line %d
10+
Parse error: syntax error, unexpected token "exit", expecting "(" in %s on line %d

‎Zend/tests/exit/define_die_function_namespace.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ var_dump(die());
1111

1212
?>
1313
--EXPECTF--
14-
Fatal error: Defining a custom die() function is not allowed, as the function has special semantics in %s on line %d
14+
Parse error: syntax error, unexpected token "exit", expecting "(" in %s on line %d

‎Zend/tests/exit/define_exit_constant.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ var_dump(exit);
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot define constant with name exit in %s on line %d
12+
Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d

‎Zend/tests/exit/define_exit_constant_namespace.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ var_dump(exit);
1111

1212
?>
1313
--EXPECTF--
14-
Fatal error: Cannot define constant with name exit in %s on line %d
14+
Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d

‎Zend/tests/exit/define_exit_function.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ function exit() { }
77

88
?>
99
--EXPECTF--
10-
Fatal error: Defining a custom exit() function is not allowed, as the function has special semantics in %s on line %d
10+
Parse error: syntax error, unexpected token "exit", expecting "(" in %s on line %d

‎Zend/tests/exit/define_exit_function_namespace.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ function exit() { }
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Defining a custom exit() function is not allowed, as the function has special semantics in %s on line %d
12+
Parse error: syntax error, unexpected token "exit", expecting "(" in %s on line %d

‎Zend/tests/exit/define_goto_label_die.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,5 @@ die:
1010
echo "After\n";
1111

1212
?>
13-
--EXPECT--
14-
Before
15-
In between
16-
After
13+
--EXPECTF--
14+
Parse error: syntax error, unexpected token ":" in %s on line %d

‎Zend/tests/exit/define_goto_label_die_with_jump.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ die:
1010
echo "After\n";
1111

1212
?>
13-
--EXPECT--
14-
Before
15-
After
13+
--EXPECTF--
14+
Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d

‎Zend/tests/exit/define_goto_label_exit.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,5 @@ exit:
1010
echo "After\n";
1111

1212
?>
13-
--EXPECT--
14-
Before
15-
In between
16-
After
13+
--EXPECTF--
14+
Parse error: syntax error, unexpected token ":" in %s on line %d

‎Zend/tests/exit/define_goto_label_exit_with_jump.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ exit:
1010
echo "After\n";
1111

1212
?>
13-
--EXPECT--
14-
Before
15-
After
13+
--EXPECTF--
14+
Parse error: syntax error, unexpected token "exit", expecting identifier in %s on line %d

‎Zend/tests/exit/die_string_cast_exception.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ try {
1111

1212
?>
1313
--EXPECT--
14-
die(): Argument #1 ($code) must be of type string|int, stdClass given
14+
exit(): Argument #1 ($code) must be of type string|int, stdClass given

‎Zend/tests/exit/exit_as_function.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ object(Closure)#1 (2) {
3333
}
3434
object(Closure)#2 (2) {
3535
["function"]=>
36-
string(3) "die"
36+
string(4) "exit"
3737
["parameter"]=>
3838
array(1) {
3939
["$code"]=>

‎Zend/tests/exit/exit_values.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ TypeError: exit(): Argument #1 ($code) must be of type string|int, stdClass give
132132
Using NULL as value:
133133
Exit status is: 0
134134
Output is:
135-
Deprecated: die(): Passing null to parameter #1 ($code) of type string|int is deprecated in %s on line %d
135+
Deprecated: exit(): Passing null to parameter #1 ($code) of type string|int is deprecated in %s on line %d
136136
Using false as value:
137137
Exit status is: 0
138138
Output is:
@@ -168,16 +168,16 @@ Hello world
168168
Using [] as value:
169169
Exit status is: 0
170170
Output is:
171-
TypeError: die(): Argument #1 ($code) must be of type string|int, array given
171+
TypeError: exit(): Argument #1 ($code) must be of type string|int, array given
172172
Using STDERR as value:
173173
Exit status is: 0
174174
Output is:
175-
TypeError: die(): Argument #1 ($code) must be of type string|int, resource given
175+
TypeError: exit(): Argument #1 ($code) must be of type string|int, resource given
176176
Using new stdClass() as value:
177177
Exit status is: 0
178178
Output is:
179-
TypeError: die(): Argument #1 ($code) must be of type string|int, stdClass given
179+
TypeError: exit(): Argument #1 ($code) must be of type string|int, stdClass given
180180
As a statement:
181181
Exit status is: 0
182182
Output is:
183-
TypeError: die(): Argument #1 ($code) must be of type string|int, stdClass given
183+
TypeError: exit(): Argument #1 ($code) must be of type string|int, stdClass given

‎Zend/zend_compile.c

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8160,12 +8160,10 @@ static zend_string *zend_begin_func_decl(znode *result, zend_op_array *op_array,
81608160

81618161
if (
81628162
zend_string_equals_literal_ci(unqualified_name, "assert")
8163-
|| zend_string_equals_literal_ci(unqualified_name, "exit")
8164-
|| zend_string_equals_literal_ci(unqualified_name, "die")
81658163
) {
81668164
zend_error(E_COMPILE_ERROR,
8167-
"Defining a custom %s() function is not allowed, "
8168-
"as the function has special semantics", ZSTR_VAL(unqualified_name));
8165+
"Defining a custom assert() function is not allowed, "
8166+
"as the function has special semantics");
81698167
}
81708168

81718169
zend_register_seen_symbol(lcname, ZEND_SYMBOL_FUNCTION);
@@ -9371,18 +9369,6 @@ static void zend_compile_const_decl(zend_ast *ast) /* {{{ */
93719369
value_node.op_type = IS_CONST;
93729370
zend_const_expr_to_zval(value_zv, value_ast_ptr, /* allow_dynamic */ true);
93739371

9374-
if (UNEXPECTED(
9375-
zend_string_equals_literal_ci(unqualified_name, "exit")
9376-
|| zend_string_equals_literal_ci(unqualified_name, "die")
9377-
)) {
9378-
zend_throw_error(NULL, "Cannot define constant with name %s", ZSTR_VAL(unqualified_name));
9379-
return;
9380-
}
9381-
if (zend_get_special_const(ZSTR_VAL(unqualified_name), ZSTR_LEN(unqualified_name))) {
9382-
zend_error_noreturn(E_COMPILE_ERROR,
9383-
"Cannot redeclare constant '%s'", ZSTR_VAL(unqualified_name));
9384-
}
9385-
93869372
name = zend_prefix_with_ns(unqualified_name);
93879373
name = zend_new_interned_string(name);
93889374

@@ -10688,33 +10674,6 @@ static void zend_compile_const(znode *result, zend_ast *ast) /* {{{ */
1068810674
bool is_fully_qualified;
1068910675
zend_string *orig_name = zend_ast_get_str(name_ast);
1069010676

10691-
/* The fake "constants" exit and die must be converted to a function call for exit() */
10692-
if (UNEXPECTED(
10693-
zend_string_equals_literal_ci(orig_name, "exit")
10694-
|| zend_string_equals_literal_ci(orig_name, "die")
10695-
)) {
10696-
zval *fbc_zv = zend_hash_find(CG(function_table), ZSTR_KNOWN(ZEND_STR_EXIT));
10697-
ZEND_ASSERT(fbc_zv && "exit() function should always exist");
10698-
zend_function *fbc = Z_PTR_P(fbc_zv);
10699-
10700-
znode name_node;
10701-
name_node.op_type = IS_CONST;
10702-
ZVAL_STR(&name_node.u.constant, ZSTR_KNOWN(ZEND_STR_EXIT));
10703-
10704-
opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node);
10705-
opline->result.num = zend_alloc_cache_slot();
10706-
10707-
/* Store offset to function from symbol table in op2.extra. */
10708-
{
10709-
Bucket *fbc_bucket = (Bucket*)((uintptr_t)fbc_zv - XtOffsetOf(Bucket, val));
10710-
Z_EXTRA_P(CT_CONSTANT(opline->op2)) = fbc_bucket - CG(function_table)->arData;
10711-
}
10712-
10713-
zend_ast *args_list = zend_ast_create_list_0(ZEND_AST_ARG_LIST);
10714-
zend_compile_call_common(result, args_list, fbc, ast->lineno);
10715-
return;
10716-
}
10717-
1071810677
zend_string *resolved_name = zend_resolve_const_name(orig_name, name_ast->attr, &is_fully_qualified);
1071910678

1072010679
if (zend_string_equals_literal(resolved_name, "__COMPILER_HALT_OFFSET__") || (name_ast->attr != ZEND_NAME_RELATIVE && zend_string_equals_literal(orig_name, "__COMPILER_HALT_OFFSET__"))) {

‎Zend/zend_language_parser.y

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
113113
%token <ident> T_INSTANCEOF "'instanceof'"
114114
%token <ident> T_NEW "'new'"
115115
%token <ident> T_CLONE "'clone'"
116+
%token <ident> T_EXIT "'exit'"
116117
%token <ident> T_IF "'if'"
117118
%token <ident> T_ELSEIF "'elseif'"
118119
%token <ident> T_ELSE "'else'"
@@ -299,7 +300,7 @@ start:
299300

300301
reserved_non_modifiers:
301302
T_INCLUDE | T_INCLUDE_ONCE | T_EVAL | T_REQUIRE | T_REQUIRE_ONCE | T_LOGICAL_OR | T_LOGICAL_XOR | T_LOGICAL_AND
302-
| T_INSTANCEOF | T_NEW | T_CLONE | T_IF | T_ELSEIF | T_ELSE | T_ENDIF | T_ECHO | T_DO | T_WHILE | T_ENDWHILE
303+
| T_INSTANCEOF | T_NEW | T_CLONE | T_EXIT | T_IF | T_ELSEIF | T_ELSE | T_ENDIF | T_ECHO | T_DO | T_WHILE | T_ENDWHILE
303304
| T_FOR | T_ENDFOR | T_FOREACH | T_ENDFOREACH | T_DECLARE | T_ENDDECLARE | T_AS | T_TRY | T_CATCH | T_FINALLY
304305
| T_THROW | T_USE | T_INSTEADOF | T_GLOBAL | T_VAR | T_UNSET | T_ISSET | T_EMPTY | T_CONTINUE | T_GOTO
305306
| T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT | T_BREAK
@@ -1303,6 +1304,11 @@ expr:
13031304
| T_OBJECT_CAST expr { $$ = zend_ast_create_cast(IS_OBJECT, $2); }
13041305
| T_BOOL_CAST expr { $$ = zend_ast_create_cast(_IS_BOOL, $2); }
13051306
| T_UNSET_CAST expr { $$ = zend_ast_create_cast(IS_NULL, $2); }
1307+
| T_EXIT ctor_arguments {
1308+
zend_ast *name = zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_EXIT));
1309+
name->attr = ZEND_NAME_FQ;
1310+
$$ = zend_ast_create(ZEND_AST_CALL, name, $2);
1311+
}
13061312
| '@' expr { $$ = zend_ast_create(ZEND_AST_SILENCE, $2); }
13071313
| scalar { $$ = $1; }
13081314
| '`' backticks_expr '`' { $$ = zend_ast_create(ZEND_AST_SHELL_EXEC, $2); }

‎Zend/zend_language_scanner.l

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,6 +1382,14 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
13821382
/* compute yyleng before each rule */
13831383
<!*> := yyleng = YYCURSOR - SCNG(yy_text);
13841384

1385+
<ST_IN_SCRIPTING>"exit" {
1386+
RETURN_TOKEN_WITH_IDENT(T_EXIT);
1387+
}
1388+
1389+
<ST_IN_SCRIPTING>"die" {
1390+
RETURN_TOKEN_WITH_IDENT(T_EXIT);
1391+
}
1392+
13851393
<ST_IN_SCRIPTING>"fn" {
13861394
RETURN_TOKEN_WITH_IDENT(T_FN);
13871395
}

‎ext/tokenizer/tokenizer_data.c

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/tokenizer/tokenizer_data.stub.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@
132132
* @cvalue T_CLONE
133133
*/
134134
const T_CLONE = UNKNOWN;
135+
/**
136+
* @var int
137+
* @cvalue T_EXIT
138+
*/
139+
const T_EXIT = UNKNOWN;
135140
/**
136141
* @var int
137142
* @cvalue T_IF

‎ext/tokenizer/tokenizer_data_arginfo.h

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)