[slime-cvs] CVS slime/contrib

[CVS User heller]

Update of /project/slime/cvsroot/slime/contrib
In directory tiger.common-lisp.net:/tmp/cvs-serv1655/contrib

Modified Files:
	ChangeLog swank-kawa.scm 
Log Message:
* swank-kawa.scm (inspect-obj-ref): Use for instead of iter.

--- /project/slime/cvsroot/slime/contrib/ChangeLog	2011/12/02 18:18:02	1.514
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2011/12/02 18:18:10	1.515
@@ -1,5 +1,9 @@
 2011-12-02  Helmut Eller  <heller at common-lisp.net>
 
+	* swank-kawa.scm (inspect-obj-ref): Use for instead of iter.
+
+2011-12-02  Helmut Eller  <heller at common-lisp.net>
+
 	* slime-mrepl.el: Drop dependency on slime-repl. Use comint
 	instead.
 
--- /project/slime/cvsroot/slime/contrib/swank-kawa.scm	2011/12/01 22:34:29	1.25
+++ /project/slime/cvsroot/slime/contrib/swank-kawa.scm	2011/12/02 18:18:11	1.26
@@ -1173,12 +1173,11 @@
 (df inspect-array-ref ((vm <vm>) (obj <array-ref>))
   (packing (pack)
     (let ((i 0))
-      (iter (! getValues obj)
-            (fun ((v <value>))
-              (pack (format "~d: " i))
-              (pack `(:value ,(vm-demirror vm v)))
-              (pack "\n")
-              (set i (1+ i)))))))
+      (for (((v <value>) (! getValues obj)))
+        (pack (format "~d: " i))
+        (pack `(:value ,(vm-demirror vm v)))
+        (pack "\n")
+        (set i (1+ i))))))
 
 (df inspect-obj-ref ((vm <vm>) (obj <obj-ref>))
   (let* ((type (! referenceType obj))
@@ -1186,19 +1185,17 @@
          (values (! getValues obj fields))
          (ifields '()) (sfields '()) (imeths '()) (smeths '())
          (frob (lambda (lists) (apply append (reverse lists)))))
-    (iter fields 
-          (fun ((f <field>))
-            (let* ((val (as <value> (! get values f)))
-                   (l `(,(! name f) ": " (:value ,(vm-demirror vm val)) "\n")))
-              (if (! is-static f) 
-                  (pushf l sfields)
-                  (pushf l ifields)))))
-    (iter (! allMethods type)
-          (fun ((m <meth-ref>))
-            (let ((l `(,(! name m) ,(! signature m) "\n")))
-              (if (! is-static m)
-                  (pushf l smeths)
-                  (pushf l imeths)))))
+    (for (((f <field>) fields))
+      (let* ((val (as <value> (! get values f)))
+             (l `(,(! name f) ": " (:value ,(vm-demirror vm val)) "\n")))
+        (if (! is-static f) 
+            (pushf l sfields)
+            (pushf l ifields))))
+    (for (((m <meth-ref>) (! allMethods type)))
+      (let ((l `(,(! name m) ,(! signature m) "\n")))
+        (if (! is-static m)
+            (pushf l smeths)
+            (pushf l imeths))))
     `(,@(frob ifields) 
       "--- static fields ---\n" ,@(frob sfields)
       "--- methods ---\n" ,@(frob imeths)