Changeset 7823 for branches

Timestamp:

Dec 5, 2007, 5:46:50 AM (17 years ago)

Author:

Gary Byers

Message:

REQUIRE-TYPE deals with fuzzier cases.

File:

• branches/working-0711/ccl/level-1/sysutils.lisp (modified) (1 diff)

branches/working-0711/ccl/level-1/sysutils.lisp

@@ -303 +303 @@
 
 
-;This is like check-type, except it returns the value rather than setf'ing
-;anything, and so can be done entirely out-of-line.
-(defun require-type (arg type)  
-  (if (typep  arg type)
-    arg
-    (%kernel-restart $xwrongtype arg type)))
+;;; This is like check-type, except it returns the value rather than setf'ing
+;;; anything, and so can be done entirely out-of-line.
+(defun require-type (arg type)
+  (multiple-value-bind (win sure)
+      (ctypep  arg (specifier-type type))
+    (if (or win (not sure))
+      arg
+      (%kernel-restart $xwrongtype arg type))))
 
 ;;; Might want to use an inverted mapping instead of (satisfies ccl::obscurely-named)