Rename macros from HAS to IS

Author: Girgias

Zend/zend_compile.c

@@ -1199,7 +1199,7 @@ zend_string *zend_type_to_string_resolved(zend_type type, zend_class_entry *scop
 
 	if (ZEND_TYPE_HAS_LIST(type)) {
 		zend_type *list_type;
-		bool is_intersection = ZEND_TYPE_HAS_INTERSECTION(type);
+		bool is_intersection = ZEND_TYPE_IS_INTERSECTION(type);
 		ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(type), list_type) {
 			if (ZEND_TYPE_HAS_CE(*list_type)) {
 				str = add_type_string(str, ZEND_TYPE_CE(*list_type)->name, is_intersection);

Zend/zend_execute.c

@@ -853,7 +853,7 @@ static bool zend_check_and_resolve_property_class_type(
 	if (ZEND_TYPE_HAS_LIST(info->type)) {
 		zend_type *list_type;
 
-		if (ZEND_TYPE_HAS_INTERSECTION(info->type)) {
+		if (ZEND_TYPE_IS_INTERSECTION(info->type)) {
 			ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(info->type), list_type) {
 				if (ZEND_TYPE_HAS_NAME(*list_type)) {
 					zend_string *name = ZEND_TYPE_NAME(*list_type);
@@ -1027,7 +1027,7 @@ static zend_always_inline bool zend_check_type_slow(
 		zend_class_entry *ce;
 		if (UNEXPECTED(ZEND_TYPE_HAS_LIST(*type))) {
 			zend_type *list_type;
-			if (ZEND_TYPE_HAS_INTERSECTION(*type)) {
+			if (ZEND_TYPE_IS_INTERSECTION(*type)) {
 				ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(*type), list_type) {
 					if (HAVE_CACHE_SLOT && *cache_slot) {
 						ce = *cache_slot;

Zend/zend_inheritance.c

@@ -546,7 +546,7 @@ static inheritance_status zend_perform_covariant_type_check(
 
 	/* For intersection types loop over the parent types first as a child
 	 * can add them */
-	if (ZEND_TYPE_HAS_INTERSECTION(proto_type) || ZEND_TYPE_HAS_INTERSECTION(fe_type)) {
+	if (ZEND_TYPE_IS_INTERSECTION(proto_type) || ZEND_TYPE_IS_INTERSECTION(fe_type)) {
 		/* First try to check whether we can succeed without resolving anything */
 		ZEND_TYPE_FOREACH(proto_type, single_type) {
 			inheritance_status status;
@@ -577,7 +577,7 @@ static inheritance_status zend_perform_covariant_type_check(
 			}
 		} ZEND_TYPE_FOREACH_END();
 	}
-	/* if (ZEND_TYPE_HAS_UNION(fe_type) || ZEND_TYPE_HAS_UNION(proto_type)) */
+	/* if (ZEND_TYPE_IS_UNION(fe_type) || ZEND_TYPE_IS_UNION(proto_type)) */
 	else {
 		/* First try to check whether we can succeed without resolving anything */
 		ZEND_TYPE_FOREACH(fe_type, single_type) {
@@ -612,7 +612,7 @@ static inheritance_status zend_perform_covariant_type_check(
 	}
 
 	/* Register all classes that may have to be resolved */
-	if (ZEND_TYPE_HAS_INTERSECTION(proto_type)) {
+	if (ZEND_TYPE_IS_INTERSECTION(proto_type)) {
 		// TODO Register intersection type classes
 	} else {
 		ZEND_TYPE_FOREACH(fe_type, single_type) {

Zend/zend_types.h

@@ -148,10 +148,9 @@ typedef struct {
 /* TODO: bit 21 is not used */
 /* Whether the type list is arena allocated */
 #define _ZEND_TYPE_ARENA_BIT (1u << 20)
-/* Whether the type list has an intersection type,
- * or the single type is part of an intersection type */
+/* Whether the type list is an intersection type */
 #define _ZEND_TYPE_INTERSECTION_BIT (1u << 19)
-/* Whether the type list has a union type */
+/* Whether the type is a union type */
 #define _ZEND_TYPE_UNION_BIT (1u << 18)
 /* Type mask excluding the flags above. */
 #define _ZEND_TYPE_MAY_BE_MASK ((1u << 18) - 1)
@@ -175,10 +174,10 @@ typedef struct {
 #define ZEND_TYPE_HAS_LIST(t) \
 	((((t).type_mask) & _ZEND_TYPE_LIST_BIT) != 0)
 
-#define ZEND_TYPE_HAS_INTERSECTION(t) \
+#define ZEND_TYPE_IS_INTERSECTION(t) \
 	((((t).type_mask) & _ZEND_TYPE_INTERSECTION_BIT) != 0)
 
-#define ZEND_TYPE_HAS_UNION(t) \
+#define ZEND_TYPE_IS_UNION(t) \
 	((((t).type_mask) & _ZEND_TYPE_UNION_BIT) != 0)
 
 #define ZEND_TYPE_USES_ARENA(t) \

ext/opcache/jit/zend_jit_helpers.c

@@ -1346,7 +1346,7 @@ static zend_always_inline bool zend_jit_verify_type_common(zval *arg, zend_arg_i
 		zend_class_entry *ce;
 		if (ZEND_TYPE_HAS_LIST(arg_info->type)) {
 			zend_type *list_type;
-			if (ZEND_TYPE_HAS_INTERSECTION(arg_info->type)) {
+			if (ZEND_TYPE_IS_INTERSECTION(arg_info->type)) {
 				ZEND_TYPE_LIST_FOREACH(ZEND_TYPE_LIST(arg_info->type), list_type) {
 					if (*cache_slot) {
 						ce = *cache_slot;

ext/reflection/php_reflection.c

@@ -1339,10 +1339,10 @@ static reflection_type_kind get_type_kind(zend_type type) {
 	uint32_t type_mask_without_null = ZEND_TYPE_PURE_MASK_WITHOUT_NULL(type);
 
 	if (ZEND_TYPE_HAS_LIST(type)) {
-		if (ZEND_TYPE_HAS_INTERSECTION(type)) {
+		if (ZEND_TYPE_IS_INTERSECTION(type)) {
 			return INTERSECTION_TYPE;
 		}
-		ZEND_ASSERT(ZEND_TYPE_HAS_UNION(type));
+		ZEND_ASSERT(ZEND_TYPE_IS_UNION(type));
 		return UNION_TYPE;
 	}