Cleanup

Author: obround

ops/core.rkt

@@ -121,10 +121,12 @@
 (define (ival-hi-fixed? ival)
   (endpoint-immovable? (ival-hi ival)))
 
+(define (make-endpoint-pair)
+  (values (mpfr-new! (bf-precision)) (mpfr-new! (bf-precision))))
+
 (define (new-ival)
   ; Warning, leaks memory unless `mpfr-clear!` called eventually
-  (define bf1 (mpfr-new! (bf-precision)))
-  (define bf2 (mpfr-new! (bf-precision)))
+  (define-values (bf1 bf2) (make-endpoint-pair))
   (ival (endpoint bf1 #f) (endpoint bf2 #f) #f #f))
 
 (define (mk-big-ival x y)
@@ -147,15 +149,13 @@
   (ormap identity as))
 
 (define (ival-pi)
-  (define lo (mpfr-new! (bf-precision)))
-  (define hi (mpfr-new! (bf-precision)))
+  (define-values (lo hi) (make-endpoint-pair))
   (mpfr-const-pi! lo 'down)
   (mpfr-const-pi! hi 'up)
   (ival (endpoint lo #f) (endpoint hi #f) #f #f))
 
 (define (ival-e)
-  (define lo (mpfr-new! (bf-precision)))
-  (define hi (mpfr-new! (bf-precision)))
+  (define-values (lo hi) (make-endpoint-pair))
   (mpfr-exp! lo 1.bf 'down)
   (mpfr-exp! hi 1.bf 'up)
   (ival (endpoint lo #f) (endpoint hi #f) #f #f))
@@ -345,8 +345,7 @@
     [1 ((monotonic-mpfr mpfr-abs!) x)]
     [0
      (match-define (ival (endpoint xlo xlo!) (endpoint xhi xhi!) xerr? xerr) x)
-     (define tmp1 (mpfr-new! (bf-precision)))
-     (define tmp2 (mpfr-new! (bf-precision)))
+     (define-values (tmp1 tmp2) (make-endpoint-pair))
      (define abs-lo (epunary! tmp1 mpfr-abs! (ival-lo x) 'up))
      (define abs-hi (epunary! tmp2 mpfr-abs! (ival-hi x) 'up))
      (ival (endpoint (bf 0) (and xlo! xhi!)) (endpoint-max2 abs-lo abs-hi 'nearest) xerr? xerr)]))
@@ -355,20 +354,17 @@
 (define (ival-max-prec x)
   (max (bigfloat-precision (ival-lo-val x)) (bigfloat-precision (ival-hi-val x))))
 
-;; TODO: Cleanup, use begin1
 (define (ival-exact-fabs x)
   (define saved-prec (bf-precision))
   (bf-precision (ival-max-prec x))
-  (define result (ival-fabs x))
-  (bf-precision saved-prec)
-  result)
+  (begin0 (ival-fabs x)
+    (bf-precision saved-prec)))
 
 (define (ival-exact-neg x)
   (define saved-prec (bf-precision))
   (bf-precision (ival-max-prec x))
-  (define result (ival-neg x))
-  (bf-precision saved-prec)
-  result)
+  (begin0 (ival-neg x)
+    (bf-precision saved-prec)))
 
 ;; Since MPFR has a cap on exponents, no value can be more than twice MAX_VAL
 (define exp-overflow-threshold (bfadd (bflog (bfprev +inf.bf)) 1.bf))
@@ -422,8 +418,7 @@
   (define err (or (ival-err x) (ival-err y)))
 
   (define (mkatan a b c d)
-    (define lo-out (mpfr-new! (bf-precision)))
-    (define hi-out (mpfr-new! (bf-precision)))
+    (define-values (lo-out hi-out) (make-endpoint-pair))
     (ival (epbinary! lo-out mpfr-atan2! a b 'down) (epbinary! hi-out mpfr-atan2! c d 'up) err? err))
 
   (match* ((classify-ival-strict x) (classify-ival-strict y))
@@ -436,8 +431,7 @@
     [(-1 1) (mkatan yhi xhi ylo xlo)]
     [(_ 0)
      (define pi-int (ival-pi))
-     (define hi-out (mpfr-new! (bf-precision)))
-     (define lo-out (mpfr-new! (bf-precision)))
+     (define-values (hi-out lo-out) (make-endpoint-pair))
      (mpfr-set! hi-out (endpoint-val (ival-hi pi-int)) 'up)
      (mpfr-neg! lo-out (endpoint-val (ival-hi pi-int)) 'down)
      (ival (endpoint lo-out #f)

ops/pow.rkt

@@ -56,11 +56,11 @@
          ;; Can't use >=, even though exp2-overflow-threshold is a
          ;; power of 2, because mpfr-exp is offset by 1 from the real
          ;; exponent, which matters when we add them.
+
+         (define log2-base (mpfr-new! (bf-precision)))
          (define (log2-sum-exceeds-threshold? exponent-value base-value)
-           (let ([log2-base (mpfr-new! (bf-precision))])
-             (mpfr-log2! log2-base base-value 'zero)
-             (> (+ (mpfr-exp exponent-value) (mpfr-exp log2-base))
-                (mpfr-exp exp2-overflow-threshold))))
+           (mpfr-log2! log2-base base-value 'zero)
+           (> (+ (mpfr-exp exponent-value) (mpfr-exp log2-base)) (mpfr-exp exp2-overflow-threshold)))
 
          (define must-overflow
            (and (bfinfinite? hi) (= (* x-class y-class) 1) (log2-sum-exceeds-threshold? bval aval)))

ops/trig.rkt

@@ -105,7 +105,6 @@
       ['range-reduce
        (define prec (range-reduce-precision xlo xhi))
        (define divisor-bf (mpfr-new! prec))
-       (mpfr-set-prec! divisor-bf prec)
        (mpfr-set! divisor-bf (bf (/ n 2)) 'nearest)
        (match-define (ival (endpoint a _) (endpoint b _) _ _) (range-reduce-floor x divisor-bf prec))
        (define (mpfr-cosu-n! out a rnd)
@@ -145,7 +144,6 @@
     ['range-reduce
      (define prec (range-reduce-precision xlo xhi))
      (define pi-bf (mpfr-new! prec))
-     (mpfr-set-prec! pi-bf prec)
      (mpfr-const-pi! pi-bf 'nearest)
      (match-define (ival (endpoint a _) (endpoint b _) _ _) (range-reduce-floor x pi-bf prec))
      (cond
@@ -177,7 +175,6 @@
       ['range-reduce
        (define prec (range-reduce-precision xlo xhi))
        (define divisor-bf (mpfr-new! prec))
-       (mpfr-set-prec! divisor-bf prec)
        (mpfr-set! divisor-bf (bf (/ n 2)) 'nearest)
        (match-define (ival (endpoint a _) (endpoint b _) _ _) (range-reduce-round x divisor-bf prec))
        (cond
@@ -207,7 +204,6 @@
     ['range-reduce
      (define prec (range-reduce-precision xlo xhi))
      (define pi-bf (mpfr-new! prec))
-     (mpfr-set-prec! pi-bf prec)
      (mpfr-const-pi! pi-bf 'nearest)
      (match-define (ival (endpoint a _) (endpoint b _) _ _) (range-reduce-round x pi-bf prec))
      (cond
@@ -239,7 +235,6 @@
       ['range-reduce
        (define prec (range-reduce-precision xlo xhi))
        (define divisor-bf (mpfr-new! prec))
-       (mpfr-set-prec! divisor-bf prec)
        (mpfr-set! divisor-bf (bf (/ n 2)) 'nearest)
        (match-define (ival (endpoint a _) (endpoint b _) _ _) (range-reduce-round x divisor-bf prec))
 
@@ -257,7 +252,6 @@
     ['range-reduce
      (define prec (range-reduce-precision xlo xhi))
      (define pi-bf (mpfr-new! prec))
-     (mpfr-set-prec! pi-bf prec)
      (mpfr-const-pi! pi-bf 'nearest)
      (match-define (ival (endpoint a _) (endpoint b _) _ _) (range-reduce-round x pi-bf prec))