Changeset 12928

Timestamp:

09/28/10 18:21:06 (13 years ago)

Author:

astalla

Message:

Fixes in java collections support (iterators) and dosequence (wrong call to parse-body)

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• extensible-sequences.lisp (modified) (2 diffs)
• java-collections.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/extensible-sequences.lisp

@@ -997 +997 @@
 (defmacro dovector ((elt vector &optional result) &body body)
   (multiple-value-bind (forms decls)
-      (sys:parse-body body :doc-string-allowed nil)
+      (sys:parse-body body nil)
     (let ((index (gensym "INDEX")) (length (gensym "LENGTH")) (vec (gensym "VEC")))
       `(let ((,vec ,vector))
@@ -1016 +1016 @@
   (declare (ignore from-end start end))
   (multiple-value-bind (forms decls)
-      (sys:parse-body body :doc-string-allowed nil)
+      (sys:parse-body body nil)
     (let ((s sequence)
           (sequence (gensym "SEQUENCE")))

trunk/abcl/src/org/armedbear/lisp/java-collections.lisp

@@ -65 +65 @@
     ((s (jclass "java.util.List")) &key from-end (start 0) end)
   (let* ((end (or end (length s)))
-   (index (if from-end (1- end) start))
+   (index (if from-end end start))
    (it (jcall "listIterator" s index))
    (iter (make-jlist-iterator :native-iterator it
-            :index (if from-end (1+ index)
-                 (1- index))))
-   (limit (if from-end start (1- end))))
+            :index (if from-end (1+ index) (1- index))))
+   (limit (if from-end (1+ start) (1- end))))
     ;;CL iterator semantics are that first element is present from the start
     (unless (sequence:iterator-endp s iter limit from-end)
@@ -79 +78 @@
 (defmethod sequence:iterator-step
     ((s (jclass "java.util.Collection")) it from-end)
-  (if from-end
-      (progn
-  (setf (jlist-it-element it)
-        (jcall "previous" (jlist-it-native-iterator it)))
-  (decf (jlist-it-index it)))
-      (progn
-  (setf (jlist-it-element it)
-        (jcall "next" (jlist-it-native-iterator it)))
-  (incf (jlist-it-index it))))
+  (let ((native-it (jlist-it-native-iterator it)))
+    (if from-end
+  (progn
+    (setf (jlist-it-element it)
+    (when (jcall "hasPrevious" native-it)
+      (jcall "previous" native-it)))
+    (decf (jlist-it-index it)))
+  (progn
+    (setf (jlist-it-element it)
+    (when (jcall "hasNext" native-it)
+      (jcall "next" native-it)))
+    (incf (jlist-it-index it)))))
   it)
 
@@ -93 +95 @@
     ((s (jclass "java.util.Collection")) it limit from-end)
   (if from-end
-      (<= (jlist-it-index it) limit)
-      (>= (jlist-it-index it) limit)))
+      (< (jlist-it-index it) limit)
+      (> (jlist-it-index it) limit)))
 
 (defmethod sequence:iterator-element