Changeset 3973

Timestamp:

09/21/03 19:30:29 (20 years ago)

Author:

piso

Message:

SIMPLE-SUBTYPEP

File:

• trunk/j/src/org/armedbear/lisp/subtypep.lisp (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/subtypep.lisp

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: subtypep.lisp,v 1.11 2003-09-20 16:16:52 piso Exp $
+;;; $Id: subtypep.lisp,v 1.12 2003-09-21 19:30:29 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -134 +134 @@
 
 (defun simple-subtypep (type1 type2)
-  (assert (symbolp type1))
-  (assert (symbolp type2))
-  (if (memq type2 (supertypes type1))
-      t
-      (dolist (supertype (supertypes type1))
-        (when (simple-subtypep supertype type2)
-          (return t)))))
+;;   (assert (symbolp type1))
+;;   (assert (symbolp type2))
+  (cond ((and (symbolp type1) (symbolp type2))
+         (if (memq type2 (supertypes type1))
+             t
+             (dolist (supertype (supertypes type1))
+               (when (simple-subtypep supertype type2)
+                 (return t)))))
+        (t
+         nil)))
 
 (defun sub-interval-p (i1 i2)