Changeset 3762

Timestamp:

09/14/03 16:03:26 (20 years ago)

Author:

piso

Message:

Work in progress.

File:

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

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

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: subtypep.lisp,v 1.6 2003-09-14 14:24:51 piso Exp $
+;;; $Id: subtypep.lisp,v 1.7 2003-09-14 16:03:26 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -156 +156 @@
 
 (defun subtypep (type1 type2)
+  (when (or (null type1) (eq type2 t))
+    (return-from subtypep (values t t)))
   (setq type1 (normalize-type type1)
         type2 (normalize-type type2))
@@ -165 +167 @@
         (i2 (cdr type2)))
     (unless (or i1 i2)
-      (cond ((or (eq t1 nil) (eq t2 t))
-             (return-from subtypep (values t t)))
-            ((eq t2 nil)
-             (return-from subtypep (values nil t)))
-            (t
-             (return-from subtypep (values (simple-subtypep t1 t2) t)))))
+      (return-from subtypep (values (simple-subtypep t1 t2) t)))
     (cond ((eq t2 'atom)
            (cond ((member t1 '(cons list)) (values nil t))