Skip to content

[WIP][RFC] spread operator in list #5000

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

Closed
wants to merge 2 commits into from
Closed

[WIP][RFC] spread operator in list #5000

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40d42ef
spread operator in list
jhdxr Aug 26, 2019
9f101fb
bugfix
jhdxr Oct 21, 2019
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
70 changes: 64 additions & 6 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2646,8 +2646,10 @@ static void zend_compile_list_assign(
zend_ast_list *list = zend_ast_get_list(ast);
uint32_t i;
zend_bool has_elems = 0;
zend_bool has_spread_operator = 0;
zend_bool is_keyed =
list->children > 0 && list->child[0] != NULL && list->child[0]->child[1] != NULL;
list->children > 0 && list->child[0] != NULL && list->child[0]->kind != ZEND_AST_UNPACK
&& list->child[0]->child[1] != NULL;

if (list->children && expr_node->op_type == IS_CONST && Z_TYPE(expr_node->u.constant) == IS_STRING) {
zval_make_interned_string(&expr_node->u.constant);
Expand All @@ -2667,16 +2669,26 @@ static void zend_compile_list_assign(
continue;
}
}

if (has_spread_operator) {
zend_error(E_COMPILE_ERROR, "Cannot use positional assignment after spread operator");
}

if (elem_ast->kind == ZEND_AST_UNPACK) {
zend_error(E_COMPILE_ERROR,
"Spread operator is not supported in assignments");
has_spread_operator = 1;
var_ast = elem_ast->child[0];
key_ast = NULL;
} else {
var_ast = elem_ast->child[0];
key_ast = elem_ast->child[1];
}

var_ast = elem_ast->child[0];
key_ast = elem_ast->child[1];
has_elems = 1;

if (has_spread_operator && is_keyed) {
zend_error(E_COMPILE_ERROR,
"Spread operator is not supported in keyed array assignments");
}

if (is_keyed) {
if (key_ast == NULL) {
zend_error(E_COMPILE_ERROR,
Expand All @@ -2700,6 +2712,52 @@ static void zend_compile_list_assign(

zend_verify_list_assign_target(var_ast, old_style);

if (elem_ast->kind == ZEND_AST_UNPACK) {
uint32_t opnum_reset, opnum_fetch;
znode value_node, reset_node, tmp_node;
uint32_t j;

zend_emit_op_tmp(&value_node, ZEND_INIT_ARRAY, NULL, NULL);

opnum_reset = get_next_op_number();
zend_emit_op(&reset_node, ZEND_FE_RESET_R, expr_node, NULL);

for (j = 0; j <i; ++j) {
opline = zend_emit_op(NULL, ZEND_FE_FETCH_R, &reset_node, NULL);
opline->op2_type = IS_VAR;
opline->op2.var = get_temporary_variable();
//save var?
//no need to deal with jmp, since those visited indexes are guaranteed to exist.
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may skip different elements than were fetched before, if the indexes/order of the array don't match. For example list($a, ...$b) = [1 => 1, 0 => 0]. Then $a = 0, but this will skip 1 instead.


zend_begin_loop(ZEND_FE_FREE, &reset_node, 0);

opnum_fetch = get_next_op_number();
opline = zend_emit_op(NULL, ZEND_FE_FETCH_R, &reset_node, NULL);
opline->op2_type = IS_VAR;
opline->op2.var = get_temporary_variable();
GET_NODE(&tmp_node, opline->op2);

opline = zend_emit_op(NULL, ZEND_ADD_ARRAY_ELEMENT,
&tmp_node, NULL);
SET_NODE(opline->result, &value_node);

CG(zend_lineno) = ast->lineno;
zend_emit_jump(opnum_fetch);

opline = &CG(active_op_array)->opcodes[opnum_reset];
opline->op2.opline_num = get_next_op_number();

opline = &CG(active_op_array)->opcodes[opnum_fetch];
opline->extended_value = get_next_op_number();

zend_end_loop(opnum_fetch, &reset_node);

opline = zend_emit_op(NULL, ZEND_FE_FREE, &reset_node, NULL);
zend_emit_assign_znode(var_ast, &value_node);
continue;
}

opline = zend_emit_op(&fetch_result,
elem_ast->attr ? (expr_node->op_type == IS_CV ? ZEND_FETCH_DIM_W : ZEND_FETCH_LIST_W) : ZEND_FETCH_LIST_R, expr_node, &dim_node);

Expand Down