Changeset 2730


Ignore:
Timestamp:
07/02/03 18:43:25 (18 years ago)
Author:
piso
Message:

(in-package "SYSTEM")

File:
1 edited

Legend:

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

    r2723 r2730  
    22;;;
    33;;; Copyright (C) 2003 Peter Graves
    4 ;;; $Id: nsubstitute.lisp,v 1.4 2003-07-02 17:59:03 piso Exp $
     4;;; $Id: nsubstitute.lisp,v 1.5 2003-07-02 18:43:25 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    1919;;; NSUBSTITUTE (from CMUCL)
    2020
    21 (in-package "COMMON-LISP")
     21(in-package "SYSTEM")
    2222
    2323;;; From CMUCL.
     
    2525(defmacro real-count (count)
    2626  `(cond ((null ,count) most-positive-fixnum)
    27          ((sys:fixnump ,count) (if (minusp ,count) 0 ,count))
     27         ((fixnump ,count) (if (minusp ,count) 0 ,count))
    2828         ((integerp ,count) (if (minusp ,count) 0 most-positive-fixnum))
    2929         (t ,count)))
     
    3434      ((or (= index end) (null list) (= count 0)) sequence)
    3535    (when (if test-not
    36         (not (funcall test-not old (sys::apply-key key (car list))))
    37         (funcall test old (sys::apply-key key (car list))))
     36        (not (funcall test-not old (apply-key key (car list))))
     37        (funcall test old (apply-key key (car list))))
    3838      (rplaca list new)
    3939      (setq count (1- count)))))
     
    4444      ((or (= index end) (= count 0)) sequence)
    4545    (when (if test-not
    46         (not (funcall test-not old (sys::apply-key key (aref sequence index))))
    47         (funcall test old (sys::apply-key key (aref sequence index))))
     46        (not (funcall test-not old (apply-key key (aref sequence index))))
     47        (funcall test old (apply-key key (aref sequence index))))
    4848      (setf (aref sequence index) new)
    4949      (setq count (1- count)))))
     
    7272       (index start (1+ index)))
    7373      ((or (= index end) (null list) (= count 0)) sequence)
    74     (when (funcall test (sys::apply-key key (car list)))
     74    (when (funcall test (apply-key key (car list)))
    7575      (rplaca list new)
    7676      (setq count (1- count)))))
     
    8080  (do ((index start (+ index incrementer)))
    8181      ((or (= index end) (= count 0)) sequence)
    82     (when (funcall test (sys::apply-key key (aref sequence index)))
     82    (when (funcall test (apply-key key (aref sequence index)))
    8383      (setf (aref sequence index) new)
    8484      (setq count (1- count)))))
     
    106106       (index start (1+ index)))
    107107      ((or (= index end) (null list) (= count 0)) sequence)
    108     (when (not (funcall test (sys::apply-key key (car list))))
     108    (when (not (funcall test (apply-key key (car list))))
    109109      (rplaca list new)
    110110      (setq count (1- count)))))
     
    114114  (do ((index start (+ index incrementer)))
    115115      ((or (= index end) (= count 0)) sequence)
    116     (when (not (funcall test (sys::apply-key key (aref sequence index))))
     116    (when (not (funcall test (apply-key key (aref sequence index))))
    117117      (setf (aref sequence index) new)
    118118      (setq count (1- count)))))
Note: See TracChangeset for help on using the changeset viewer.