Changeset 3529

Timestamp:

08/26/03 16:18:01 (20 years ago)

Author:

piso

Message:

incr(), decr()

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Bignum.java (modified) (2 diffs)
• Complex.java (modified) (2 diffs)
• LispFloat.java (modified) (2 diffs)
• Ratio.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Bignum.java,v 1.26 2003-08-26 14:38:16 piso Exp $
+ * $Id: Bignum.java,v 1.27 2003-08-26 16:18:01 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -143 +143 @@
     public final LispObject incr()
     {
-        return new Bignum(value.add(BigInteger.ONE));
+        return number(value.add(BigInteger.ONE));
     }
 
     public final LispObject decr()
     {
-        return new Bignum(value.subtract(BigInteger.ONE));
+        return number(value.subtract(BigInteger.ONE));
     }
 

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Complex.java,v 1.10 2003-08-15 17:18:02 piso Exp $
+ * $Id: Complex.java,v 1.11 2003-08-26 16:17:20 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -97 +97 @@
     }
 
+    public final LispObject incr() throws LispError
+    {
+        return new Complex(realpart.add(Fixnum.ONE), imagpart);
+    }
+
+    public final LispObject decr() throws LispError
+    {
+        return new Complex(realpart.subtract(Fixnum.ONE), imagpart);
+    }
+
     public LispObject add(LispObject obj) throws LispError
     {

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: LispFloat.java,v 1.30 2003-08-26 14:38:16 piso Exp $
+ * $Id: LispFloat.java,v 1.31 2003-08-26 16:17:37 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -137 +137 @@
     {
         return value;
+    }
+
+    public final LispObject incr()
+    {
+        return new LispFloat(value + 1);
+    }
+
+    public final LispObject decr()
+    {
+        return new LispFloat(value - 1);
     }
 

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Ratio.java,v 1.21 2003-08-26 14:38:16 piso Exp $
+ * $Id: Ratio.java,v 1.22 2003-08-26 16:16:58 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -133 +133 @@
     {
         return numerator.floatValue() / denominator.floatValue();
+    }
+
+    public final LispObject incr() throws LispError
+    {
+        return new Ratio(numerator.add(denominator), denominator);
+    }
+
+    public final LispObject decr() throws LispError
+    {
+        return new Ratio(numerator.subtract(denominator), denominator);
     }