diff options
| author | Stanislav Malyshev <stas@php.net> | 2002-02-07 14:08:43 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2002-02-07 14:08:43 +0000 |
| commit | 6608f07322789bd0896b265c29e13c0c9f5d5898 (patch) | |
| tree | 3149fb62b09cbea8d328df4d930e4cddb99aef03 /Zend/zend_operators.h | |
| parent | 5e9b1634c68dc70bbc6480fddb303d8807a943d2 (diff) | |
| download | php-git-6608f07322789bd0896b265c29e13c0c9f5d5898.tar.gz | |
Mega-commit: Enter the new object model
Note: only standard Zend objects are working now. This is definitely going to
break custom objects like COM, Java, etc. - this will be fixed later.
Also, this may break other things that access objects' internals directly.
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 2957c0d26e..b7e5b878bd 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -232,7 +232,9 @@ ZEND_API int zend_atoi(const char *str, int str_len); #define Z_STRVAL(zval) (zval).value.str.val #define Z_STRLEN(zval) (zval).value.str.len #define Z_ARRVAL(zval) (zval).value.ht -#define Z_OBJ(zval) (zval).value.obj.handlers->get_address((zval).value.obj.handle) +#define Z_OBJ_HANDLE(zval) (zval).value.obj.handle +#define Z_OBJ_HT(zval) (zval).value.obj.handlers +#define Z_OBJ(zval) zend_objects_get_address(&(zval)) #define Z_OBJPROP(zval) Z_OBJ(zval)->properties #define Z_OBJCE(zval) Z_OBJ(zval)->ce #define Z_RESVAL(zval) (zval).value.lval @@ -247,6 +249,8 @@ ZEND_API int zend_atoi(const char *str, int str_len); #define Z_OBJPROP_P(zval_p) Z_OBJPROP(*zval_p) #define Z_OBJCE_P(zval_p) Z_OBJCE(*zval_p) #define Z_RESVAL_P(zval_p) Z_RESVAL(*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_LVAL_PP(zval_pp) Z_LVAL(**zval_pp) #define Z_BVAL_PP(zval_pp) Z_BVAL(**zval_pp) @@ -258,6 +262,8 @@ ZEND_API int zend_atoi(const char *str, int str_len); #define Z_OBJPROP_PP(zval_pp) Z_OBJPROP(**zval_pp) #define Z_OBJCE_PP(zval_pp) Z_OBJCE(**zval_pp) #define Z_RESVAL_PP(zval_pp) Z_RESVAL(**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_TYPE(zval) (zval).type #define Z_TYPE_P(zval_p) Z_TYPE(*zval_p) |