Changeset 3587

Timestamp:

09/06/03 14:09:11 (19 years ago)

Author:

piso

Message:

divideBy()

File:

• trunk/j/src/org/armedbear/lisp/Ratio.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Ratio.java,v 1.26 2003-09-05 14:30:55 piso Exp $
+ * $Id: Ratio.java,v 1.27 2003-09-06 14:09:11 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -231 +231 @@
     public LispObject divideBy(LispObject obj) throws LispError
     {
-        try {
-            if (obj instanceof Fixnum) {
-                BigInteger n = ((Fixnum)obj).getBigInteger();
-                return number(numerator, denominator.multiply(n));
-            }
-            if (obj instanceof Bignum) {
-                BigInteger n = ((Bignum)obj).getValue();
-                return number(numerator, denominator.multiply(n));
-            }
-            if (obj instanceof Ratio) {
-                BigInteger n = ((Ratio)obj).numerator;
-                BigInteger d = ((Ratio)obj).denominator;
-                return number(numerator.multiply(d), denominator.multiply(n));
-            }
-            if (obj instanceof LispFloat) {
-                return new LispFloat(floatValue() / ((LispFloat)obj).getValue());
-            }
-            throw new TypeError(obj, "number");
-        }
-        catch (ArithmeticException e) {
+        if (obj instanceof Fixnum) {
+            BigInteger n = ((Fixnum)obj).getBigInteger();
+            return number(numerator, denominator.multiply(n));
+        }
+        if (obj instanceof Bignum) {
+            BigInteger n = ((Bignum)obj).getValue();
+            return number(numerator, denominator.multiply(n));
+        }
+        if (obj instanceof Ratio) {
+            BigInteger n = ((Ratio)obj).numerator;
+            BigInteger d = ((Ratio)obj).denominator;
+            return number(numerator.multiply(d), denominator.multiply(n));
+        }
+        if (obj instanceof LispFloat) {
             if (obj.zerop())
                 throw new DivisionByZero();
-            throw new ArithmeticError(e.getMessage());
-        }
+            return new LispFloat(floatValue() / ((LispFloat)obj).getValue());
+        }
+        throw new TypeError(obj, "number");
     }