From 5f638cc7226119b399a958990886b3f48d793dec Mon Sep 17 00:00:00 2001
From: Abdulaziz Ghuloum <aghuloum@cs.indiana.edu>
Date: Fri, 30 Nov 2007 06:01:44 -0500
Subject: [PATCH] Fixes bug 172933: min and max don't know flonums

---
 scheme/ikarus.numerics.ss | 66 +++++++++++++++++++++++++++++++++++++++
 scheme/last-revision      |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/scheme/ikarus.numerics.ss b/scheme/ikarus.numerics.ss
index cad5716..2eda7c0 100644
--- a/scheme/ikarus.numerics.ss
+++ b/scheme/ikarus.numerics.ss
@@ -1153,6 +1153,11 @@
              (if ($fx> x y) x y)]
             [(bignum? y)
              (if (positive-bignum? y) y x)]
+            [(flonum? y) 
+             (let ([x ($fixnum->flonum x)]) 
+               (if ($fl>= y x) y x))]
+            [(ratnum? y) ;;; FIXME: optimize
+             (if (>= x y) x y)]
             [else (error 'max "not a number" y)])]
          [(bignum? x)
           (cond
@@ -1160,6 +1165,34 @@
              (if (positive-bignum? x) x y)]
             [(bignum? y)
              (if (bnbn> x y) x y)]
+            [(flonum? y) 
+             (let ([x (bignum->flonum x)]) 
+               (if ($fl>= y x) y x))]
+            [(ratnum? y) ;;; FIXME: optimize
+             (if (>= x y) x y)]
+            [else (error 'max "not a number" y)])]
+         [(flonum? x) 
+          (cond
+            [(flonum? y) 
+             (if ($fl>= x y) x y)]
+            [(fixnum? y) 
+             (let ([y ($fixnum->flonum y)]) 
+               (if ($fl>= y x) y x))]
+            [(bignum? y)
+             (let ([y (bignum->flonum y)]) 
+               (if ($fl>= y x) y x))]
+            [(ratnum? y)
+             ;;; FIXME: may be incorrect
+             (let ([y (ratnum->flonum y)])
+               (if ($fl>= y x) y x))]
+            [else (error 'max "not a number" y)])]
+         [(ratnum? x) 
+          (cond
+            [(or (fixnum? y) (bignum? y) (ratnum? y))
+             (if (>= x y) x y)]
+            [(flonum? y) 
+             (let ([x (ratnum->flonum x)])
+               (if ($fl>= x y) x y))]
             [else (error 'max "not a number" y)])]
          [else (error 'max "not a number" x)])]
       [(x y z . rest)
@@ -1183,6 +1216,11 @@
              (if ($fx> x y) y x)]
             [(bignum? y)
              (if (positive-bignum? y) x y)]
+            [(flonum? y) 
+             (let ([x ($fixnum->flonum x)]) 
+               (if ($fl>= y x) x y))]
+            [(ratnum? y) ;;; FIXME: optimize
+             (if (>= x y) y x)]
             [else (error 'min "not a number" y)])]
          [(bignum? x)
           (cond
@@ -1190,6 +1228,34 @@
              (if (positive-bignum? x) y x)]
             [(bignum? y)
              (if (bnbn> x y) y x)]
+            [(flonum? y) 
+             (let ([x (bignum->flonum x)]) 
+               (if ($fl>= y x) x y))]
+            [(ratnum? y) ;;; FIXME: optimize
+             (if (>= x y) y x)]
+            [else (error 'min "not a number" y)])]
+         [(flonum? x) 
+          (cond
+            [(flonum? y) 
+             (if ($fl>= x y) y x)]
+            [(fixnum? y) 
+             (let ([y ($fixnum->flonum y)]) 
+               (if ($fl>= y x) x y))]
+            [(bignum? y)
+             (let ([y (bignum->flonum y)]) 
+               (if ($fl>= y x) x y))]
+            [(ratnum? y)
+             ;;; FIXME: may be incorrect
+             (let ([y (ratnum->flonum y)])
+               (if ($fl>= y x) x y))]
+            [else (error 'min "not a number" y)])]
+         [(ratnum? x) 
+          (cond
+            [(or (fixnum? y) (bignum? y) (ratnum? y))
+             (if (>= x y) y x)]
+            [(flonum? y) 
+             (let ([x (ratnum->flonum x)])
+               (if ($fl>= x y) y x))]
             [else (error 'min "not a number" y)])]
          [else (error 'min "not a number" x)])]
       [(x y z . rest)
diff --git a/scheme/last-revision b/scheme/last-revision
index de439d0..8966a60 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1146
+1147