Make const naming more precise

tontonsb · tontonsb · commit 35a54911f655 · 2025-02-14T23:00:23.000+02:00
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -8988,7 +8988,7 @@ static void zend_compile_implements(zend_ast *ast) /* {{{ */
 		interface_names[i].name =
 			zend_resolve_const_class_name_reference(class_ast, "interface name");
 		interface_names[i].lc_name = zend_string_tolower(interface_names[i].name);
-		interface_names[i].is_optional = class_ast->attr & ZEND_CLASS_NAME_OPTIONAL;
+		interface_names[i].is_optional = class_ast->attr & ZEND_NAME_OPTIONAL;
 	}
 
 	ce->num_interfaces = list->children;
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -1035,7 +1035,7 @@ ZEND_API zend_string *zend_type_to_string(zend_type type);
 #define ZEND_NAME_NOT_FQ   1
 #define ZEND_NAME_RELATIVE 2
 
-#define ZEND_CLASS_NAME_OPTIONAL 4
+#define ZEND_NAME_OPTIONAL 4
 
 /* ZEND_FETCH_ flags in class name AST of new const expression must not clash with ZEND_NAME_ flags */
 #define ZEND_CONST_EXPR_NEW_FETCH_TYPE_SHIFT 2
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -1419,7 +1419,7 @@ class_name:
 
 interface_name:
 		class_name		{ $$ = $1; }
-	|	'?' name 		{ $$ = $2; $$->attr |= ZEND_CLASS_NAME_OPTIONAL; }
+	|	'?' name 		{ $$ = $2; $$->attr |= ZEND_NAME_OPTIONAL; }
 ;
 
 class_name_reference:

Original file line number	Diff line number	Diff line change
`@@ -8988,7 +8988,7 @@ static void zend_compile_implements(zend_ast ast) / {{{ */`
`8988`	`8988`	`interface_names[i].name =`
`8989`	`8989`	`zend_resolve_const_class_name_reference(class_ast, "interface name");`
`8990`	`8990`	`interface_names[i].lc_name = zend_string_tolower(interface_names[i].name);`
`8991`		`- interface_names[i].is_optional = class_ast->attr & ZEND_CLASS_NAME_OPTIONAL;`
	`8991`	`+ interface_names[i].is_optional = class_ast->attr & ZEND_NAME_OPTIONAL;`
`8992`	`8992`	`}`
`8993`	`8993`
`8994`	`8994`	`ce->num_interfaces = list->children;`
Original file line number	Diff line number	Diff line change
`@@ -1419,7 +1419,7 @@ class_name:`
`1419`	`1419`
`1420`	`1420`	`interface_name:`
`1421`	`1421`	`class_name { $$ = $1; }`
`1422`		`- \| '?' name { $$ = $2; $$->attr \|= ZEND_CLASS_NAME_OPTIONAL; }`
	`1422`	`+ \| '?' name { $$ = $2; $$->attr \|= ZEND_NAME_OPTIONAL; }`
`1423`	`1423`	`;`
`1424`	`1424`
`1425`	`1425`	`class_name_reference:`