Move util modules into calp module..

10 files changed, 18 insertions, 18 deletions

diff --git a/module/util.scm b/module/calp/util.scm
index c1eaf6bf..25c753dc 100644
--- a/module/util.scm
+++ b/module/calp/util.scm
@@ -1,4 +1,4 @@
-(define-module (util)
+(define-module (calp util)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-88)           ; postfix keywords
   #:use-module ((ice-9 optargs) #:select (define*-public))
diff --git a/module/util/color.scm b/module/calp/util/color.scm
index 7b6dacec..161e6707 100644
--- a/module/util/color.scm
+++ b/module/calp/util/color.scm
@@ -1,4 +1,4 @@
-(define-module (util color)
+(define-module (calp util color)
   )
 
 ;; Returns a color with good contrast to the given background color.
diff --git a/module/util/config.scm b/module/calp/util/config.scm
index 29269ce5..32dabb69 100644
--- a/module/util/config.scm
+++ b/module/calp/util/config.scm
@@ -4,8 +4,8 @@
 
 ;;; Code:
 
-(define-module (util config)
-  :use-module (util)
+(define-module (calp util config)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 format) ; for format-procedure
   :use-module (ice-9 curried-definitions) ; for ensure
diff --git a/module/util/exceptions.scm b/module/calp/util/exceptions.scm
index f316451d..29e1472c 100644
--- a/module/util/exceptions.scm
+++ b/module/calp/util/exceptions.scm
@@ -1,7 +1,7 @@
-(define-module (util exceptions)
+(define-module (calp util exceptions)
   #:use-module (srfi srfi-1)
-  #:use-module (util)
-  #:use-module (util config)
+  #:use-module (calp util)
+  #:use-module (calp util config)
   #:use-module (ice-9 format)
   #:export (throw-returnable
             catch-multiple
@@ -82,7 +82,7 @@
   `(unless ,form
      (throw 'assertion-error "Assertion for ~a failed, ~a"
             (quote ,form)
-            ((@@ (util exceptions) prettify-tree) ,(cons 'list form)))))
+            ((@@ (calp util exceptions) prettify-tree) ,(cons 'list form)))))
 
 
 (define-syntax catch-warnings
diff --git a/module/util/graph.scm b/module/calp/util/graph.scm
index 999da743..6a01a9ee 100644
--- a/module/util/graph.scm
+++ b/module/calp/util/graph.scm
@@ -4,8 +4,8 @@
 ;; order on symbols in scheme.
 ;;; Code:
 
-(define-module (util graph)
-  :use-module (util)
+(define-module (calp util graph)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9 gnu))
 
diff --git a/module/util/hooks.scm b/module/calp/util/hooks.scm
index d4d44ec9..7a784085 100644
--- a/module/util/hooks.scm
+++ b/module/calp/util/hooks.scm
@@ -1,4 +1,4 @@
-(define-module (util hooks)
+(define-module (calp util hooks)
   :export (shutdown-hook))
 
 ;; Run before program terminates
diff --git a/module/util/io.scm b/module/calp/util/io.scm
index 50f01e12..7db1eee2 100644
--- a/module/util/io.scm
+++ b/module/calp/util/io.scm
@@ -1,4 +1,4 @@
-(define-module (util io)
+(define-module (calp util io)
   :use-module ((ice-9 rdelim) :select (read-line)))
 
 (define-public (open-input-port str)
@@ -52,7 +52,7 @@
         ;; thing.
         (delete-file tmpfile)
         (close-port port)
-        ;; `when' defaults to the truthy `()', see (util)
+        ;; `when' defaults to the truthy `()', see (calp util)
         ;; (note that #<unspecified> is thruthy, but shouldn't be
         ;; counted on, since anything with an unspecified return
         ;; value might as well return #f)
diff --git a/module/util/options.scm b/module/calp/util/options.scm
index a4c780bc..0e239a78 100644
--- a/module/util/options.scm
+++ b/module/calp/util/options.scm
@@ -1,5 +1,5 @@
-(define-module (util options)
-  :use-module (util)
+(define-module (calp util options)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
 )
 
diff --git a/module/util/time.scm b/module/calp/util/time.scm
index c97d3ee2..0a624d30 100644
--- a/module/util/time.scm
+++ b/module/calp/util/time.scm
@@ -1,4 +1,4 @@
-(define-module (util time)
+(define-module (calp util time)
   :use-module (ice-9 match)
   :export (report-time! profile!))
 
diff --git a/module/util/tree.scm b/module/calp/util/tree.scm
index 474dc272..b7856aa9 100644
--- a/module/util/tree.scm
+++ b/module/calp/util/tree.scm
@@ -1,6 +1,6 @@
-(define-module (util tree)
+(define-module (calp util tree)
   #:use-module (srfi srfi-1)
-  #:use-module (util)
+  #:use-module (calp util)
   #:export (make-tree left-subtree
                       right-subtree
                       length-of-longst-branch