Prepare intenal impl. for abstract reference

Author: pinepain

php_weak_reference.c

@@ -385,7 +385,7 @@ php_weak_reference_t *php_weak_reference_init(zval *this_ptr, zval *referent_zv,
 
     referent = php_weak_referent_get_or_create(referent_zv);
 
-    php_weak_reference_attach(reference, referent);
+    reference->register_reference(reference, referent);
 
     if (NULL != notifier_zv) {
         ZVAL_COPY(&reference->notifier, notifier_zv);
@@ -494,6 +494,9 @@ static zend_object *php_weak_reference_ctor(zend_class_entry *ce)  /* {{{ */
 
     reference->std.handlers = &php_weak_reference_object_handlers;
 
+    reference->register_reference = php_weak_reference_attach;
+    reference->unregister_reference = php_weak_reference_maybe_unregister;
+
     return &reference->std;
 } /* }}} */
 
@@ -514,7 +517,7 @@ static zend_object *php_weak_reference_clone_obj(zval *object) /* {{{ */
     new_reference->notifier_type = old_reference->notifier_type;
 
     if (old_reference->referent) {
-        php_weak_reference_attach(new_reference, old_reference->referent);
+        old_reference->register_reference(new_reference, old_reference->referent);
     }
 
     zend_objects_clone_members(new_object, old_object);

php_weak_reference.h

@@ -27,6 +27,8 @@ extern zend_class_entry *php_weak_reference_class_entry;
 typedef struct _php_weak_referent_t php_weak_referent_t;
 typedef struct _php_weak_reference_t php_weak_reference_t;
 
+typedef void (*php_weak_register)(php_weak_reference_t *reference, php_weak_referent_t *referent);
+typedef void (*php_weak_unregister)(php_weak_reference_t *reference);
 
 extern php_weak_reference_t *php_weak_reference_fetch_object(zend_object *obj);
 extern php_weak_referent_t *php_weak_referent_find_ptr(zend_ulong h);
@@ -48,8 +50,8 @@ struct _php_weak_referent_t {
     zend_object_handlers custom_handlers;
     const zend_object_handlers *original_handlers;
 
-    HashTable weak_references;
     HashTable soft_references;
+    HashTable weak_references;
 };
 
 struct _php_weak_reference_t {
@@ -58,6 +60,9 @@ struct _php_weak_reference_t {
     zval notifier;
     int notifier_type;
 
+    php_weak_register register_reference;
+    php_weak_unregister unregister_reference;
+
     zval this_ptr;
     zend_object std;
 };