Changeset 5720

Timestamp:

Jan 18, 2007, 3:00:49 AM (18 years ago)

Author:

Gary Byers

Message:

Handle the case of an encoded structure type as a return value.

File:

• trunk/ccl/lib/db-io.lisp (modified) (2 diffs)

trunk/ccl/lib/db-io.lisp

@@ -560 +560 @@
 
 (defun decode-arguments (string)
-  (let* ((result (cdr (assoc (schar string 0) *arg-spec-encoding*)))
-         (args ()))
-    (do* ((i 1 (1+ i)))
-         ((= i (length string)) (values (nreverse args) result))
-      (declare (fixnum i))
-      (let* ((ch (schar string i))
-             (val (if (or (eql ch #\r) (eql ch #\R) (eql ch #\t))
-                    (let* ((namelen (char-code (schar string (incf i))))
-                           (name (make-string namelen)))
-                      (dotimes (k namelen)
-                        (setf (schar name k)
-                              (schar string (incf i))))
-                      (if (eql ch #\R)
-                         name
-                         (escape-foreign-name name)))
-                    (cdr (assoc ch *arg-spec-encoding*)))))
-      (push val args)))))
+  (let* ((result nil))
+    (collect ((args))
+      (do* ((i 0 (1+ i)))
+           ((= i (length string)) (values (args) result))
+        (declare (fixnum i))
+        (let* ((ch (schar string i))
+               (val (if (or (eql ch #\r) (eql ch #\R) (eql ch #\t))
+                      (let* ((namelen (char-code (schar string (incf i))))
+                             (name (make-string namelen)))
+                        (dotimes (k namelen)
+                          (setf (schar name k)
+                                (schar string (incf i))))
+                        (if (eql ch #\R)
+                          name
+                          (escape-foreign-name name)))
+                      (cdr (assoc ch *arg-spec-encoding*)))))
+          (if result
+            (args val)
+            (setq result val)))))))
+
 
 ;;; encoded external function looks like:
@@ -840 +843 @@
   ambiguous-methods                     ; partitioned by signature
   req-args
-  flags)
+  flags
+  protocol-methods)
 
 (defstruct objc-method-info