Use euclidean/ from division package as pointed out by Taylor.

Also fix typo.

diff --git a/src/runtime/primitive-arithmetic.scm b/src/runtime/primitive-arithmetic.scm
index 11e03ecdcbf6ef9103889dc7f6495c552b06e545..df2bdd3108368a7b8aa70186143c181ef739d5bd 100644 (file)
--- a/src/runtime/primitive-arithmetic.scm
+++ b/src/runtime/primitive-arithmetic.scm
@@ -170,41 +170,6 @@ USA.
           (values (+ q 1) (- x (* (+ q 1) y))))
          (else
           (values (- q 1) (- x (* (- q 1) y)))))))
-
-(define (euclidean/ n d)
-  (if (and (exact-integer? n) (exact-integer? d))
-      (cond ((and (negative? n) (negative? d))
-            (ceiling-/- n d))
-            ((negative? n)
-            (floor-/+ n d))
-            ((negative? d)
-             (let ((d (- 0 d)))
-               (values (- 0 (quotient n d))
-                      (remainder n d))))
-            (else
-            (values (quotient n d)
-                    (remainder n d))))
-      (let ((q
-            (if (negative? d)
-                (ceiling (/ n d))
-                (floor (/ n d)))))
-        (values q (- n (* d q))))))
-
-(define (floor-/+ n d)
-  (let ((n (- 0 n)))
-    (let ((q (quotient n d))
-         (r (remainder n d)))
-      (if (zero? r)
-          (values (- 0 q) r)
-          (values (- (- 0 q) 1) (- d r))))))
-
-(define (ceiling-/- n d)
-  (let ((n (- 0 n)) (d (- 0 d)))
-    (let ((q (quotient n d))
-         (r (remainder n d)))
-      (if (zero? r)
-          (values q r)
-          (values (+ q 1) (- d r))))))
 \f
 (define (fxif mask i j)
   (fxior (fxand mask i)

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 927c6380a37c443374be35859a11694000af02de..8e6aa938de75bf9917dc315b4c176816bbea5fa9 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -311,7 +311,6 @@ USA.
          fx>?                          ;SRFI-143
          fxabs                         ;SRFI-143
          fxand                         ;SRFI-143
-         fxandc
          fxarithmetic-shift            ;SRFI-143
          fxarithmetic-shift-right      ;SRFI-143
          fxbit-count                   ;SRFI-143