archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ws

Browse source
This commit is contained in:
Jani Taskinen 2009-05-10 22:37:30 +00:00
parent 5ff419882b
commit 1895deb41c
1 changed files with 69 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

135
Zend/zend_operators.h
View file

@ -70,35 +70,35 @@ END_EXTERN_C()
#define MAX_UNSIGNED_INT ((double) LONG_MAX * 2) + 1 #define MAX_UNSIGNED_INT ((double) LONG_MAX * 2) + 1
#ifdef _WIN64 #ifdef _WIN64
# define DVAL_TO_LVAL(d, l) \ # define DVAL_TO_LVAL(d, l) \
if ((d) > LONG_MAX) { \ if ((d) > LONG_MAX) { \
(l) = (long)(unsigned long)(__int64) (d); \ (l) = (long)(unsigned long)(__int64) (d); \
} else { \ } else { \
(l) = (long) (d); \ (l) = (long) (d); \
} }
#elif !defined(_WIN64) && __WORDSIZE == 64 #elif !defined(_WIN64) && __WORDSIZE == 64
# define DVAL_TO_LVAL(d, l) \ # define DVAL_TO_LVAL(d, l) \
if ((d) >= LONG_MAX) { \ if ((d) >= LONG_MAX) { \
(l) = LONG_MAX; \ (l) = LONG_MAX; \
} else if ((d) <= LONG_MIN) { \ } else if ((d) <= LONG_MIN) { \
(l) = LONG_MIN; \ (l) = LONG_MIN; \
} else {\ } else { \
(l) = (long) (d); \ (l) = (long) (d); \
} }
#else #else
# define DVAL_TO_LVAL(d, l) \ # define DVAL_TO_LVAL(d, l) \
if ((d) > LONG_MAX) { \ if ((d) > LONG_MAX) { \
if ((d) > MAX_UNSIGNED_INT) { \ if ((d) > MAX_UNSIGNED_INT) { \
(l) = LONG_MAX; \ (l) = LONG_MAX; \
} else { \ } else { \
(l) = (unsigned long) (d); \ (l) = (unsigned long) (d); \
} \ } \
} else { \ } else { \
if((d) < LONG_MIN) { \ if((d) < LONG_MIN) { \
(l) = LONG_MIN; \ (l) = LONG_MIN; \
} else { \ } else { \
(l) = (long) (d); \ (l) = (long) (d); \
} \ } \
} }
#endif #endif
/* }}} */ /* }}} */
@ -258,7 +258,8 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end)
if (needle_len == 1) { if (needle_len == 1) {
return (char *)memchr(p, *needle, (end-p)); return (char *)memchr(p, *needle, (end-p));
} }
if(needle_len > end-haystack) {
if (needle_len > end-haystack) {
return NULL; return NULL;
} }
@ -319,11 +320,12 @@ ZEND_API void multi_convert_to_double_ex(int argc, ...);
ZEND_API void multi_convert_to_string_ex(int argc, ...); ZEND_API void multi_convert_to_string_ex(int argc, ...);
ZEND_API int add_char_to_string(zval *result, const zval *op1, const zval *op2); ZEND_API int add_char_to_string(zval *result, const zval *op1, const zval *op2);
ZEND_API int add_string_to_string(zval *result, const zval *op1, const zval *op2); ZEND_API int add_string_to_string(zval *result, const zval *op1, const zval *op2);
#define convert_to_string(op) _convert_to_string((op) ZEND_FILE_LINE_CC)
#define convert_to_string_with_converter(op, conv) _convert_to_string_with_converter((op), (conv) TSRMLS_CC ZEND_FILE_LINE_CC) #define convert_to_string(op) _convert_to_string((op) ZEND_FILE_LINE_CC)
#define convert_to_unicode(op) _convert_to_unicode((op) TSRMLS_CC ZEND_FILE_LINE_CC) #define convert_to_string_with_converter(op, conv) _convert_to_string_with_converter((op), (conv) TSRMLS_CC ZEND_FILE_LINE_CC)
#define convert_to_unicode_with_converter(op, conv) _convert_to_unicode_with_converter((op), (conv) TSRMLS_CC ZEND_FILE_LINE_CC) #define convert_to_unicode(op) _convert_to_unicode((op) TSRMLS_CC ZEND_FILE_LINE_CC)
#define convert_to_text(op) convert_to_unicode(op) #define convert_to_unicode_with_converter(op, conv) _convert_to_unicode_with_converter((op), (conv) TSRMLS_CC ZEND_FILE_LINE_CC)
#define convert_to_text(op) convert_to_unicode(op)
ZEND_API double zend_string_to_double(const char *number, zend_uint length); ZEND_API double zend_string_to_double(const char *number, zend_uint length);
@ -371,6 +373,7 @@ ZEND_API long zend_atol(const char *str, int str_len);
ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC); ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC);
END_EXTERN_C() END_EXTERN_C()
#define convert_to_ex_master(ppzv, lower_type, upper_type) \ #define convert_to_ex_master(ppzv, lower_type, upper_type) \
if (Z_TYPE_PP(ppzv)!=IS_##upper_type) { \ if (Z_TYPE_PP(ppzv)!=IS_##upper_type) { \
SEPARATE_ZVAL_IF_NOT_REF(ppzv); \ SEPARATE_ZVAL_IF_NOT_REF(ppzv); \
@ -378,7 +381,7 @@ END_EXTERN_C()
} }
#define convert_to_explicit_type(pzv, type) \ #define convert_to_explicit_type(pzv, type) \
do { \ do { \
switch (type) { \ switch (type) { \
case IS_NULL: \ case IS_NULL: \
convert_to_null(pzv); \ convert_to_null(pzv); \
@ -386,29 +389,29 @@ END_EXTERN_C()
case IS_LONG: \ case IS_LONG: \
convert_to_long(pzv); \ convert_to_long(pzv); \
break; \ break; \
case IS_DOUBLE: \ case IS_DOUBLE: \
convert_to_double(pzv); \ convert_to_double(pzv); \
break; \ break; \
case IS_BOOL: \ case IS_BOOL: \
convert_to_boolean(pzv); \ convert_to_boolean(pzv); \
break; \ break; \
case IS_ARRAY: \ case IS_ARRAY: \
convert_to_array(pzv); \ convert_to_array(pzv); \
break; \ break; \
case IS_OBJECT: \ case IS_OBJECT: \
convert_to_object(pzv); \ convert_to_object(pzv); \
break; \ break; \
case IS_STRING: \ case IS_STRING: \
convert_to_string(pzv); \ convert_to_string(pzv); \
break; \ break; \
case IS_UNICODE: \ case IS_UNICODE: \
convert_to_unicode(pzv); \ convert_to_unicode(pzv); \
break; \ break; \
default: \ default: \
assert(0); \ assert(0); \
break; \ break; \
} \ } \
} while (0); \ } while (0);
#define convert_to_explicit_type_ex(ppzv, str_type) \ #define convert_to_explicit_type_ex(ppzv, str_type) \
if (Z_TYPE_PP(ppzv) != str_type) { \ if (Z_TYPE_PP(ppzv) != str_type) { \
@ -459,7 +462,7 @@ END_EXTERN_C()
#define Z_RESVAL(zval) (zval).value.lval #define Z_RESVAL(zval) (zval).value.lval
#define Z_UNIVAL(zval) (zval).value.uni.val #define Z_UNIVAL(zval) (zval).value.uni.val
#define Z_UNILEN(zval) (zval).value.uni.len #define Z_UNILEN(zval) (zval).value.uni.len
#define Z_UNISIZE(zval) ((Z_TYPE(zval)==IS_UNICODE) ? Z_UNILEN(zval)*sizeof(UChar) : Z_UNILEN(zval)) #define Z_UNISIZE(zval) ((Z_TYPE(zval)==IS_UNICODE) ? Z_UNILEN(zval)*sizeof(UChar) : Z_UNILEN(zval))
#define Z_OBJDEBUG(zval,is_tmp) (Z_OBJ_HANDLER((zval),get_debug_info)?Z_OBJ_HANDLER((zval),get_debug_info)(&(zval),&is_tmp TSRMLS_CC):(is_tmp=0,Z_OBJ_HANDLER((zval),get_properties)?Z_OBJPROP(zval):NULL)) #define Z_OBJDEBUG(zval,is_tmp) (Z_OBJ_HANDLER((zval),get_debug_info)?Z_OBJ_HANDLER((zval),get_debug_info)(&(zval),&is_tmp TSRMLS_CC):(is_tmp=0,Z_OBJ_HANDLER((zval),get_properties)?Z_OBJPROP(zval):NULL))
#define Z_LVAL_P(zval_p) Z_LVAL(*zval_p) #define Z_LVAL_P(zval_p) Z_LVAL(*zval_p)
@ -474,14 +477,14 @@ END_EXTERN_C()
#define Z_OBJPROP_P(zval_p) Z_OBJPROP(*zval_p) #define Z_OBJPROP_P(zval_p) Z_OBJPROP(*zval_p)
#define Z_OBJCE_P(zval_p) Z_OBJCE(*zval_p) #define Z_OBJCE_P(zval_p) Z_OBJCE(*zval_p)
#define Z_RESVAL_P(zval_p) Z_RESVAL(*zval_p) #define Z_RESVAL_P(zval_p) Z_RESVAL(*zval_p)
#define Z_OBJVAL_P(zval_p) Z_OBJVAL(*zval_p) #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_HANDLE_P(zval_p) Z_OBJ_HANDLE(*zval_p)
#define Z_OBJ_HT_P(zval_p) Z_OBJ_HT(*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_UNIVAL_P(zval_p) Z_UNIVAL(*zval_p) #define Z_UNIVAL_P(zval_p) Z_UNIVAL(*zval_p)
#define Z_UNILEN_P(zval_p) Z_UNILEN(*zval_p) #define Z_UNILEN_P(zval_p) Z_UNILEN(*zval_p)
#define Z_UNISIZE_P(zval_p) Z_UNISIZE(*zval_p) #define Z_UNISIZE_P(zval_p) Z_UNISIZE(*zval_p)
#define Z_OBJDEBUG_P(zval_p,is_tmp) Z_OBJDEBUG(*zval_p,is_tmp) #define Z_OBJDEBUG_P(zval_p,is_tmp) Z_OBJDEBUG(*zval_p,is_tmp)
#define Z_LVAL_PP(zval_pp) Z_LVAL(**zval_pp) #define Z_LVAL_PP(zval_pp) Z_LVAL(**zval_pp)
#define Z_BVAL_PP(zval_pp) Z_BVAL(**zval_pp) #define Z_BVAL_PP(zval_pp) Z_BVAL(**zval_pp)
@ -495,14 +498,14 @@ END_EXTERN_C()
#define Z_OBJPROP_PP(zval_pp) Z_OBJPROP(**zval_pp) #define Z_OBJPROP_PP(zval_pp) Z_OBJPROP(**zval_pp)
#define Z_OBJCE_PP(zval_pp) Z_OBJCE(**zval_pp) #define Z_OBJCE_PP(zval_pp) Z_OBJCE(**zval_pp)
#define Z_RESVAL_PP(zval_pp) Z_RESVAL(**zval_pp) #define Z_RESVAL_PP(zval_pp) Z_RESVAL(**zval_pp)
#define Z_OBJVAL_PP(zval_pp) Z_OBJVAL(**zval_pp) #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_HANDLE_PP(zval_p) Z_OBJ_HANDLE(**zval_p)
#define Z_OBJ_HT_PP(zval_p) Z_OBJ_HT(**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_UNIVAL_PP(zval_pp) Z_UNIVAL(**zval_pp) #define Z_UNIVAL_PP(zval_pp) Z_UNIVAL(**zval_pp)
#define Z_UNILEN_PP(zval_pp) Z_UNILEN(**zval_pp) #define Z_UNILEN_PP(zval_pp) Z_UNILEN(**zval_pp)
#define Z_UNISIZE_PP(zval_pp) Z_UNISIZE(**zval_pp) #define Z_UNISIZE_PP(zval_pp) Z_UNISIZE(**zval_pp)
#define Z_OBJDEBUG_PP(zval_pp,is_tmp) Z_OBJDEBUG(**zval_pp,is_tmp) #define Z_OBJDEBUG_PP(zval_pp,is_tmp) Z_OBJDEBUG(**zval_pp,is_tmp)
#define Z_TYPE(zval) (zval).type #define Z_TYPE(zval) (zval).type
#define Z_TYPE_P(zval_p) Z_TYPE(*zval_p) #define Z_TYPE_P(zval_p) Z_TYPE(*zval_p)