mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-22 04:30:19 +02:00
Code Activity

Allow for inexact integers in quo, rem, and so on

Browse source 
* module/language/cps/types.scm (&integer): New helper definition.
  (quo, rem, mod): Fix to allow inexact integer results :(
  (even?): Allow inexact integer arguments.
This commit is contained in:
Andy Wingo 2019-12-09 21:08:43 +01:00
parent a1e88ebc12
commit 2178de4d38
1 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

53
module/language/cps/types.scm
View file

@ -1282,44 +1282,45 @@ minimum, and maximum."
(lambda (min max) (lambda (min max)
(define! result &f64 min max))))) (define! result &f64 min max)))))
(define &integer (logior &exact-integer &flonum))
(define-type-checker (quo a b) (define-type-checker (quo a b)
(and (check-type a &exact-integer -inf.0 +inf.0) (and (check-type a &integer -inf.0 +inf.0)
(check-type b &exact-integer -inf.0 +inf.0) (check-type b &integer -inf.0 +inf.0)
;; We only know that there will not be an exception if b is not ;; We only know that there will not be an exception if b is not
;; zero. ;; zero.
(not (<= (&min b) 0 (&max b))))) (not (<= (&min b) 0 (&max b)))))
(define-type-inferrer (quo a b result) (define-type-inferrer (quo a b result)
(restrict! a &exact-integer -inf.0 +inf.0) (restrict! a &integer -inf.0 +inf.0)
(restrict! b &exact-integer -inf.0 +inf.0) (restrict! b &integer -inf.0 +inf.0)
(define! result &exact-integer -inf.0 +inf.0)) (define! result (logand (logior (&type a) (&type b)) &integer)
-inf.0 +inf.0))
(define-type-checker-aliases quo rem) (define-type-checker-aliases quo rem)
(define-type-inferrer (rem a b result) (define-type-inferrer (rem a b result)
(restrict! a &exact-integer -inf.0 +inf.0) (restrict! a &integer -inf.0 +inf.0)
(restrict! b &exact-integer -inf.0 +inf.0) (restrict! b &integer -inf.0 +inf.0)
;; Same sign as A. ;; Same sign as A.
(let ((max-abs-rem (1- (max (abs (&min b)) (abs (&max b)))))) (let* ((max-abs-rem (1- (max (abs (&min b)) (abs (&max b)))))
(cond (t (logand (logior (&type a) (&type b)) &integer))
((< (&min a) 0) (min-rem (if (< (&min a) 0) (- max-abs-rem) 0))
(define-exact-integer! result (max-rem (if (< 0 (&max a)) max-abs-rem 0)))
(- max-abs-rem) (if (type<=? t &exact-integer)
(if (< 0 (&max a)) max-abs-rem 0))) (define-exact-integer! result min-rem max-rem)
(else (define! result t min-rem max-rem))))
(define-exact-integer! result 0 max-abs-rem)))))
(define-type-checker-aliases quo mod) (define-type-checker-aliases quo mod)
(define-type-inferrer (mod a b result) (define-type-inferrer (mod a b result)
(restrict! a &exact-integer -inf.0 +inf.0) (restrict! a &integer -inf.0 +inf.0)
(restrict! b &exact-integer -inf.0 +inf.0) (restrict! b &integer -inf.0 +inf.0)
;; Same sign as B. ;; Same sign as B.
(let ((max-abs-mod (1- (max (abs (&min b)) (abs (&max b)))))) (let* ((max-abs-mod (1- (max (abs (&min b)) (abs (&max b)))))
(cond (t (logand (logior (&type a) (&type b)) &integer))
((< (&min b) 0) (min-mod (if (< (&min b) 0) (- max-abs-mod) 0))
(define-exact-integer! result (max-mod (if (< 0 (&max b)) max-abs-mod 0)))
(- max-abs-mod) (if (type<=? t &exact-integer)
(if (< 0 (&max b)) max-abs-mod 0))) (define-exact-integer! result min-mod max-mod)
(else (define! result t min-mod max-mod))))
(define-exact-integer! result 0 max-abs-mod)))))
;; Predicates. ;; Predicates.
(define-syntax-rule (define-type-predicate-result val result type) (define-syntax-rule (define-type-predicate-result val result type)
@ -1353,7 +1354,7 @@ minimum, and maximum."
(define-type-aliases inf? nan?) (define-type-aliases inf? nan?)
(define-simple-type (even? &exact-integer) (define-simple-type (even? &integer)
(&special-immediate &false &true)) (&special-immediate &false &true))
(define-type-aliases even? odd?) (define-type-aliases even? odd?)