Changeset 4692

Timestamp:

11/11/03 17:08:45 (18 years ago)

Author:

piso

Message:

SUBTYPEP: added test for (eq type1 type2) at top of function.

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.21 2003-10-14 02:31:20 piso Exp $
+;;; $Id: subtypep.lisp,v 1.22 2003-11-11 17:08:45 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -215 +215 @@
 
 (defun subtypep (type1 type2)
-  (when (or (null type1) (eq type2 t))
+  (when (or (eq type1 type2)
+            (null type1)
+            (eq type2 t))
     (return-from subtypep (values t t)))
   (let* ((c1 (classp type1)) (c2 (classp type2))