From 328bdceabd3316db12673f289fe4c8acd0c96703 Mon Sep 17 00:00:00 2001
From: pfdietz <pfdietz@localhost>
Date: Mon, 5 Sep 2005 19:14:21 +0000
Subject: [PATCH] Make setf-getf.order.1 have more useful output

---
 ansi-tests/getf.lsp | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/ansi-tests/getf.lsp b/ansi-tests/getf.lsp
index a96f20fd..8195e583 100644
--- a/ansi-tests/getf.lsp
+++ b/ansi-tests/getf.lsp
@@ -45,7 +45,7 @@
 	   (progn (setf y (incf i)) 'a)
 	   (setf z (incf i)))
      i x y z))
-  b 3 1 2 3)		  
+  b 3 1 2 3)
 
 (deftest setf-getf.1
   (let ((p (copy-list '(a 1 b 2))))
@@ -127,24 +127,23 @@
 
 (deftest setf-getf.order.1
   (let ((p (list (copy-list '(a 1 b 2))))
-	(cnt1 0) (cnt2 0) (cnt3 0))
+        (cnt1 0) (cnt2 0) (cnt3 0))
     (setf (getf (car (progn (incf cnt1) p)) 'c (incf cnt3))
-	  (progn (incf cnt2) 3))
+          (progn (incf cnt2) 3))
     ;; Must check that only a, b, c have properties
-    (and
-     (eqlt cnt1 1)
-     (eqlt cnt2 1)
-     (eqlt cnt3 1)
-     (eqlt (getf (car p) 'a) 1)
-     (eqlt (getf (car p) 'b) 2)
-     (eqlt (getf (car p) 'c) 3)
-     (eqlt
-      (loop
-       for ptr on (car p) by #'cddr count
-       (not (member (car ptr) '(a b c))))
-      0)
-     t))
-  t)
+    (values
+     cnt1 ; (eqlt cnt1 1)
+     cnt2 ; (eqlt cnt2 1)
+     cnt3 ; (eqlt cnt3 1)
+     (getf (car p) 'a)
+     (getf (car p) 'b)
+     (getf (car p) 'c)
+     (loop
+        for ptr on (car p) by #'cddr count
+          (not (member (car ptr) '(a b c))))))
+  1 1 1
+  1 2 3
+  0)
 
 (deftest setf-getf.order.2
   (let ((p (list (copy-list '(a 1 b 2))))
-- 
GitLab