Changeset 8487


Ignore:
Timestamp:
02/06/05 12:48:38 (17 years ago)
Author:
piso
Message:

CTYPE: distinguish between REAL and COMPLEX.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/subtypep.lisp

    r8486 r8487  
    22;;;
    33;;; Copyright (C) 2003-2005 Peter Graves
    4 ;;; $Id: subtypep.lisp,v 1.54 2005-02-06 02:47:32 piso Exp $
     4;;; $Id: subtypep.lisp,v 1.55 2005-02-06 12:48:38 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    221221             ((ARRAY VECTOR STRING SIMPLE-ARRAY SIMPLE-STRING BASE-STRING
    222222               SIMPLE-BASE-STRING BIT-VECTOR SIMPLE-BIT-VECTOR NIL-VECTOR)
    223               (make-ctype 'array type))
    224              ((NUMBER INTEGER FIXNUM BIGNUM RATIO FLOAT SINGLE-FLOAT
    225                DOUBLE-FLOAT SHORT-FLOAT LONG-FLOAT)
    226               (make-ctype 'number type)))))))
     223              (make-ctype 'ARRAY type))
     224             ((REAL INTEGER BIT FIXNUM UNSIGNED-BYTE BIGNUM RATIO
     225               FLOAT SINGLE-FLOAT DOUBLE-FLOAT SHORT-FLOAT LONG-FLOAT)
     226              (make-ctype 'REAL type))
     227             (COMPLEX
     228              (make-ctype 'COMPLEX type)))))))
    227229
    228230(defun csubtypep-array (ct1 ct2)
     
    558560               (values (sub-interval-p i1 i2) t)
    559561               (values nil (known-type-p t2))))
    560           ((eq t1 'complex)
    561            (values (eq t2 'number) t))
    562562          ((and (eq t1 (find-class 'array)) (eq t2 'array))
    563563           (values (equal i2 '(* *)) t))
Note: See TracChangeset for help on using the changeset viewer.