Move util modules into calp module..

35 files changed, 69 insertions, 69 deletions

diff --git a/module/c/cpp.scm b/module/c/cpp.scm
index 062e50f5..070ea4f6 100644
--- a/module/c/cpp.scm
+++ b/module/c/cpp.scm
@@ -1,13 +1,13 @@
 (define-module (c cpp)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 popen)
   :use-module (ice-9 match)
   :use-module (ice-9 regex)
   :use-module ((rnrs io ports) :select (call-with-port))
   :use-module (ice-9 pretty-print) ; used by one error handler
-  :use-module ((util io) :select (read-lines))
-  :use-module (util graph)
+  :use-module ((calp util io) :select (read-lines))
+  :use-module (calp util graph)
   :use-module (c lex)
   :use-module (c parse)
   :use-module (c operators)
diff --git a/module/c/parse.scm b/module/c/parse.scm
index 42f2c13a..bef7e66d 100644
--- a/module/c/parse.scm
+++ b/module/c/parse.scm
@@ -1,5 +1,5 @@
 (define-module (c parse)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 match)
   :export (parse-lexeme-tree))
diff --git a/module/calp/benchmark/parse.scm b/module/calp/benchmark/parse.scm
index e9bc509f..f1be66f5 100644
--- a/module/calp/benchmark/parse.scm
+++ b/module/calp/benchmark/parse.scm
@@ -1,5 +1,5 @@
 (define-module (calp benchmark parse)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (glob)
   :use-module (statprof)
 
diff --git a/module/calp/entry-points/benchmark.scm b/module/calp/entry-points/benchmark.scm
index 7706f6f0..851edc59 100644
--- a/module/calp/entry-points/benchmark.scm
+++ b/module/calp/entry-points/benchmark.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points benchmark)
-  :use-module (util)
+  :use-module (calp util)
 
   :use-module (ice-9 getopt-long)
-  :use-module (util options)
+  :use-module (calp util options)
   :use-module ((srfi srfi-41) :select (stream->list))
 
   :use-module ((vcomponent instance methods) :select (get-event-set))
diff --git a/module/calp/entry-points/html.scm b/module/calp/entry-points/html.scm
index 8c400e1d..39f00979 100644
--- a/module/calp/entry-points/html.scm
+++ b/module/calp/entry-points/html.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points html)
   :export (main)
-  :use-module (util)
-  :use-module (util time)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp util time)
+  :use-module (calp util options)
   :use-module (datetime)
   :use-module (ice-9 getopt-long)
   :use-module ((ice-9 regex) :select (string-match regexp-substitute))
@@ -91,7 +91,7 @@
   (define calendars (get-calendars global-event-object))
   (define events (get-event-set global-event-object))
 
-  ((@ (util time) report-time!) "html start")
+  ((@ (calp util time) report-time!) "html start")
 
   (create-files target-directory)
 
@@ -168,5 +168,5 @@
     [else
      (error "Unknown html style: ~a" style)])
 
-  ((@ (util time) report-time!) "all done")
+  ((@ (calp util time) report-time!) "all done")
   )
diff --git a/module/calp/entry-points/ical.scm b/module/calp/entry-points/ical.scm
index 0b6a0535..15e677b5 100644
--- a/module/calp/entry-points/ical.scm
+++ b/module/calp/entry-points/ical.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points ical)
   :export (main)
-  :use-module (util)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp util options)
   :use-module (vcomponent ical output)
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
diff --git a/module/calp/entry-points/import.scm b/module/calp/entry-points/import.scm
index e8c46ea8..f25e642f 100644
--- a/module/calp/entry-points/import.scm
+++ b/module/calp/entry-points/import.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points import)
   :export (main)
-  :use-module (util)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp util options)
   :use-module (ice-9 getopt-long)
   :use-module (ice-9 rdelim)
   :use-module (srfi srfi-1)
diff --git a/module/calp/entry-points/server.scm b/module/calp/entry-points/server.scm
index 87eaba1e..55f84c1a 100644
--- a/module/calp/entry-points/server.scm
+++ b/module/calp/entry-points/server.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points server)
-  :use-module (util)
-  :use-module (util options)
-  :use-module (util exceptions)
-  :use-module (util config)
+  :use-module (calp util)
+  :use-module (calp util options)
+  :use-module (calp util exceptions)
+  :use-module (calp util config)
 
   :use-module (srfi srfi-1)
 
