[armedbear-cvs] r14438 - trunk/abcl/contrib/jss

[mevenson at common-lisp.net]

Author: mevenson
Date: Thu Mar 21 07:13:27 2013
New Revision: 14438

Log:
Fix JSS:VECTOR-TO-LIST and JSS:ITERABLE-TO-LIST.

Found by zmyrgel on #abcl.

Modified:
   trunk/abcl/contrib/jss/invoke.lisp
   trunk/abcl/contrib/jss/jss.asd

Modified: trunk/abcl/contrib/jss/invoke.lisp
==============================================================================
--- trunk/abcl/contrib/jss/invoke.lisp	Wed Mar 20 01:50:29 2013	(r14437)
+++ trunk/abcl/contrib/jss/invoke.lisp	Thu Mar 21 07:13:27 2013	(r14438)
@@ -567,17 +567,19 @@
   "Return the items contained the java.lang.Iterable ITERABLE as a list."
  (declare (optimize (speed 3) (safety 0)))
  (let ((it (#"iterator" iterable)))
-   (with-constant-signature ((hasmore "hasMoreElements")
-			     (next "nextElement"))
-     (loop while (hasmore it)
-	collect (next it)))))
+   (with-constant-signature ((has-next "hasNext")
+			     (next "next"))
+     (loop :while (has-next it)
+	:collect (next it)))))
 
 (defun vector-to-list (vector)
+  "Return the elements of java.lang.Vector VECTOR as a list."
  (declare (optimize (speed 3) (safety 0)))
- (with-constant-signature ((hasmore "hasMoreElements")
+ (with-constant-signature ((has-more "hasMoreElements")
 			   (next "nextElement"))
-     (loop while (hasmore vector)
-	collect (next vector))))
+   (let ((elements (#"elements" vector)))
+     (loop :while (has-more elements)
+	:collect (next elements)))))
 
 (defun hashmap-to-hashtable (hashmap &rest rest &key (keyfun #'identity) (valfun #'identity) (invert? nil)
 				    table 

Modified: trunk/abcl/contrib/jss/jss.asd
==============================================================================
--- trunk/abcl/contrib/jss/jss.asd	Wed Mar 20 01:50:29 2013	(r14437)
+++ trunk/abcl/contrib/jss/jss.asd	Thu Mar 21 07:13:27 2013	(r14438)
@@ -1,8 +1,8 @@
 ;;;; -*- Mode: LISP -*-
 (asdf:defsystem :jss
   :author "Alan Ruttenberg, Mark Evenson"
-  :version "3.0.5" 
-  :description "<> asdf:defsystem <urn:abcl.org/release/1.1.0/contrib/jss#3.05"
+  :version "3.0.6" 
+  :description "<> asdf:defsystem <urn:abcl.org/release/1.1.0/contrib/jss#3.06"
   :components ((:module base 
                         :pathname "" :serial t 
                         :components ((:file "packages")