Skip to content

Commit 1487315

Browse files
committed
fix(zend): drop const-discarding qualifiers and unused grammar nonterminal
Signed-off-by: azjezz <azjezz@protonmail.com>
1 parent 8d4cbe4 commit 1487315

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

Zend/zend_compile.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ static void zend_generic_scope_pop(void) /* {{{ */
466466
/* }}} */
467467

468468
static zend_generic_parameter *zend_generic_lookup_full(
469-
const zend_string *name, uint8_t *origin_out, uint32_t *index_out) /* {{{ */
469+
zend_string *name, uint8_t *origin_out, uint32_t *index_out) /* {{{ */
470470
{
471471
zend_string *lc_name = zend_string_tolower(name);
472472
for (zend_generic_scope_entry *e = CG(generic_scope); e; e = e->outer) {
@@ -511,7 +511,7 @@ static int zend_generic_lookup_forward(const zend_string *name) /* {{{ */
511511
static bool zend_type_ast_has_generic_content(zend_ast *ast);
512512
static zend_type zend_compile_pre_erasure_typename(zend_ast *ast);
513513

514-
static zend_generic_parameter *zend_generic_lookup(const zend_string *name) /* {{{ */
514+
static zend_generic_parameter *zend_generic_lookup(zend_string *name) /* {{{ */
515515
{
516516
return zend_generic_lookup_full(name, NULL, NULL);
517517
}
@@ -760,15 +760,15 @@ static zend_generic_type_table *zend_generic_get_or_create_class_table(zend_clas
760760
return ce->generic_types;
761761
}
762762

763-
static zend_generic_parameter *zend_generic_lookup_name(const zend_ast *ast) /* {{{ */
763+
static zend_generic_parameter *zend_generic_lookup_name(zend_ast *ast) /* {{{ */
764764
{
765765
if (!CG(generic_scope) || ast->kind != ZEND_AST_ZVAL) {
766766
return NULL;
767767
}
768768
if ((ast->attr & ZEND_NAME_NOT_FQ) != ZEND_NAME_NOT_FQ) {
769769
return NULL;
770770
}
771-
const zval *zv = zend_ast_get_zval(ast);
771+
zval *zv = zend_ast_get_zval(ast);
772772
if (Z_TYPE_P(zv) != IS_STRING) {
773773
return NULL;
774774
}

Zend/zend_language_parser.y

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
294294
%type <ast> generic_type_parameter_list_inner generic_type_parameter
295295
%type <ast> optional_generic_type_parameter_bound optional_generic_type_parameter_default
296296
%type <ast> optional_generic_type_argument_list generic_type_argument_list
297-
%type <ast> generic_type_argument_list_inner generic_type_argument
297+
%type <ast> generic_type_argument_list_inner
298298
%type <ast> optional_call_type_argument_list call_type_argument_list call_type_argument_list_inner
299299
%type <ast> bound_class_name bound_class_name_reference
300300

@@ -900,10 +900,6 @@ generic_type_argument_list_inner:
900900
{ $$ = zend_ast_list_add($1, $3); }
901901
;
902902

903-
generic_type_argument:
904-
type_expr { $$ = $1; }
905-
;
906-
907903
optional_call_type_argument_list:
908904
%empty { $$ = NULL; }
909905
| call_type_argument_list { $$ = $1; }

0 commit comments

Comments
 (0)