diff --git a/module/calp/entry-points/terminal.scm b/module/calp/entry-points/terminal.scm
index fa035e7a..5aaa1f2d 100644
--- a/module/calp/entry-points/terminal.scm
+++ b/module/calp/entry-points/terminal.scm
@@ -5,7 +5,7 @@
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
   :use-module (vulgar)
-  :use-module (util options)
+  :use-module (calp util options)
   )
 
 (define options
diff --git a/module/calp/entry-points/text.scm b/module/calp/entry-points/text.scm
index 04f57a31..6da524ae 100644
--- a/module/calp/entry-points/text.scm
+++ b/module/calp/entry-points/text.scm
@@ -2,8 +2,8 @@
   :export (main)
   :use-module (text flow)
   :use-module (ice-9 getopt-long)
-  :use-module (util io)
-  :use-module (util options)
+  :use-module (calp util io)
+  :use-module (calp util options)
   )
 
 
diff --git a/module/calp/html/caltable.scm b/module/calp/html/caltable.scm
index 65a70252..2f5a6d31 100644
--- a/module/calp/html/caltable.scm
+++ b/module/calp/html/caltable.scm
@@ -1,5 +1,5 @@
 (define-module (calp html caltable)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (calp html util)
   :use-module (datetime)
   :use-module (srfi srfi-41)
diff --git a/module/calp/html/components.scm b/module/calp/html/components.scm
index 49f00e52..ebc359b8 100644
--- a/module/calp/html/components.scm
+++ b/module/calp/html/components.scm
@@ -1,6 +1,6 @@
 (define-module (calp html components)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :export (xhtml-doc)
   )
 
diff --git a/module/calp/html/config.scm b/module/calp/html/config.scm
index 6f156c98..081777ac 100644
--- a/module/calp/html/config.scm
+++ b/module/calp/html/config.scm
@@ -1,6 +1,6 @@
 (define-module (calp html config)
-  :use-module (util)
-  :use-module (util config)
+  :use-module (calp util)
+  :use-module (calp util config)
   )
 
 (define-public debug (make-parameter #f))
diff --git a/module/calp/html/util.scm b/module/calp/html/util.scm
index 8410472c..cd5aaeab 100644
--- a/module/calp/html/util.scm
+++ b/module/calp/html/util.scm
@@ -1,6 +1,6 @@
 (define-module (calp html util)
   :use-module ((base64) :select (base64encode base64decode))
-  :use-module (util))
+  :use-module (calp util))
 
 ;;; @var{html-attr} & @var{html-unattr} used to just strip any
 ;;; attributes not valid in css. That allowed a human reader to
diff --git a/module/calp/html/vcomponent.scm b/module/calp/html/vcomponent.scm
index be6b6166..3a2bd3cc 100644
--- a/module/calp/html/vcomponent.scm
+++ b/module/calp/html/vcomponent.scm
@@ -1,5 +1,5 @@
 (define-module (calp html vcomponent)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
@@ -7,7 +7,7 @@
   :use-module (calp html util)
   :use-module ((calp html config) :select (edit-mode))
   :use-module ((calp html components) :select (btn tabset))
-  :use-module ((util color) :select (calculate-fg-color))
+  :use-module ((calp util color) :select (calculate-fg-color))
   :use-module ((vcomponent datetime output)
                :select (fmt-time-span
                         format-description
diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm
index 67a1a7b5..27edfcb4 100644
--- a/module/calp/html/view/calendar.scm
+++ b/module/calp/html/view/calendar.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
                :select (events-between))
@@ -18,7 +18,7 @@
   :use-module (calp html util)
   :use-module ((calp html caltable) :select (cal-table))
 
-  :use-module (util config)
+  :use-module (calp util config)
 
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-26)
diff --git a/module/calp/html/view/calendar/month.scm b/module/calp/html/view/calendar/month.scm
index ce8957da..0ac69292 100644
--- a/module/calp/html/view/calendar/month.scm
+++ b/module/calp/html/view/calendar/month.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar month)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
diff --git a/module/calp/html/view/calendar/shared.scm b/module/calp/html/view/calendar/shared.scm
index 73698060..fb5eace5 100644
--- a/module/calp/html/view/calendar/shared.scm
+++ b/module/calp/html/view/calendar/shared.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar shared)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
@@ -8,7 +8,7 @@
                         event-length/clamped))
   :use-module ((vcomponent datetime output)
                :select (format-summary))
