Changeset 3517

Timestamp:

08/25/03 18:22:58 (20 years ago)

Author:

piso

Message:

Got rid of exports from SYSTEM package.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Primitives.java (modified) (6 diffs)
• delete-duplicates.lisp (modified) (2 diffs)
• mismatch.lisp (modified) (3 diffs)
• remove-duplicates.lisp (modified) (2 diffs)
• replace.lisp (modified) (3 diffs)
• search.lisp (modified) (2 diffs)
• substitute.lisp (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.352 2003-08-25 17:56:59 piso Exp $
+ * $Id: Primitives.java,v 1.353 2003-08-25 18:20:21 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -571 +571 @@
     // ### fixnump
     private static final Primitive1 FIXNUMP =
-        new Primitive1("fixnump", PACKAGE_SYS, true) {
+        new Primitive1("fixnump", PACKAGE_SYS, false) {
         public LispObject execute(LispObject arg) throws LispError
         {
@@ -1122 +1122 @@
     // %setnth n list new-object => new-object
     private static final Primitive3 _SETNTH =
-        new Primitive3("%setnth", PACKAGE_SYS, true) {
+        new Primitive3("%setnth", PACKAGE_SYS, false) {
         public LispObject execute(LispObject first, LispObject second,
             LispObject third) throws LispError
@@ -4149 +4149 @@
     // shrink-vector vector new-size => vector
     private static final Primitive2 SHRINK_VECTOR =
-        new Primitive2("shrink-vector", PACKAGE_SYS, true) {
+        new Primitive2("shrink-vector", PACKAGE_SYS, false) {
         public LispObject execute(LispObject first, LispObject second)
             throws LispError
@@ -4159 +4159 @@
 
     private static final Primitive3 VECTOR_SUBSEQ =
-        new Primitive3("vector-subseq", PACKAGE_SYS, true) {
+        new Primitive3("vector-subseq", PACKAGE_SYS, false) {
         public LispObject execute(LispObject vector, LispObject start,
             LispObject end) throws LispError
@@ -4646 +4646 @@
     };
 
-    // ### %compare-elements
-    // %compare-elements test key elt1 elt2
-    private static final Primitive _COMPARE_ELEMENTS =
-        new Primitive("%compare-elements", PACKAGE_SYS, true) {
-        public LispObject execute(LispObject args[]) throws Condition
-        {
-            if (args[1] == NIL) {
-                // No key function.
-                return funcall2(args[0], args[2], args[3],
-                                LispThread.currentThread());
-            }
-            LispObject key = args[1];
-            final LispThread thread = LispThread.currentThread();
-            return funcall2(args[0],
-                            funcall1(key, args[2], thread),
-                            funcall1(key, args[3], thread),
-                            thread);
-        }
-    };
-
     // ### coerce-to-function
     private static final Primitive1 COERCE_TO_FUNCTION =

trunk/j/src/org/armedbear/lisp/delete-duplicates.lisp

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: delete-duplicates.lisp,v 1.4 2003-07-02 18:32:30 piso Exp $
+;;; $Id: delete-duplicates.lisp,v 1.5 2003-08-25 18:22:58 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -59 +59 @@
           (jndex jndex (1+ jndex)))
        ((= index length)
-        (sys:shrink-vector vector jndex)
+        (shrink-vector vector jndex)
         vector)
        (setf (aref vector jndex) (aref vector index))))

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

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: mismatch.lisp,v 1.3 2003-07-02 16:42:04 piso Exp $
+;;; $Id: mismatch.lisp,v 1.4 2003-08-25 18:22:58 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -29 +29 @@
 
 (defun the-end (x y)
-  (cond ((sys:fixnump x)
+  (cond ((sys::fixnump x)
    (unless (<= x (length y))
      (bad-seq-limit x))
@@ -38 +38 @@
 
 (defun the-start (x)
-  (cond ((sys:fixnump x)
+  (cond ((sys::fixnump x)
    (unless (>= x 0)
            (bad-seq-limit x))

trunk/j/src/org/armedbear/lisp/remove-duplicates.lisp

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: remove-duplicates.lisp,v 1.3 2003-07-02 18:20:29 piso Exp $
+;;; $Id: remove-duplicates.lisp,v 1.4 2003-08-25 18:22:58 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -85 +85 @@
       (setq index (1+ index))
       (setq jndex (1+ jndex)))
-    (sys:shrink-vector result jndex)))
+    (sys::shrink-vector result jndex)))
 
 

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

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: replace.lisp,v 1.2 2003-07-02 16:42:23 piso Exp $
+;;; $Id: replace.lisp,v 1.3 2003-08-25 18:22:58 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -28 +28 @@
 
 (defun the-end (x y)
-  (cond ((sys:fixnump x)
+  (cond ((sys::fixnump x)
    (unless (<= x (length y))
      (bad-seq-limit x))
@@ -37 +37 @@
 
 (defun the-start (x)
-  (cond ((sys:fixnump x)
+  (cond ((sys::fixnump x)
    (unless (>= x 0)
            (bad-seq-limit x))

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

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: search.lisp,v 1.13 2003-08-06 23:08:20 piso Exp $
+;;; $Id: search.lisp,v 1.14 2003-08-25 18:22:58 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 ;; From CMUCL.
 
-;; (defmacro compare-elements (elt1 elt2)
-;;   `(if test-not
-;;        (if (%compare-elements test-not key ,elt1 ,elt2)
-;;            (return nil)
-;;            t)
-;;        (if (%compare-elements test key ,elt1 ,elt2)
-;;            t
-;;            (return nil))))
 (defmacro compare-elements (elt1 elt2)
   `(if test-not

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

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: substitute.lisp,v 1.6 2003-08-06 19:17:17 piso Exp $
+;;; $Id: substitute.lisp,v 1.7 2003-08-25 18:22:58 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -27 +27 @@
 (defmacro real-count (count)
   `(cond ((null ,count) most-positive-fixnum)
-         ((sys:fixnump ,count) (if (minusp ,count) 0 ,count))
+         ((sys::fixnump ,count) (if (minusp ,count) 0 ,count))
          ((integerp ,count) (if (minusp ,count) 0 most-positive-fixnum))
          (t ,count)))