Changeset 3648

Timestamp:

09/10/03 13:48:42 (20 years ago)

Author:

piso

Message:

Moved LOGAND, LOGIOR, LOGNOT, LOGBITP to LogicalOperations?.java.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Autoload.java (modified) (2 diffs)
• Primitives.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.52 2003-09-09 23:17:27 piso Exp $
+ * $Id: Autoload.java,v 1.53 2003-09-10 13:48:42 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -176 +176 @@
         autoload("import", "PackageFunctions");
         autoload("list-all-packages", "PackageFunctions");
+        autoload("logand", "LogicalOperations");
+        autoload("logbitp", "LogicalOperations");
+        autoload("logior", "LogicalOperations");
+        autoload("lognot", "LogicalOperations");
         autoload("make-string-output-stream", "StringOutputStream");
         autoload("namestring", "Pathname");

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.381 2003-09-10 00:58:14 piso Exp $
+ * $Id: Primitives.java,v 1.382 2003-09-10 13:48:14 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -4388 +4388 @@
     };
 
-    // ### logand
-    // logand &rest integers => result-integer
-    private static final Primitive LOGAND = new Primitive("logand") {
-        public LispObject execute(LispObject first, LispObject second)
-            throws LispError
-        {
-            if (first instanceof Fixnum && second instanceof Fixnum) {
-                return new Fixnum(((Fixnum)first).getValue() &
-                                  ((Fixnum)second).getValue());
-            } else {
-                BigInteger n1, n2;
-                if (first instanceof Fixnum)
-                    n1 = ((Fixnum)first).getBigInteger();
-                else if (first instanceof Bignum)
-                    n1 = ((Bignum)first).getValue();
-                else
-                    throw new TypeError(first, "integer");
-                if (second instanceof Fixnum)
-                    n2 = ((Fixnum)second).getBigInteger();
-                else if (second instanceof Bignum)
-                    n2 = ((Bignum)second).getValue();
-                else
-                    throw new TypeError(second, "integer");
-                return number(n1.and(n2));
-            }
-        }
-        public LispObject execute(LispObject[] args) throws LispError
-        {
-            BigInteger result = BigInteger.valueOf(-1);
-            for (int i = 0; i < args.length; i++) {
-                BigInteger n;
-                if (args[i] instanceof Fixnum)
-                    n = ((Fixnum)args[i]).getBigInteger();
-                else if (args[i] instanceof Bignum)
-                    n = ((Bignum)args[i]).getValue();
-                else
-                    throw new TypeError(args[i], "integer");
-                result = result.and(n);
-            }
-            return number(result);
-        }
-    };
-
-    // ### logior
-    // logior &rest integers => result-integer
-    private static final Primitive LOGIOR = new Primitive("logior") {
-        public LispObject execute(LispObject[] args) throws LispError
-        {
-            BigInteger result = BigInteger.ZERO;
-            for (int i = 0; i < args.length; i++) {
-                BigInteger n;
-                if (args[i] instanceof Fixnum)
-                    n = ((Fixnum)args[i]).getBigInteger();
-                else if (args[i] instanceof Bignum)
-                    n = ((Bignum)args[i]).getValue();
-                else
-                    throw new TypeError(args[i], "integer");
-                result = result.or(n);
-            }
-            return number(result);
-        }
-    };
-
-    // ### lognot
-    private static final Primitive1 LOGNOT = new Primitive1("lognot") {
-        public LispObject execute(LispObject arg) throws LispError
-        {
-            if (arg instanceof Fixnum)
-                return number(~((Fixnum)arg).getValue());
-            if (arg instanceof Bignum)
-                return number(((Bignum)arg).getValue().not());
-            throw new TypeError(arg, "integer");
-        }
-    };
-
-    // ### logbitp
-    // logbitp index integer => generalized-boolean
-    private static final Primitive2 LOGBITP = new Primitive2("logbitp") {
-        public LispObject execute(LispObject first, LispObject second)
-            throws LispError
-        {
-            int index = -1;
-            if (first instanceof Fixnum) {
-                index = ((Fixnum)first).getValue();
-            } else if (first instanceof Bignum) {
-                // FIXME If the number is really that big, we're not checking
-                // the right bit...
-                if (((Bignum)first).getValue().signum() > 0)
-                    index = Integer.MAX_VALUE;
-            }
-            if (index < 0)
-                throw new TypeError(first, "non-negative integer");
-            BigInteger n;
-            if (second instanceof Fixnum)
-                n = ((Fixnum)second).getBigInteger();
-            else if (second instanceof Bignum)
-                n = ((Bignum)second).getValue();
-            else
-                throw new TypeError(second, "integer");
-            // FIXME See above.
-            if (index == Integer.MAX_VALUE)
-                return n.signum() < 0 ? T : NIL;
-            return n.testBit(index) ? T : NIL;
-        }
-    };
-
     // ### list
     private static final Primitive LIST = new Primitive("list") {