- More object macros

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 0d5a9354983df128332af0103cdb0571fc382e03..81047441167e7f5c3698203f42c8fba73711f8a5 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -65,13 +65,13 @@ static zend_class_entry *dir_class_entry_ptr;
        if (ZEND_NUM_ARGS() == 0) { \
                myself = getThis(); \
                if (myself) { \
-                       if (zend_hash_find(myself->value.obj.properties, "handle", sizeof("handle"), (void **)&tmp) == FAILURE) { \
+                       if (zend_hash_find(Z_OBJPROP_P(myself), "handle", sizeof("handle"), (void **)&tmp) == FAILURE) { \
                                php_error(E_WARNING, "unable to find my handle property"); \
                                RETURN_FALSE; \
                        } \
-                       ZEND_FETCH_RESOURCE(dirp,php_dir *,tmp,-1, "Directory", le_dirp); \
+                       ZEND_FETCH_RESOURCE(dirp, php_dir *, tmp, -1, "Directory", le_dirp); \
                } else { \
-                       ZEND_FETCH_RESOURCE(dirp,php_dir *,0,DIRG(default_dir), "Directory", le_dirp); \
+                       ZEND_FETCH_RESOURCE(dirp, php_dir *, 0, DIRG(default_dir), "Directory", le_dirp); \
                } \
        } else if ((ZEND_NUM_ARGS() != 1) || zend_get_parameters_ex(1, &id) == FAILURE) { \
                WRONG_PARAM_COUNT; \

diff --git a/ext/standard/php_incomplete_class.h b/ext/standard/php_incomplete_class.h
index 29f9642e4f76186852812f32ebaa79633fe36a13..7d294f519d8f67b37f574b171544dc1c0ee4eadd 100644 (file)
--- a/ext/standard/php_incomplete_class.h
+++ b/ext/standard/php_incomplete_class.h
@@ -30,13 +30,14 @@
        (PHP_IC_ENTRY ? PHP_IC_ENTRY : php_create_incomplete_class(TSRMLS_C))
 
 
-#define PHP_SET_CLASS_ATTRIBUTES(struc)                                \
-       if ((struc)->value.obj.ce == BG(incomplete_class)) {                            \
+#define PHP_SET_CLASS_ATTRIBUTES(struc)                                                                \
+       /* OBJECTS_FIXME: Fix for new object model */                                           \
+       if (Z_OBJCE_P(struc) == BG(incomplete_class)) {                                         \
                class_name = php_lookup_class_name(struc, &name_len, 1);                \
                free_class_name = 1;                                                                                    \
        } else {                                                                                                                        \
-               class_name = (struc)->value.obj.ce->name;                                               \
-               name_len   = (struc)->value.obj.ce->name_length;                                \
+               class_name = Z_OBJCE_P(struc)->name;                                                    \
+               name_len   = Z_OBJCE_P(struc)->name_length;                                             \
        }
 
 #define PHP_CLEANUP_CLASS_ATTRIBUTES()                                                                 \

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 90db80e8a6c4af0a473713943968ffa7ace0d094..e151ae7182474172e2587dcd59194b051917ec36 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -87,8 +87,8 @@ void php_var_dump(zval **struc, int level)
                        php_printf("%sarray(%d) {\n", COMMON, zend_hash_num_elements(myht));
                        goto head_done;
                case IS_OBJECT:
-                       myht = HASH_OF(*struc);
-                       php_printf("%sobject(%s)(%d) {\n", COMMON, (*struc)->value.obj.ce->name, zend_hash_num_elements(myht));
+                       myht = Z_OBJPROP_PP(struc);
+                       php_printf("%sobject(%s)(%d) {\n", COMMON, Z_OBJCE_PP(struc)->name, zend_hash_num_elements(myht));
 head_done:
                        zend_hash_apply_with_arguments(myht, (apply_func_args_t) php_array_element_dump, 1, level);
                        if (level>1) {
@@ -229,7 +229,6 @@ PHPAPI void php_var_serialize(zval *buf, zval **struc, HashTable *var_hash)
                                *p = 0;
                        }
                        return;
-
                case IS_OBJECT: {
                                zval *retval_ptr = NULL;
                                zval *fname;
@@ -269,7 +268,7 @@ PHPAPI void php_var_serialize(zval *buf, zval **struc, HashTable *var_hash)
                                                                        continue;
                                                                }
 
-                                                               if (zend_hash_find((*struc)->value.obj.properties,Z_STRVAL_PP(name),Z_STRLEN_PP(name)+1,(void*)&d) == SUCCESS) {
+                                                               if (zend_hash_find(Z_OBJPROP_PP(struc), Z_STRVAL_PP(name), Z_STRLEN_PP(name)+1, (void*)&d) == SUCCESS) {
                                                                        php_var_serialize(buf, name, NULL);
                                                                        php_var_serialize(buf,d,var_hash);      
                                                                }
@@ -295,7 +294,6 @@ PHPAPI void php_var_serialize(zval *buf, zval **struc, HashTable *var_hash)
                                }
                                return; 
                        }
-
                case IS_ARRAY:
                  std_array:
                        myht = HASH_OF(*struc);
@@ -344,7 +342,6 @@ PHPAPI void php_var_serialize(zval *buf, zval **struc, HashTable *var_hash)
                        }
                        STR_CAT(buf, "}", 1);
                        return;
-
                default:
                        STR_CAT(buf, "i:0;", 4);
                        return;
@@ -521,8 +518,9 @@ PHPAPI int php_var_unserialize(zval **rval, const char **p, const char *max, Has
                                        ce = &zend_standard_class_def;
                                }
 
-                               object_init_ex(*rval,ce);
-                               myht = (*rval)->value.obj.properties;
+                               /* OBJECTS_FIXME */
+                               object_init_ex(*rval, ce);
+                               myht = Z_OBJPROP_PP(rval);
 
                                if (incomplete_class)
                                        php_store_class_name(*rval, class_name, name_len);