Ignore:
Timestamp:
03/14/05 18:55:46 (16 years ago)
Author:
piso
Message:

MISC.578

File:
1 edited

Legend:

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

    r8759 r8772  
    11;;; typep.lisp
    22;;;
    3 ;;; Copyright (C) 2003-2004 Peter Graves
    4 ;;; $Id: typep.lisp,v 1.23 2005-03-12 18:36:06 piso Exp $
     3;;; Copyright (C) 2003-2005 Peter Graves
     4;;; $Id: typep.lisp,v 1.24 2005-03-14 18:55:46 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    9393      (SIMPLE-BIT-VECTOR
    9494       (and (simple-bit-vector-p object)
    95             (or (endp i) (match-dimensions (array-dimensions object) i))))
     95            (or (endp i)
     96                (eq (car i) '*)
     97                (eql (car i) (array-dimension object 0)))))
    9698      (BIT-VECTOR
    9799       (and (bit-vector-p object)
    98             (or (endp i) (match-dimensions (array-dimensions object) i))))
     100            (or (endp i)
     101                (eq (car i) '*)
     102                (eql (car i) (array-dimension object 0)))))
    99103      (SIMPLE-STRING
    100104       (and (simple-string-p object)
    101             (or (null i)
     105            (or (endp i)
    102106                (eq (car i) '*)
    103                 (eql (car i) (length object)))))
     107                (eql (car i) (array-dimension object 0)))))
    104108      (STRING
    105109       (and (stringp object)
    106             (or (null i)
     110            (or (endp i)
    107111                (eq (car i) '*)
    108                 (eql (car i) (length object)))))
     112                (eql (car i) (array-dimension object 0)))))
    109113      (SIMPLE-VECTOR
    110114       (and (simple-vector-p object)
    111             (or (endp i) (eq (car i) '*)
    112                 (= (length object) (car i)))))
     115            (or (endp i)
     116                (eq (car i) '*)
     117                (eql (car i) (array-dimension object 0)))))
    113118      (VECTOR
    114119       (and (vectorp object)
     
    118123                (and (stringp object) (%subtypep (car i) 'character))
    119124                (equal (array-element-type object) (car i)))
    120             (or (endp (cdr i)) (match-dimensions (array-dimensions object) (cdr i)))))
     125            (or (endp (cdr i))
     126                (eq (cadr i) '*)
     127                (eql (cadr i) (array-dimension object 0)))))
    121128      (SIMPLE-ARRAY
    122129       (and (simple-array-p object)
Note: See TracChangeset for help on using the changeset viewer.