- MFH as discussed

  . zend_exception_get_default() -> zend_exception_get_default(TSRMLS_D)
  . zend_get_error_exception()   -> zend_get_error_exception(TSRMLS_D)
  . added E_RECOVERABLE_ERROR
  . added ZEND_TOSTRING_FUNC_NAME
  . added __tostring function cache to zend_class_entry
  . added ZEND_NAMED_ME
  . modified ZEND_ME_MAPPING to support method flags
  . added ZEND_MN
  . method entries now use prefix "zim_" instead of "zif_"
  . drop EG(ze1_compatibility_mode)
  . changed cast handler, now without (int should_free):
    typedef int (*zend_object_cast_t)(zval *readobj, zval *retval, int type TSRMLS_DC);
  . changed get_iterator, now receives whether value is by ref:
    zend_object_iterator *(*get_iterator)(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
  . added zend_objects_store_add_ref_by_handle
  . added zend_objects_store_del_ref_by_handle
  . convert_to_explicit_type(pzv, type)

1 files changed, 45 insertions, 9 deletions

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 94b00ec25b..cf21c87c71 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -24,6 +24,7 @@
 
 #include <errno.h>
 #include <math.h>
+#include <assert.h>
 
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
@@ -75,7 +76,7 @@ static inline zend_bool is_numeric_string(char *str, int length, long *lval, dou
 	if (!length) {
 		return 0;
 	}
-	
+
 	/* handle hex numbers */
 	if (length>=2 && str[0]=='0' && (str[1]=='x' || str[1]=='X')) {
 		conv_base=16;
@@ -148,14 +149,14 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end)
 				return p;
 			}
 		}
-		
+
 		if (p == NULL) {
 			return NULL;
 		}
-		
+
 		p++;
 	}
-	
+
 	return NULL;
 }
 
@@ -225,6 +226,41 @@ END_EXTERN_C()
 		convert_to_##lower_type(*ppzv);						\
 	}
 
+#define convert_to_explicit_type(pzv, type)		\
+    do {										\
+		switch (type) {							\
+			case IS_NULL:						\
+				convert_to_null(pzv);			\
+				break;							\
+			case IS_LONG:						\
+				convert_to_long(pzv);			\
+				break;							\
+			case IS_DOUBLE: 					\
+				convert_to_double(pzv); 		\
+				break; 							\
+			case IS_BOOL: 						\
+				convert_to_boolean(pzv); 		\
+				break; 							\
+			case IS_ARRAY: 						\
+				convert_to_array(pzv); 			\
+				break; 							\
+			case IS_OBJECT: 					\
+				convert_to_object(pzv); 		\
+				break; 							\
+			case IS_STRING: 					\
+				convert_to_string(pzv); 		\
+				break; 							\
+			default: 							\
+				assert(0); 						\
+				break; 							\
+		}										\
+	} while (0);								\
+
+#define convert_to_explicit_type_ex(ppzv, str_type)	\
+	if (Z_TYPE_PP(ppzv) != str_type) {				\
+		SEPARATE_ZVAL_IF_NOT_REF(ppzv);				\
+		convert_to_explicit_type(*ppzv, str_type);	\
+	}
 
 #define convert_to_boolean_ex(ppzv)	convert_to_ex_master(ppzv, boolean, BOOL)
 #define convert_to_long_ex(ppzv)	convert_to_ex_master(ppzv, long, LONG)
@@ -235,7 +271,7 @@ END_EXTERN_C()
 #define convert_to_null_ex(ppzv)	convert_to_ex_master(ppzv, null, NULL)
 
 #define convert_scalar_to_number_ex(ppzv)							\
-	if ((*ppzv)->type!=IS_LONG && (*ppzv)->type!=IS_DOUBLE) {		\
+	if (Z_TYPE_PP(ppzv)!=IS_LONG && Z_TYPE_PP(ppzv)!=IS_DOUBLE) {		\
 		if (!(*ppzv)->is_ref) {										\
 			SEPARATE_ZVAL(ppzv);									\
 		}															\
@@ -250,8 +286,8 @@ END_EXTERN_C()
 #define Z_STRLEN(zval)			(zval).value.str.len
 #define Z_ARRVAL(zval)			(zval).value.ht
 #define Z_OBJVAL(zval)			(zval).value.obj
-#define Z_OBJ_HANDLE(zval)		(zval).value.obj.handle
-#define Z_OBJ_HT(zval)			(zval).value.obj.handlers
+#define Z_OBJ_HANDLE(zval)		Z_OBJVAL(zval).handle
+#define Z_OBJ_HT(zval)			Z_OBJVAL(zval).handlers
 #define Z_OBJCE(zval)			zend_get_class_entry(&(zval) TSRMLS_CC)
 #define Z_OBJPROP(zval)			Z_OBJ_HT((zval))->get_properties(&(zval) TSRMLS_CC)
 #define Z_OBJ_HANDLER(zval, hf) Z_OBJ_HT((zval))->hf
@@ -269,7 +305,7 @@ END_EXTERN_C()
 #define Z_OBJVAL_P(zval_p)      Z_OBJVAL(*zval_p)
 #define Z_OBJ_HANDLE_P(zval_p)  Z_OBJ_HANDLE(*zval_p)
 #define Z_OBJ_HT_P(zval_p)      Z_OBJ_HT(*zval_p)
-#define Z_OBJ_HANDLER_P(zval_p, h) Z_OBJ_HANDLER(*zval_p, h) 
+#define Z_OBJ_HANDLER_P(zval_p, h) Z_OBJ_HANDLER(*zval_p, h)
 
 #define Z_LVAL_PP(zval_pp)		Z_LVAL(**zval_pp)
 #define Z_BVAL_PP(zval_pp)		Z_BVAL(**zval_pp)
@@ -283,7 +319,7 @@ END_EXTERN_C()
 #define Z_OBJVAL_PP(zval_pp)    Z_OBJVAL(**zval_pp)
 #define Z_OBJ_HANDLE_PP(zval_p) Z_OBJ_HANDLE(**zval_p)
 #define Z_OBJ_HT_PP(zval_p)     Z_OBJ_HT(**zval_p)
-#define Z_OBJ_HANDLER_PP(zval_p, h) Z_OBJ_HANDLER(**zval_p, h) 
+#define Z_OBJ_HANDLER_PP(zval_p, h) Z_OBJ_HANDLER(**zval_p, h)
 
 #define Z_TYPE(zval)		(zval).type
 #define Z_TYPE_P(zval_p)	Z_TYPE(*zval_p)