Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: implement empty match subject (default=true) #17692

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+32 −3
Draft

feat: implement empty match subject (default=true) #17692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
babca69
feat: implement empty match subject (default=true)
xepozz Feb 4, 2025
289a263
Merge branch 'refs/heads/master' into empty-match
xepozz Feb 4, 2025
8d7d9e6
test: move tests to a new file
xepozz Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Zend/tests/match/050.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--TEST--
Empty match subject with default "true"
--FILE--
<?php
var_dump(match {
true => 'x',
default => 'y',
});

var_dump(match {
false => 'x',
!false => 'y',
default => 'z',
});

var_dump(match {
1 > 2 => 'x',
3 < 2 => 'y',
default => 'z',
});
?>
--EXPECT--
string(1) "x"
string(1) "y"
string(1) "z"
10 changes: 7 additions & 3 deletions Zend/zend_language_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> inline_function union_type_element union_type intersection_type
%type <ast> attributed_statement attributed_class_statement attributed_parameter
%type <ast> attribute_decl attribute attributes attribute_group namespace_declaration_name
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list
%type <ast> match match_arm_list non_empty_match_arm_list match_arm match_arm_cond_list match_cond_subject
%type <ast> enum_declaration_statement enum_backing_type enum_case enum_case_expr
%type <ast> function_name non_empty_member_modifiers
%type <ast> property_hook property_hook_list optional_property_hook_list hooked_property property_hook_body
Expand Down Expand Up @@ -716,10 +716,14 @@ case_separator:
| ';'
;

match_cond_subject:
%empty { zval z; ZVAL_TRUE(&z); $$ = zend_ast_create_zval(&z); }
| '(' expr ')' { $$ = $2; }
;

match:
T_MATCH '(' expr ')' '{' match_arm_list '}'
{ $$ = zend_ast_create(ZEND_AST_MATCH, $3, $6); };
T_MATCH match_cond_subject '{' match_arm_list '}'
{ $$ = zend_ast_create(ZEND_AST_MATCH, $2, $4); };
;

match_arm_list:
Expand Down