Changeset 3761

Timestamp:

09/14/03 15:33:05 (19 years ago)

Author:

piso

Message:

numberp()

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Bignum.java (modified) (4 diffs)
• Complex.java (modified) (3 diffs)
• Fixnum.java (modified) (4 diffs)
• LispFloat.java (modified) (2 diffs)
• LispObject.java (modified) (2 diffs)
• Primitives.java (modified) (2 diffs)
• Ratio.java (modified) (3 diffs)
• coerce.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Bignum.java,v 1.37 2003-09-14 15:08:42 piso Exp $
+ * $Id: Bignum.java,v 1.38 2003-09-14 15:33:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -70 +70 @@
     }
 
+    public boolean numberp()
+    {
+        return true;
+    }
+
     public boolean integerp()
     {
@@ -267 +272 @@
         if (obj instanceof LispFloat)
             return floatValue() == ((LispFloat)obj).getValue();
-        if ((obj.getType() & TYPE_NUMBER) != 0)
+        if (obj.numberp())
             return false;
         throw new TypeError(obj, "number");
@@ -278 +283 @@
         if (obj instanceof LispFloat)
             return floatValue() != ((LispFloat)obj).getValue();
-        if ((obj.getType() & TYPE_NUMBER) != 0)
+        if (obj.numberp())
             return true;
         throw new TypeError(obj, "number");

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Complex.java,v 1.17 2003-09-14 15:11:07 piso Exp $
+ * $Id: Complex.java,v 1.18 2003-09-14 15:33:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -81 +81 @@
     }
 
+    public boolean numberp()
+    {
+        return true;
+    }
+
     public boolean eql(LispObject obj)
     {
@@ -175 +180 @@
                     imagpart.isEqualTo(c.imagpart));
         }
-        if ((obj.getType() & TYPE_NUMBER) != 0) {
+        if (obj.numberp()) {
             // obj is a number, but not complex.
             if (imagpart instanceof LispFloat) {

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Fixnum.java,v 1.63 2003-09-14 15:07:41 piso Exp $
+ * $Id: Fixnum.java,v 1.64 2003-09-14 15:33:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -77 +77 @@
     {
         return T;
+    }
+
+    public boolean numberp()
+    {
+        return true;
     }
 
@@ -335 +340 @@
         if (obj instanceof Complex)
             return obj.isEqualTo(this);
-        if ((obj.getType() & TYPE_NUMBER) != 0)
+        if (obj.numberp())
             return false;
         throw new TypeError(obj, "number");
@@ -349 +354 @@
         if (obj instanceof Complex)
             return obj.isNotEqualTo(this);
-        if ((obj.getType() & TYPE_NUMBER) != 0)
+        if (obj.numberp())
             return true;
         throw new TypeError(obj, "number");

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: LispFloat.java,v 1.39 2003-09-14 15:08:09 piso Exp $
+ * $Id: LispFloat.java,v 1.40 2003-09-14 15:33:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -71 +71 @@
     {
         return T;
+    }
+
+    public boolean numberp()
+    {
+        return true;
     }
 

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: LispObject.java,v 1.48 2003-09-14 15:07:02 piso Exp $
+ * $Id: LispObject.java,v 1.49 2003-09-14 15:33:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -184 +184 @@
     }
 
+    public boolean numberp()
+    {
+        return false;
+    }
+
     public LispObject ZEROP() throws TypeError
     {

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.391 2003-09-14 15:11:43 piso Exp $
+ * $Id: Primitives.java,v 1.392 2003-09-14 15:33:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -4669 +4669 @@
             if (arg instanceof Complex)
                 return ((Complex)arg).getRealPart();
-            if ((arg.getType() & TYPE_NUMBER) != 0)
+            if (arg.numberp())
                 return arg;
             throw new TypeError(arg, "number");

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Ratio.java,v 1.29 2003-09-14 15:09:05 piso Exp $
+ * $Id: Ratio.java,v 1.30 2003-09-14 15:33:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -83 +83 @@
     }
 
+    public boolean numberp()
+    {
+        return true;
+    }
+
     public boolean eql(LispObject obj)
     {
@@ -264 +269 @@
         if (obj instanceof LispFloat)
             return floatValue() == ((LispFloat)obj).getValue();
-        if ((obj.getType() & TYPE_NUMBER) != 0)
+        if (obj.numberp())
             return false;
         throw new TypeError(obj, "number");

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: coerce.java,v 1.5 2003-08-23 01:35:25 piso Exp $
+ * $Id: coerce.java,v 1.6 2003-09-14 15:33:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -51 +51 @@
             }
             if (second == Symbol.COMPLEX) {
-                if ((first.getType() & TYPE_NUMBER) != 0) {
+                if (first.numberp()) {
                     if (first instanceof LispFloat)
                         return Complex.getInstance(first, LispFloat.ZERO);