Cleanup

diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
index 886b10622873cbc84f556438ae0eb000a220296d..d5396e704134336f737a31d3526c7a1713f60fc6 100644 (file)
--- a/Zend/zend_ast.h
+++ b/Zend/zend_ast.h
@@ -266,5 +266,10 @@ static zend_always_inline zend_ast *zend_ast_create_assign_op(uint32_t opcode, z
 static zend_always_inline zend_ast *zend_ast_create_cast(uint32_t type, zend_ast *op0) {
        return zend_ast_create_ex(ZEND_AST_CAST, type, op0);
 }
-
+static zend_always_inline void zend_ast_list_rtrim(zend_ast *ast) {
+       zend_ast_list *list = zend_ast_get_list(ast);
+       if (list->child[list->children - 1] == NULL) {
+               list->children--;
+       }
+}
 #endif

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index c37bd7f20ced3a1b3a930aafeb63e52c1f11fbd1..3d38a4c853c350c447e9b7a4dd78813079a504a9 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -1183,7 +1183,7 @@ property_name:
 ;
 
 array_pair_list:
-       non_empty_array_pair_list { /* allow single trailing comma */ zend_ast_list *list = zend_ast_get_list($$ = $1); if (list->child[list->children - 1] == NULL) { list->children--; } }
+               non_empty_array_pair_list { /* allow single trailing comma */ zend_ast_list_rtrim($$ = $1); }
 ;
 
 possible_array_pair: