com php-src: Improve the signature: Zend/zend_ast.h Zend/ zend_language_parser.y

Commit: 493524454d66adde84e00d249d607ecd540de99f Author: Xinchen Hui <laruence@gmail.com> Tue, 14 Jun 2016 08:05:17 -0700 Parents: 8c41df548078425bce27cd833516e3a7392fe1c3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=493524454d66adde84e00d249d607ecd540de99f Log: Improve the signature Changed paths: M Zend/zend_ast.h M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index de67c50..1bf5f3b 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 3d38a4c...43cf22b 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: