Changeset 12951

Timestamp:

10/04/10 13:11:12 (12 years ago)

Author:

ehuelsmann

Message:

Signal a condition when coercing a Ratio to any float type or when
coercing a double-float to a single-float where the original value
is too big to fit the target type.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Ratio.java (modified) (2 diffs)
• SingleFloat.java (modified) (1 diff)

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

@@ -182 +182 @@
     public float floatValue()
     {
+        float result = (float) doubleValue();
+        if (Float.isInfinite(result) && TRAP_OVERFLOW)
+            type_error(this, Symbol.SINGLE_FLOAT);
+
         return (float) doubleValue();
     }
@@ -218 +222 @@
             d = d.shiftRight(1);
         }
+        if (Double.isInfinite(result) && TRAP_OVERFLOW)
+            type_error(this, Symbol.DOUBLE_FLOAT);
+
         return negative ? -result : result;
     }

trunk/abcl/src/org/armedbear/lisp/SingleFloat.java

@@ -630 +630 @@
         if (obj instanceof SingleFloat)
             return (SingleFloat) obj;
-        if (obj instanceof DoubleFloat)
-            return new SingleFloat((float)((DoubleFloat)obj).value);
+        if (obj instanceof DoubleFloat) {
+            float result = (float)((DoubleFloat)obj).value;
+            if (Float.isInfinite(result) && TRAP_OVERFLOW)
+                type_error(obj, Symbol.SINGLE_FLOAT);
+
+            return new SingleFloat(result);
+        }
         if (obj instanceof Bignum)
             return new SingleFloat(((Bignum)obj).floatValue());