Move math package to math directory

coalton.asd

@@ -63,7 +63,8 @@
                              (:file "complex")
                              (:file "elementary")
                              (:file "dyadic")
-                             (:file "dual")))
+                             (:file "dual")
+                             (:file "package")))
                (:file "randomaccess")
                (:file "cell")
                (:file "tuple")

library/big-float/impl-default.lisp

@@ -352,7 +352,7 @@
         ((BFNegInf) (error "Cannot rationalize -Inf"))
         ((BFNaN) (error "Cannot rationalize NaN"))))
     (define (best-approx x)
-      (coalton-library/math/real::rational-approx (get-precision) x)))
+      (real-approx (get-precision) x)))
 
   (define-instance (Quantizable Big-Float)
     (define (proper x)
@@ -434,7 +434,7 @@
       ((BFInf) 0)
       (_ BFNaN))))
 
-(coalton-library/math/complex::%define-standard-complex-instances Big-Float)
+(complex::%define-standard-complex-instances Big-Float)
 
 (coalton-toplevel
   ;; SeriesSplit/SeriesResult could be extended to any ring (e.g. polynomials)

library/big-float/impl-sbcl.lisp

@@ -244,7 +244,7 @@
 
   (define-instance (Real Big-Float)
     (define (real-approx prec x)
-      (coalton-library/math/real::rational-approx prec x)))
+      (real-approx prec x)))
 
   (define-instance (Rational Big-Float)
     (define (to-fraction x)
@@ -269,7 +269,7 @@
           (/ (fromInt a) (fromInt b))
           (into (exact/ a b))))))
 
-(coalton-library/math/complex::%define-standard-complex-instances Big-Float)
+(complex::%define-standard-complex-instances Big-Float)
 
 (coalton-toplevel
 

library/big-float/package.lisp

@@ -6,11 +6,11 @@
   (:use #:coalton
         #:coalton-library/classes
         #:coalton-library/functions
-        #:coalton-library/math
-        #:coalton-library/math/integral)
+        #:coalton-library/math)
   (:import-from #:coalton-library/math/dyadic #:Dyadic)
   (:local-nicknames
    (#:dyadic #:coalton-library/math/dyadic)
+   (#:complex #:coalton-library/math/complex)
    (#:bits #:coalton-library/bits))
   (:export
    #:RoundingMode

library/list.lisp

@@ -10,7 +10,7 @@
   (:local-nicknames
    (#:cell #:coalton-library/cell)
    (#:iter #:coalton-library/iterator)
-   (#:arith #:coalton-library/math/arith))
+   (#:math #:coalton-library/math))
   (:export
    #:head
    #:tail
@@ -250,10 +250,10 @@
     "Returns the nth-cdr of a list."
     (cond ((null? l)
 	   Nil)
-	  ((arith:zero? n)
+	  ((math:zero? n)
 	   l)
 	  (True
-	   (nth-cdr (arith:1- n) (cdr l)))))
+	   (nth-cdr (math:1- n) (cdr l)))))
 
   (declare elemIndex (Eq :a => :a -> List :a -> Optional UFix))
   (define (elemIndex x xs)

library/math/package.lisp

@@ -0,0 +1,15 @@
+(uiop:define-package #:coalton-library/math
+  (:use-reexport
+   #:coalton-library/math/arith
+   #:coalton-library/math/num
+   #:coalton-library/math/bounded
+   #:coalton-library/math/conversions
+   #:coalton-library/math/fraction
+   #:coalton-library/math/integral
+   #:coalton-library/math/real
+   #:coalton-library/math/complex
+   #:coalton-library/math/elementary
+   #:coalton-library/math/dual))
+
+#+sb-package-locks
+(sb-ext:lock-package "COALTON-LIBRARY/MATH")

library/prelude.lisp

@@ -2,22 +2,6 @@
 ;;;;
 ;;;; Collections of packages
 
-(uiop:define-package #:coalton-library/math
-  (:use-reexport
-   #:coalton-library/math/arith
-   #:coalton-library/math/num
-   #:coalton-library/math/bounded
-   #:coalton-library/math/conversions
-   #:coalton-library/math/fraction
-   #:coalton-library/math/integral
-   #:coalton-library/math/real
-   #:coalton-library/math/complex
-   #:coalton-library/math/elementary
-   #:coalton-library/math/dual))
-
-#+sb-package-locks
-(sb-ext:lock-package "COALTON-LIBRARY/MATH")
-
 (uiop:define-package #:coalton-prelude
   (:use-reexport
    #:coalton-library/classes

library/seq.lisp

@@ -6,7 +6,7 @@
    #:coalton-library/classes)
   (:local-nicknames
    (#:types #:coalton-library/types)
-   (#:math #:coalton-library/math/integral)
+   (#:math #:coalton-library/math)
    (#:optional #:coalton-library/optional)
    (#:cell #:coalton-library/cell)
    (#:vector #:coalton-library/vector)

library/slice.lisp

@@ -4,8 +4,7 @@
    #:coalton-library/builtin
    #:coalton-library/functions
    #:coalton-library/classes
-   #:coalton-library/math/arith
-   #:coalton-library/math/integral)
+   #:coalton-library/math)
   (:local-nicknames
    (#:types #:coalton-library/types)
    (#:cell #:coalton-library/cell)