-  :use-module (util tree)
+  :use-module (calp util tree)
   :use-module (datetime)
   :use-module (calp html config)
   :use-module ((calp html components)
diff --git a/module/calp/html/view/calendar/week.scm b/module/calp/html/view/calendar/week.scm
index ca6aa9f8..111c8f21 100644
--- a/module/calp/html/view/calendar/week.scm
+++ b/module/calp/html/view/calendar/week.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar week)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (datetime)
diff --git a/module/calp/html/view/search.scm b/module/calp/html/view/search.scm
index faefe6dc..3141fa11 100644
--- a/module/calp/html/view/search.scm
+++ b/module/calp/html/view/search.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view search)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module (vcomponent search)
   :use-module ((ice-9 pretty-print) :select (pretty-print))
diff --git a/module/calp/main.scm b/module/calp/main.scm
index e336846a..39d8f625 100644
--- a/module/calp/main.scm
+++ b/module/calp/main.scm
@@ -1,13 +1,13 @@
 ;; -*- geiser-scheme-implementation: guile -*-
 (define-module (calp main)
-  :use-module (util)
+  :use-module (calp util)
 
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-88)             ; keyword syntax
 
-  :use-module ((util config) :select (set-config! get-config get-configuration-documentation))
-  :use-module (util options)
-  :use-module ((util hooks) :select (shutdown-hook))
+  :use-module ((calp util config) :select (set-config! get-config get-configuration-documentation))
+  :use-module (calp util options)
+  :use-module ((calp util hooks) :select (shutdown-hook))
 
   :use-module ((text markup) :select (sxml->ansi-text))
 
@@ -170,7 +170,7 @@
       ;; (define path (read-line pipe))
       (define line ((@ (ice-9 rdelim) read-line) pipe))
       (define names (string-split line #\space))
-      ((@ (util io) with-atomic-output-to-file)
+      ((@ (calp util io) with-atomic-output-to-file)
        (path-append (xdg-data-home) "/calp/zoneinfo.scm")
        (lambda ()
          (write `(set-config! 'tz-list ',names)) (newline)
@@ -207,7 +207,7 @@
                                  (string->symbol stprof)))))
 
 (define-public (main args)
-  ((@ (util time) report-time!) "Program start")
+  ((@ (calp util time) report-time!) "Program start")
   (dynamic-wind (lambda () 'noop)
                 (lambda () (catch 'return (lambda () (wrapped-main args)) values))
                 (lambda () (run-hook shutdown-hook))))
diff --git a/module/calp/repl.scm b/module/calp/repl.scm
index f43b8fce..d4f087aa 100644
--- a/module/calp/repl.scm
+++ b/module/calp/repl.scm
@@ -5,8 +5,8 @@
 (define-module (calp repl)
   :use-module (system repl server)
   :use-module (ice-9 regex)
-  :use-module ((util hooks) :select (shutdown-hook))
-  :use-module (util exceptions)
+  :use-module ((calp util hooks) :select (shutdown-hook))
+  :use-module (calp util exceptions)
   )
 
 (define-public (repl-start address)
diff --git a/module/calp/server/routes.scm b/module/calp/server/routes.scm
index 51e5acb2..f647b998 100644
--- a/module/calp/server/routes.scm
+++ b/module/calp/server/routes.scm
@@ -1,7 +1,7 @@
 (define-module (calp server routes)
-  :use-module (util)
-  :use-module (util options)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util options)
+  :use-module (calp util exceptions)
 
   :use-module (srfi srfi-1)
 
diff --git a/module/calp/server/server.scm b/module/calp/server/server.scm
index 1ad700f1..ae2117ab 100644
--- a/module/calp/server/server.scm
+++ b/module/calp/server/server.scm
@@ -1,5 +1,5 @@
 (define-module (calp server server)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (web server)
   :use-module ((calp server routes) :select (make-make-routes))
   :use-module (ice-9 threads))
diff --git a/module/calp/terminal.scm b/module/calp/terminal.scm
index fd513a63..7887df5e 100644
--- a/module/calp/terminal.scm
+++ b/module/calp/terminal.scm
@@ -5,7 +5,7 @@
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-41)
   #:use-module (srfi srfi-41 util)
-  #:use-module (util)
+  #:use-module (calp util)
   #:use-module (vulgar)
   #:use-module (vulgar info)
   #:use-module (vulgar color)
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