@@ -2754,12 +2754,12 @@ zend_op *zend_compile_static_prop(znode *result, zend_ast *ast, uint32_t type, i
2754
2754
}
2755
2755
/* }}} */
2756
2756
2757
- static void zend_verify_list_assign_target (zend_ast * var_ast , zend_bool old_style ) /* {{{ */ {
2757
+ static void zend_verify_list_assign_target (zend_ast * var_ast , zend_ast_attr array_style ) /* {{{ */ {
2758
2758
if (var_ast -> kind == ZEND_AST_ARRAY ) {
2759
2759
if (var_ast -> attr == ZEND_ARRAY_SYNTAX_LONG ) {
2760
2760
zend_error_noreturn (E_COMPILE_ERROR , "Cannot assign to array(), use [] instead" );
2761
2761
}
2762
- if (old_style != var_ast -> attr ) {
2762
+ if (array_style != var_ast -> attr ) {
2763
2763
zend_error_noreturn (E_COMPILE_ERROR , "Cannot mix [] and list()" );
2764
2764
}
2765
2765
} else if (!zend_can_write_to_variable (var_ast )) {
@@ -2793,7 +2793,7 @@ static zend_bool zend_propagate_list_refs(zend_ast *ast) { /* {{{ */
2793
2793
/* }}} */
2794
2794
2795
2795
static void zend_compile_list_assign (
2796
- znode * result , zend_ast * ast , znode * expr_node , zend_bool old_style ) /* {{{ */
2796
+ znode * result , zend_ast * ast , znode * expr_node , zend_ast_attr array_style ) /* {{{ */
2797
2797
{
2798
2798
zend_ast_list * list = zend_ast_get_list (ast );
2799
2799
uint32_t i ;
@@ -2850,7 +2850,7 @@ static void zend_compile_list_assign(
2850
2850
Z_TRY_ADDREF (expr_node -> u .constant );
2851
2851
}
2852
2852
2853
- zend_verify_list_assign_target (var_ast , old_style );
2853
+ zend_verify_list_assign_target (var_ast , array_style );
2854
2854
2855
2855
opline = zend_emit_op (& fetch_result ,
2856
2856
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 );
0 commit comments