Changeset 25798 in project

Timestamp:

01/10/12 20:45:52 (9 years ago)

Author:

sjamaan

Message:

numbers: Check for finite numbers before trying to convert flonums to ratnums, so NaN doesn't get translated to 0.0 (reported by Felix, but with different symptoms so maybe not properly fixed yet)

Location:

release/4/numbers/trunk

Files:

• numbers.scm (modified) (1 diff)
• tests/numbers-test.scm (modified) (1 diff)

release/4/numbers/trunk/numbers.scm

@@ -1156 +1156 @@
     (FIX x)
     (FLO (cond
-          ((or (= x +inf) (= x -inf)) (bad-inexact 'inexact->exact x))
+          ((not (finite? x)) (bad-inexact 'inexact->exact x))
           ((%flo-integer? x) (%flo->integer x))
           (else (%flo->rat 'inexact->exact x))))

release/4/numbers/trunk/tests/numbers-test.scm

@@ -400 +400 @@
 
  (test "inexact->exact" (string->number "2589569785738035/1125899906842624") (inexact->exact 2.3))
+ (test-error "inexact->exact +inf" (inexact->exact +inf.0))
+ (test-error "inexact->exact -inf" (inexact->exact -inf.0))
+ (test-error "inexact->exact -NaN" (inexact->exact +nan.0))
  (test "expt" 16 (expt 2 4))
  (test-assert "expt" (show (expt 2 100)))