diff options
| -rw-r--r-- | Zend/zend_ast.h | 3 | ||||
| -rw-r--r-- | Zend/zend_language_parser.y | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index de67c50c9f..1bf5f3bae5 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -266,10 +266,11 @@ 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) { +static zend_always_inline zend_ast *zend_ast_list_rtrim(zend_ast *ast) { zend_ast_list *list = zend_ast_get_list(ast); if (list->children && list->child[list->children - 1] == NULL) { list->children--; } + return ast; } #endif diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 3d38a4c853..43cf22bfac 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1183,7 +1183,8 @@ property_name: ; array_pair_list: - non_empty_array_pair_list { /* allow single trailing comma */ zend_ast_list_rtrim($$ = $1); } + non_empty_array_pair_list + { /* allow single trailing comma */ $$ = zend_ast_list_rtrim($1); } ; possible_array_pair: |