Changeset 543

Timestamp:

06/06/08 10:54:03 (7 months ago)

Author:

weyrick

Message:

implement unsetting of object properties. because of the way we implement properties,
this required overhead for each property lookup, which needs to be refactored out
when this gets optimized.

Location:

trunk/pcc

Files:

• compiler/evaluate.scm (modified) (1 diff)
• compiler/generate.scm (modified) (2 diffs)
• runtime/php-object.scm (modified) (8 diffs)

trunk/pcc/compiler/evaluate.scm

@@ -873 +873 @@
                 ; always return null
                 NULL)
-             ; normal unset
-             (%unset-eval-assign lval)))))
+             ; unset (remove) property
+             (php-object-property-unset obj-e prop-e)))))
 
 (define-method (unset lval::hash-lookup)

trunk/pcc/compiler/generate.scm

@@ -1788 +1788 @@
                        (php-object-class obj-evald)
                        "__unset")
-                      ; we call __isset when the caller doesn't have visibility access
+                      ; we call __unset when the caller doesn't have visibility access
                       ; (whether it's actually declared for real or not) or when it
                       ; would have visibility but it's not declared
@@ -1796 +1796 @@
                                  ,the-property))))
                  (convert-to-boolean (call-php-method-1 obj-evald "__unset" ,the-property))
-                 ; normal isset
-                 ,(update-value lval ''()))))))
+                 ; unset (remove) property
+                 (php-object-property-unset obj-evald ,the-property))))))
 
 ;;;;isset

trunk/pcc/runtime/php-object.scm

@@ -64 +64 @@
     (php-class-props class-name)
     (php-object-has-declared-property? obj::struct property::bstring)
+    (php-object-property-unset obj::struct property::bstring)
     (php-object-property/index obj::struct property::int property-name)
     (php-object-property/string obj property::bstring access-type)
@@ -295 +296 @@
                       (prop-key (hashtable-get offsets-table i)))
                    ; if it's not in offsets table, it's a static and we skip it
-                   (when prop-key
+                   (when (and prop-key (not (eqv? prop-value 'prop-unset)))
                       (php-hash-insert! property-hash
                                         prop-key
@@ -322 +323 @@
 ;              (fprint (current-error-port) "ref-status is " (mkstr (container-reference? prop-value)))
                ; if we don't have prop key, it's a static and we skip it
-               (when prop-key
+               (when (and prop-key (not (eqv? prop-value 'prop-unset)))
                   (thunk ;note the reverse lookup to get the name
                    (mkstr prop-key)
@@ -349 +350 @@
                          (prop-key (hashtable-get offsets-table i)))
                       ; if it's not in offsets table, it's a static and we skip it
-                      (when prop-key
+                      (when (and prop-key (not (eqv? prop-value 'prop-unset)))                
                          (php-hash-insert! property-hash
                                            ;note the reverse lookup to get the name
@@ -586 +587 @@
                                                       (%property-name-canonicalize property-name))
                                        property))
+
+   ; XXX check for 'prop-unset ?
    (vector-ref (%php-object-properties obj) property)
    
@@ -1543 +1546 @@
 ;;;;the actual property looker-uppers
 
+(define (php-object-property-unset obj::struct property::bstring)
+   "remove the property from the object, only available via unset()"
+   (if (php-object? obj)
+       (let* ((canon-name (%property-name-canonicalize property))
+              (offset (%prop-offset obj canon-name 'all)))
+          ; first check declared
+          (when offset
+              ; we can't remove it since the classes offset hash will still point
+              ; here (and needs to for other instances) so we set it to a special value
+              (vector-set! (%php-object-properties obj) offset 'prop-unset))
+          ; check extended
+          (when (php-hash-contains? (%php-object-extended-properties obj) canon-name)
+             (php-hash-remove! (%php-object-extended-properties obj) canon-name))
+          NULL)))
+
 (define (php-object-has-declared-property? obj::struct property::bstring)
    "see if the object has the specified declared property, regardless of visibility"
@@ -1556 +1574 @@
       (if offset
           ; declared
-          (vector-ref (%php-object-properties obj) offset)
+          (let ((val (vector-ref (%php-object-properties obj) offset)))
+             (if (eqv? val 'prop-unset)
+                 NULL
+                 val))
           ; not declared. maybe use __get
           (let ((get-method (%lookup-method (%php-object-class obj) "__get")))
@@ -1573 +1594 @@
       (if offset
           ; declared
-          (container-value (vector-ref (%php-object-properties obj) offset))
+          (let ((val (vector-ref (%php-object-properties obj) offset)))
+             (if (eqv? val 'prop-unset)
+                 NULL
+                 (container-value val)))
           ; not declared. maybe use __get
           (let ((get-method (%lookup-method (%php-object-class obj) "__get")))