@@ -2164,33 +2164,33 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
21642164 case ZEND_AST_EXPR_LIST :
21652165 case ZEND_AST_PARAM_LIST :
21662166simple_list :
2167- zend_ast_export_list (str , ( zend_ast_list * ) ast , 1 , 20 , indent );
2167+ zend_ast_export_list (str , zend_ast_get_list ( ast ) , 1 , 20 , indent );
21682168 break ;
21692169 case ZEND_AST_ARRAY :
21702170 smart_str_appendc (str , '[' );
2171- zend_ast_export_list (str , ( zend_ast_list * ) ast , 1 , 20 , indent );
2171+ zend_ast_export_list (str , zend_ast_get_list ( ast ) , 1 , 20 , indent );
21722172 smart_str_appendc (str , ']' );
21732173 break ;
21742174 case ZEND_AST_ENCAPS_LIST :
21752175 smart_str_appendc (str , '"' );
2176- zend_ast_export_encaps_list (str , '"' , ( zend_ast_list * ) ast , indent );
2176+ zend_ast_export_encaps_list (str , '"' , zend_ast_get_list ( ast ) , indent );
21772177 smart_str_appendc (str , '"' );
21782178 break ;
21792179 case ZEND_AST_STMT_LIST :
21802180 case ZEND_AST_TRAIT_ADAPTATIONS :
21812181 zend_ast_export_stmt (str , ast , indent );
21822182 break ;
21832183 case ZEND_AST_IF :
2184- zend_ast_export_if_stmt (str , ( zend_ast_list * ) ast , indent );
2184+ zend_ast_export_if_stmt (str , zend_ast_get_list ( ast ) , indent );
21852185 break ;
21862186 case ZEND_AST_SWITCH_LIST :
21872187 case ZEND_AST_CATCH_LIST :
21882188 case ZEND_AST_MATCH_ARM_LIST :
2189- zend_ast_export_list (str , ( zend_ast_list * ) ast , 0 , 0 , indent );
2189+ zend_ast_export_list (str , zend_ast_get_list ( ast ) , 0 , 0 , indent );
21902190 break ;
21912191 case ZEND_AST_CLOSURE_USES :
21922192 smart_str_appends (str , " use(" );
2193- zend_ast_export_var_list (str , ( zend_ast_list * ) ast , indent );
2193+ zend_ast_export_var_list (str , zend_ast_get_list ( ast ) , indent );
21942194 smart_str_appendc (str , ')' );
21952195 break ;
21962196 case ZEND_AST_PROP_GROUP : {
@@ -2255,7 +2255,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
22552255
22562256 goto simple_list ;
22572257 case ZEND_AST_NAME_LIST :
2258- zend_ast_export_name_list (str , ( zend_ast_list * ) ast , indent );
2258+ zend_ast_export_name_list (str , zend_ast_get_list ( ast ) , indent );
22592259 break ;
22602260 case ZEND_AST_USE :
22612261 smart_str_appends (str , "use " );
@@ -2329,7 +2329,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
23292329 case ZEND_AST_SHELL_EXEC :
23302330 smart_str_appendc (str , '`' );
23312331 if (ast -> child [0 ]-> kind == ZEND_AST_ENCAPS_LIST ) {
2332- zend_ast_export_encaps_list (str , '`' , ( zend_ast_list * ) ast -> child [0 ], indent );
2332+ zend_ast_export_encaps_list (str , '`' , zend_ast_get_list ( ast -> child [0 ]) , indent );
23332333 } else {
23342334 zval * zv ;
23352335 ZEND_ASSERT (ast -> child [0 ]-> kind == ZEND_AST_ZVAL );
@@ -2626,7 +2626,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
26262626 case ZEND_AST_MATCH_ARM :
26272627 zend_ast_export_indent (str , indent );
26282628 if (ast -> child [0 ]) {
2629- zend_ast_export_list (str , ( zend_ast_list * ) ast -> child [0 ], 1 , 0 , indent );
2629+ zend_ast_export_list (str , zend_ast_get_list ( ast -> child [0 ]) , 1 , 0 , indent );
26302630 smart_str_appends (str , " => " );
26312631 } else {
26322632 smart_str_appends (str , "default => " );
@@ -2637,7 +2637,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
26372637 case ZEND_AST_DECLARE :
26382638 smart_str_appends (str , "declare(" );
26392639 ZEND_ASSERT (ast -> child [0 ]-> kind == ZEND_AST_CONST_DECL );
2640- zend_ast_export_list (str , ( zend_ast_list * ) ast -> child [0 ], 1 , 0 , indent );
2640+ zend_ast_export_list (str , zend_ast_get_list ( ast -> child [0 ]) , 1 , 0 , indent );
26412641 smart_str_appendc (str , ')' );
26422642 if (ast -> child [1 ]) {
26432643 smart_str_appends (str , " {\n" );
0 commit comments