Skip to content

Add support for Disjoint Normal Form (DNF) types #8725

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

Merged
Girgias merged 13 commits into from
Jul 8, 2022
Merged

Add support for Disjoint Normal Form (DNF) types #8725

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5e5324c
Disjunctive normal form types
Girgias Aug 11, 2021
4f22afa
Check for redundant types
Girgias Dec 20, 2021
1cea4db
Properly register unresolved classes
Girgias Jun 7, 2022
a942f50
TODO Comment about improving error message
Girgias Jun 7, 2022
72652e9
Add an assertion and eliminate dead code
Girgias Jun 9, 2022
4da371b
XFAIL test for the time being
Girgias Jun 9, 2022
59659cc
Improve wording of redudant intersection types in unions
Girgias Jun 10, 2022
a017ac8
Add some assertions
Girgias Jun 10, 2022
aae8472
Fix OpCache not recursively storing in persistent memory sub intersec…
Girgias Jun 11, 2022
f963d06
Improve union type parsing
Girgias Jun 14, 2022
5a292c6
Adjust elide_return_type DFA pass function
Girgias Jun 14, 2022
d399f3e
Adjust Zend Accelerator
Girgias Jun 14, 2022
521f3f1
Add assertion + TODO for test for gen_stub support of DNF types
Girgias Jun 14, 2022
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
Prev Previous commit
Next Next commit
Improve union type parsing 
Co-authored-by: Sara Golemon <pollita@php.net>
  • Loading branch information
@Girgias @sgolemon
Girgias and sgolemon committed Jun 14, 2022
commit f963d061a6bed8ca924810e31e92f1230d24a207
38 changes: 16 additions & 22 deletions Zend/zend_language_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%type <ast> lexical_var_list encaps_list
%type <ast> array_pair non_empty_array_pair_list array_pair_list possible_array_pair
%type <ast> isset_variable type return_type type_expr type_without_static
%type <ast> identifier type_expr_without_static union_type_without_static intersection_type_without_static
%type <ast> inline_function union_type intersection_type
%type <ast> identifier type_expr_without_static union_type_without_static_element union_type_without_static intersection_type_without_static
%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
Expand Down Expand Up @@ -813,19 +813,16 @@ type:
| T_STATIC { $$ = zend_ast_create_ex(ZEND_AST_TYPE, IS_STATIC); }
;

union_type_element:
type { $$ = $1; }
| '(' intersection_type ')' { $$ = $2; }
;

union_type:
type '|' type
union_type_element '|' union_type_element
{ $$ = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, $1, $3); }
| '(' intersection_type ')' '|' type
{ $$ = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, $2, $5); }
| type '|' '(' intersection_type ')'
{ $$ = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, $1, $4); }
| '(' intersection_type ')' '|' '(' intersection_type ')'
{ $$ = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, $2, $6); }
| union_type '|' type
| union_type '|' union_type_element
{ $$ = zend_ast_list_add($1, $3); }
| union_type '|' '(' intersection_type ')'
{ $$ = zend_ast_list_add($1, $4); }
;

intersection_type:
Expand All @@ -849,19 +846,16 @@ type_without_static:
| name { $$ = $1; }
;

union_type_without_static_element:
type_without_static { $$ = $1; }
| '(' intersection_type_without_static ')' { $$ = $2; }
;

union_type_without_static:
type_without_static '|' type_without_static
union_type_without_static_element '|' union_type_without_static_element
{ $$ = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, $1, $3); }
| '(' intersection_type_without_static ')' '|' type_without_static
{ $$ = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, $2, $5); }
| type_without_static '|' '(' intersection_type_without_static ')'
{ $$ = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, $1, $4); }
| '(' intersection_type_without_static ')' '|' '(' intersection_type_without_static ')'
{ $$ = zend_ast_create_list(2, ZEND_AST_TYPE_UNION, $2, $6); }
| union_type_without_static '|' type_without_static
| union_type_without_static '|' union_type_without_static_element
{ $$ = zend_ast_list_add($1, $3); }
| union_type_without_static '|' '(' intersection_type_without_static ')'
{ $$ = zend_ast_list_add($1, $4); }
;

intersection_type_without_static:
Expand Down