Skip to content

Commit a2ee6b4

Browse files
marcioAlmadamarcioAlmada
committed
fix compilation warnings, rename batch_use to group_use
1 parent 1b880e2 commit a2ee6b4

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

‎Zend/zend_ast.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ enum _zend_ast_kind {
132132
ZEND_AST_NAMESPACE,
133133
ZEND_AST_USE_ELEM,
134134
ZEND_AST_TRAIT_ALIAS,
135-
ZEND_AST_BATCH_USE,
135+
ZEND_AST_GROUP_USE,
136136

137137
/* 3 child nodes */
138138
ZEND_AST_METHOD_CALL = 3 << ZEND_AST_NUM_CHILDREN_SHIFT,

‎Zend/zend_compile.c‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4686,26 +4686,6 @@ static void zend_check_already_in_use(uint32_t type, zend_string *old_name, zend
46864686
}
46874687
/* }}} */
46884688

4689-
void zend_compile_batch_use(zend_ast *ast) /* {{{ */
4690-
{
4691-
zend_string *ns = zend_ast_get_str(ast->child[0]);
4692-
zend_ast_list *list = zend_ast_get_list(ast->child[1]);
4693-
uint32_t i;
4694-
4695-
for (i = 0; i < list->children; i++) {
4696-
zend_ast *use = list->child[i];
4697-
zval *name_zval = zend_ast_get_zval(use->child[0]);
4698-
zend_string *name = Z_STR_P(name_zval);
4699-
zend_string *compound_ns = zend_concat_names(ns->val, ns->len, name->val, name->len);
4700-
zend_string_release(name);
4701-
ZVAL_STR(name_zval, compound_ns);
4702-
zend_ast_list *inline_use = zend_ast_create_list(1, ZEND_AST_USE, use);
4703-
inline_use->attr = ast->attr ? ast->attr : use->attr;
4704-
zend_compile_use(inline_use);
4705-
}
4706-
}
4707-
/* }}} */
4708-
47094689
void zend_compile_use(zend_ast *ast) /* {{{ */
47104690
{
47114691
zend_ast_list *list = zend_ast_get_list(ast);
@@ -4815,6 +4795,27 @@ void zend_compile_use(zend_ast *ast) /* {{{ */
48154795
}
48164796
/* }}} */
48174797

4798+
void zend_compile_group_use(zend_ast *ast) /* {{{ */
4799+
{
4800+
zend_string *ns = zend_ast_get_str(ast->child[0]);
4801+
zend_ast_list *list = zend_ast_get_list(ast->child[1]);
4802+
uint32_t i;
4803+
4804+
for (i = 0; i < list->children; i++) {
4805+
zend_ast *use = list->child[i];
4806+
zval *name_zval = zend_ast_get_zval(use->child[0]);
4807+
zend_string *name = Z_STR_P(name_zval);
4808+
zend_string *compound_ns = zend_concat_names(ns->val, ns->len, name->val, name->len);
4809+
zend_string_release(name);
4810+
ZVAL_STR(name_zval, compound_ns);
4811+
zend_ast *inline_use = zend_ast_create_list(1, ZEND_AST_USE, use);
4812+
inline_use->attr = ast->attr ? ast->attr : use->attr;
4813+
zend_compile_use(inline_use);
4814+
}
4815+
}
4816+
/* }}} */
4817+
4818+
48184819
void zend_compile_const_decl(zend_ast *ast) /* {{{ */
48194820
{
48204821
zend_ast_list *list = zend_ast_get_list(ast);
@@ -6154,8 +6155,8 @@ void zend_compile_stmt(zend_ast *ast) /* {{{ */
61546155
case ZEND_AST_CLASS:
61556156
zend_compile_class_decl(ast);
61566157
break;
6157-
case ZEND_AST_BATCH_USE:
6158-
zend_compile_batch_use(ast);
6158+
case ZEND_AST_GROUP_USE:
6159+
zend_compile_group_use(ast);
61596160
break;
61606161
case ZEND_AST_USE:
61616162
zend_compile_use(ast);

‎Zend/zend_language_parser.y‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
230230
%type <ast> top_statement namespace_name name statement function_declaration_statement
231231
%type <ast> class_declaration_statement trait_declaration_statement
232232
%type <ast> interface_declaration_statement interface_extends_list
233-
%type <ast> batch_use_declarations inline_use_declarations inline_use_declaration
234-
%type <ast> mixed_batch_use_declarations use_declaration const_decl inner_statement
233+
%type <ast> group_use_declarations inline_use_declarations inline_use_declaration
234+
%type <ast> mixed_group_use_declarations use_declaration const_decl inner_statement
235235
%type <ast> expr optional_expr while_statement for_statement foreach_variable
236236
%type <ast> foreach_statement declare_statement finally_statement unset_variable variable
237237
%type <ast> extends_from parameter optional_type argument expr_without_variable global_var
@@ -300,23 +300,23 @@ top_statement:
300300
| T_NAMESPACE { RESET_DOC_COMMENT(); }
301301
'{' top_statement_list '}'
302302
{ $$ = zend_ast_create(ZEND_AST_NAMESPACE, NULL, $4); }
303-
| T_USE mixed_batch_use_declarations ';' { $$ = $2; }
304-
| T_USE T_FUNCTION batch_use_declarations ';' { $$ = $3; $3->attr = T_FUNCTION; }
305-
| T_USE T_CONST batch_use_declarations ';' { $$ = $3; $3->attr = T_CONST; }
303+
| T_USE mixed_group_use_declarations ';' { $$ = $2; }
304+
| T_USE T_FUNCTION group_use_declarations ';' { $$ = $3; $3->attr = T_FUNCTION; }
305+
| T_USE T_CONST group_use_declarations ';' { $$ = $3; $3->attr = T_CONST; }
306306
| T_USE use_declarations ';' { $$ = $2; $$->attr = T_CLASS; }
307307
| T_USE T_FUNCTION use_declarations ';' { $$ = $3; $$->attr = T_FUNCTION; }
308308
| T_USE T_CONST use_declarations ';' { $$ = $3; $$->attr = T_CONST; }
309309
| T_CONST const_list ';' { $$ = $2; }
310310
;
311311

312-
batch_use_declarations:
312+
group_use_declarations:
313313
namespace_name T_NS_SEPARATOR '{' use_declarations '}'
314-
{$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $4); }
314+
{$$ = zend_ast_create(ZEND_AST_GROUP_USE, $1, $4); }
315315
;
316316

317-
mixed_batch_use_declarations:
317+
mixed_group_use_declarations:
318318
namespace_name T_NS_SEPARATOR '{' inline_use_declarations '}'
319-
{$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $4);}
319+
{$$ = zend_ast_create(ZEND_AST_GROUP_USE, $1, $4);}
320320
;
321321

322322
inline_use_declarations:

0 commit comments

Comments
 (0)