Changeset 546

Timestamp:

06/16/08 08:47:31 (7 months ago)

Author:

weyrick

Message:

fix array_slice when accessing the last element of an array. thanks igli

Files:

• trunk/pcc/runtime/ext/standard/php-array.scm (modified) (1 diff)

trunk/pcc/runtime/ext/standard/php-array.scm

@@ -606 +606 @@
           (max-len a-size)
           (real-offset (convert-to-number offset)))
-      (if (php-number? real-offset)
+      (if (php-< real-offset 0)
+          (set! real-offset (php-+ a-size real-offset)))
+      (when (php-<= real-offset (php-- a-size 1))
           (begin
-             (if (php-< real-offset 0)
-                 (set! real-offset (php-+ a-size real-offset)))
-             (if (php-< real-offset (php-- a-size 1))
-                 (begin
-                    (cond ((eqv? length 'unset) (set! max-len (php-- a-size real-offset)))
-                          ((and (php-number? length)
-                                (php-< length 0))   (set! max-len (php-+ (php-- a-size real-offset) length)))
-                          ((and (php-number? length)
-                                (php->= length 0))  (set! max-len length)))
-                    (let ((i 0))
-                       (php-hash-for-each safe-array
-                          (lambda (k v)
-                             (when (and (php->= i real-offset)
-                                        (php-< cur-len max-len))
-                                (set! cur-len (+ cur-len 1))
-                                (php-hash-insert! new-array :next v))
-                             (set! i (+ i 1))))))
-                 #f)
-             new-array)
-          #f)))
+             (cond ((eqv? length 'unset) (set! max-len (php-- a-size real-offset)))
+                   ((and (php-number? length)
+                         (php-< length 0))   (set! max-len (php-+ (php-- a-size real-offset) length)))
+                   ((and (php-number? length)
+                         (php->= length 0))  (set! max-len length)))
+             (let ((i 0))
+                (php-hash-for-each safe-array
+                                   (lambda (k v)
+                                      (when (and (php->= i real-offset)
+                                                 (php-< cur-len max-len))
+                                         (set! cur-len (+ cur-len 1))
+                                         (php-hash-insert! new-array :next v))
+                                      (set! i (+ i 1)))))))
+      new-array))