Fix issue #8.

alex-gutev · Dec 16, 2021 · f46969b · f46969b
1 parent d0c57a6
commit f46969b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/cl-functions.lisp b/src/cl-functions.lisp
@@ -152,7 +152,7 @@
 
 (defmethod custom-form-type ((first (eql 'values)) args env)
   (values `(values ,@(loop :for form :in args
-                           :collect (form-type form env)))
+                           :collect (nth-form-type form env)))
           t))
 
 (defmethod custom-form-type ((first (eql 'coerce)) arguments env)

diff --git a/test/custom-types.lisp b/test/custom-types.lisp
@@ -121,3 +121,19 @@
       (is-form-type t
 	(coerce)
 	:strict t))))
+
+(test (values :compile-at :run-time)
+  "Test FORM-TYPE on VALUES forms"
+
+  (flet ((bar (x)
+           (declare (ignore x))
+           (list 1 2 3 4)))
+    (declare (ftype (function * (values &rest number)) bar))
+
+    (is-form-type string
+      (values "" (bar x)))
+
+    (is-form-type number
+      (values "" (bar x))
+
+      :n 1)))