Refactor eplinear and eppow to pass the endpoint components directly

Author: pavpanchekha

ops/arith.rkt

@@ -15,31 +15,31 @@
          ival-hypot)
 
 ;; Endpoint computation for both `add`, `sub`, and `hypot` (which has an add inside)
-(define (eplinear bffn a-endpoint b-endpoint)
-  (match-define (endpoint a a!) a-endpoint)
-  (match-define (endpoint b b!) b-endpoint)
+(define (eplinear bffn a a! b b!)
   (define-values (val exact?) (bf-return-exact? bffn (list a b)))
-  (endpoint val (or (and a! b! exact?) (and a! (bfinfinite? a)) (and b! (bfinfinite? b)))))
+  (values val (or (and a! b! exact?) (and a! (bfinfinite? a)) (and b! (bfinfinite? b)))))
 
-(define (eplinear! out mpfr-fn! a-endpoint b-endpoint rnd)
-  (match-define (endpoint a a!) a-endpoint)
-  (match-define (endpoint b b!) b-endpoint)
+(define (eplinear! out mpfr-fn! a a! b b! rnd)
   (mpfr-set-prec! out (bf-precision))
   (define exact? (= 0 (mpfr-fn! out a b rnd)))
-  (endpoint out (or (and a! b! exact?) (and a! (bfinfinite? a)) (and b! (bfinfinite? b)))))
+  (values out (or (and a! b! exact?) (and a! (bfinfinite? a)) (and b! (bfinfinite? b)))))
 
 (define (ival-add! out x y)
-  (ival (eplinear! (ival-lo-val out) mpfr-add! (ival-lo x) (ival-lo y) 'down)
-        (eplinear! (ival-hi-val out) mpfr-add! (ival-hi x) (ival-hi y) 'up)
+  (define-values (lo-val lo-imm?) (eplinear! (ival-lo-val out) mpfr-add! (ival-lo-val x) (ival-lo-fixed? x) (ival-lo-val y) (ival-lo-fixed? y) 'down))
+  (define-values (hi-val hi-imm?) (eplinear! (ival-hi-val out) mpfr-add! (ival-hi-val x) (ival-hi-fixed? x) (ival-hi-val y) (ival-hi-fixed? y) 'up))
+  (ival (endpoint lo-val lo-imm?)
+        (endpoint hi-val hi-imm?)
         (or (ival-err? x) (ival-err? y))
         (or (ival-err x) (ival-err y))))
 
 (define (ival-add x y)
   (ival-add! (new-ival) x y))
 
 (define (ival-sub! out x y)
-  (ival (eplinear! (ival-lo-val out) mpfr-sub! (ival-lo x) (ival-hi y) 'down)
-        (eplinear! (ival-hi-val out) mpfr-sub! (ival-hi x) (ival-lo y) 'up)
+  (define-values (lo-val lo-imm?) (eplinear! (ival-lo-val out) mpfr-sub! (ival-lo-val x) (ival-lo-fixed? x) (ival-hi-val y) (ival-hi-fixed? y) 'down))
+  (define-values (hi-val hi-imm?) (eplinear! (ival-hi-val out) mpfr-sub! (ival-hi-val x) (ival-hi-fixed? x) (ival-lo-val y) (ival-lo-fixed? y) 'up))
+  (ival (endpoint lo-val lo-imm?)
+        (endpoint hi-val hi-imm?)
         (or (ival-err? x) (ival-err? y))
         (or (ival-err x) (ival-err y))))
 
@@ -158,7 +158,9 @@
   (define err (or (ival-err x) (ival-err y)))
   (define x* (ival-exact-fabs x))
   (define y* (ival-exact-fabs y))
-  (ival (rnd 'down eplinear bfhypot (ival-lo x*) (ival-lo y*))
-        (rnd 'up eplinear bfhypot (ival-hi x*) (ival-hi y*))
+  (define-values (lo-val lo-imm?) (rnd 'down eplinear bfhypot (ival-lo-val x*) (ival-lo-fixed? x*) (ival-lo-val y*) (ival-lo-fixed? y*)))
+  (define-values (hi-val hi-imm?) (rnd 'up eplinear bfhypot (ival-hi-val x*) (ival-hi-fixed? x*) (ival-hi-val y*) (ival-hi-fixed? y*)))
+  (ival (endpoint lo-val lo-imm?)
+        (endpoint hi-val hi-imm?)
         err?
         err))

ops/pow.rkt

@@ -13,19 +13,17 @@
     [(and (< (mpfr-exp (ival-hi-val x)) 1) (not (bfinfinite? (ival-hi-val x)))) -1]
     [else 0]))
 
-(define (eppow a-endpoint b-endpoint a-class b-class)
-  (match-define (endpoint a a!) a-endpoint)
-  (match-define (endpoint b b!) b-endpoint)
+(define (eppow a a! b b! a-class b-class)
   (when (bfzero? a)
     (set! a 0.bf)) ; Handle (-0)^(-1)
   (define-values (val exact?) (bf-return-exact? bfexpt (list a b)))
-  (endpoint val
-            (or (and a! b! exact?)
-                (and a! (bf=? a 1.bf))
-                (and a! (bfzero? a) (not (= b-class 0)))
-                (and a! (bfinfinite? a) (not (= b-class 0)))
-                (and b! (bfzero? b))
-                (and b! (bfinfinite? b) (not (= a-class 0))))))
+  (values val
+          (or (and a! b! exact?)
+              (and a! (bf=? a 1.bf))
+              (and a! (bfzero? a) (not (= b-class 0)))
+              (and a! (bfinfinite? a) (not (= b-class 0)))
+              (and b! (bfzero? b))
+              (and b! (bfinfinite? b) (not (= a-class 0))))))
 
 (define (ival-copy-movability i1 i2)
   (ival (endpoint (ival-lo-val i1) (ival-lo-fixed? i2))
@@ -41,8 +39,8 @@
   (define y-class (classify-ival y))
 
   (define (mk-pow a b c d)
-    (match-define (endpoint lo lo!) (rnd 'down eppow a b x-class y-class))
-    (match-define (endpoint hi hi!) (rnd 'up eppow c d x-class y-class))
+    (define-values (lo lo!) (rnd 'down eppow (endpoint-val a) (endpoint-immovable? a) (endpoint-val b) (endpoint-immovable? b) x-class y-class))
+    (define-values (hi hi!) (rnd 'up eppow (endpoint-val c) (endpoint-immovable? c) (endpoint-val d) (endpoint-immovable? d) x-class y-class))
 
     (define-values (real-lo! real-hi!)
       (cond