Changeset 908

Timestamp:

Feb 16, 2005, 10:56:05 AM (20 years ago)

Author:

bryan

Message:

ccl::simple-vector-delete loses with displaced arrays with a
displaced-index-offset > 0.

the second loop (looping through the scratch bit vector) to copy
the items that survive into the new array misuses the offset with
the bit vector. this causes an array out of bounds error. instead
it should use the offset with the original array to reference the
item.

the third loop which copies the remaining items that were explicitly
excluded from the test also needs the offset to copy the right items.

File:

• trunk/ccl/lib/sequences.lisp (modified) (2 diffs)

trunk/ccl/lib/sequences.lisp

@@ -1037 +1037 @@
           ))
       (setq fill start)
-      (setq pos (%i+ start offset))
+      (setq pos start)
       (loop
         (if (eq fill fill-end) (return))
         (if (neq 1 (aref bv pos))
           (progn
-            (%typed-miscset subtype new-vect fill (%typed-miscref subtype vector pos))
+            (%typed-miscset subtype new-vect fill (%typed-miscref subtype vector (%i+ offset pos)))
             (setq fill (%i+ fill 1))))
         (setq pos (%i+ pos 1)))
@@ -1048 +1048 @@
       (loop
         (when (eq fill size) (return))
-          (%typed-miscset subtype new-vect fill (%typed-miscref subtype vector pos))
+          (%typed-miscset subtype new-vect fill (%typed-miscref subtype vector (%i+ offset pos)))
           (setq fill (%i+ fill 1)
                 pos (%i+ pos 1)))