Changeset 2730

Timestamp:

07/02/03 18:43:25 (18 years ago)

Author:

piso

Message:

(in-package "SYSTEM")

File:

• trunk/j/src/org/armedbear/lisp/nsubstitute.lisp (modified) (9 diffs)

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

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: nsubstitute.lisp,v 1.4 2003-07-02 17:59:03 piso Exp $
+;;; $Id: nsubstitute.lisp,v 1.5 2003-07-02 18:43:25 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -19 +19 @@
 ;;; NSUBSTITUTE (from CMUCL)
 
-(in-package "COMMON-LISP")
+(in-package "SYSTEM")
 
 ;;; From CMUCL.
@@ -25 +25 @@
 (defmacro real-count (count)
   `(cond ((null ,count) most-positive-fixnum)
-         ((sys:fixnump ,count) (if (minusp ,count) 0 ,count))
+         ((fixnump ,count) (if (minusp ,count) 0 ,count))
          ((integerp ,count) (if (minusp ,count) 0 most-positive-fixnum))
          (t ,count)))
@@ -34 +34 @@
       ((or (= index end) (null list) (= count 0)) sequence)
     (when (if test-not
-        (not (funcall test-not old (sys::apply-key key (car list))))
-        (funcall test old (sys::apply-key key (car list))))
+        (not (funcall test-not old (apply-key key (car list))))
+        (funcall test old (apply-key key (car list))))
       (rplaca list new)
       (setq count (1- count)))))
@@ -44 +44 @@
       ((or (= index end) (= count 0)) sequence)
     (when (if test-not
-        (not (funcall test-not old (sys::apply-key key (aref sequence index))))
-        (funcall test old (sys::apply-key key (aref sequence index))))
+        (not (funcall test-not old (apply-key key (aref sequence index))))
+        (funcall test old (apply-key key (aref sequence index))))
       (setf (aref sequence index) new)
       (setq count (1- count)))))
@@ -72 +72 @@
        (index start (1+ index)))
       ((or (= index end) (null list) (= count 0)) sequence)
-    (when (funcall test (sys::apply-key key (car list)))
+    (when (funcall test (apply-key key (car list)))
       (rplaca list new)
       (setq count (1- count)))))
@@ -80 +80 @@
   (do ((index start (+ index incrementer)))
       ((or (= index end) (= count 0)) sequence)
-    (when (funcall test (sys::apply-key key (aref sequence index)))
+    (when (funcall test (apply-key key (aref sequence index)))
       (setf (aref sequence index) new)
       (setq count (1- count)))))
@@ -106 +106 @@
        (index start (1+ index)))
       ((or (= index end) (null list) (= count 0)) sequence)
-    (when (not (funcall test (sys::apply-key key (car list))))
+    (when (not (funcall test (apply-key key (car list))))
       (rplaca list new)
       (setq count (1- count)))))
@@ -114 +114 @@
   (do ((index start (+ index incrementer)))
       ((or (= index end) (= count 0)) sequence)
-    (when (not (funcall test (sys::apply-key key (aref sequence index))))
+    (when (not (funcall test (apply-key key (aref sequence index))))
       (setf (aref sequence index) new)
       (setq count (1- count)))))