Move stuff from calp/util to hnh/util.

This is the first (major) step in splitting the generally useful items
into its own library.

35 files changed, 58 insertions, 58 deletions

diff --git a/module/c/cpp.scm b/module/c/cpp.scm
index 070ea4f6..c782e468 100644
--- a/module/c/cpp.scm
+++ b/module/c/cpp.scm
@@ -1,13 +1,13 @@
 (define-module (c cpp)
-  :use-module (calp util)
+  :use-module (hnh 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 ((calp util io) :select (read-lines))
-  :use-module (calp util graph)
+  :use-module ((hnh util io) :select (read-lines))
+  :use-module (hnh 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 bef7e66d..3e3d8024 100644
--- a/module/c/parse.scm
+++ b/module/c/parse.scm
@@ -1,5 +1,5 @@
 (define-module (c parse)
-  :use-module (calp util)
+  :use-module (hnh 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 2d7c7b18..f1ddf17d 100644
--- a/module/calp/benchmark/parse.scm
+++ b/module/calp/benchmark/parse.scm
@@ -1,5 +1,5 @@
 (define-module (calp benchmark parse)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (glob)
   :use-module (statprof)
 
diff --git a/module/calp/entry-points/benchmark.scm b/module/calp/entry-points/benchmark.scm
index 152a398c..5db9b9df 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 (calp util)
+  :use-module (hnh util)
 
   :use-module (ice-9 getopt-long)
-  :use-module (calp util options)
+  :use-module (hnh util options)
   :use-module ((srfi srfi-41) :select (stream->list))
 
   :use-module ((vcomponent util instance methods) :select (get-event-set))
diff --git a/module/calp/entry-points/convert.scm b/module/calp/entry-points/convert.scm
index f05b1e7b..3f602b07 100644
--- a/module/calp/entry-points/convert.scm
+++ b/module/calp/entry-points/convert.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points convert)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (ice-9 getopt-long)
   :use-module (sxml simple)
   )
diff --git a/module/calp/entry-points/html.scm b/module/calp/entry-points/html.scm
index 45e71947..adac302f 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 (calp util)
+  :use-module (hnh util)
   :use-module (calp util time)
-  :use-module (calp util options)
+  :use-module (hnh util options)
   :use-module (datetime)
   :use-module (ice-9 getopt-long)
   :use-module ((ice-9 regex) :select (string-match regexp-substitute))
diff --git a/module/calp/entry-points/ical.scm b/module/calp/entry-points/ical.scm
index 0ac01b17..938b0b35 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 (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (vcomponent formats 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 69c5b687..441ff527 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 (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh 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 8885f38d..c9ff339a 100644
--- a/module/calp/entry-points/server.scm
+++ b/module/calp/entry-points/server.scm
@@ -1,6 +1,6 @@
 (define-module (calp entry-points server)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :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 5aaa1f2d..b0be318c 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 (calp util options)
+  :use-module (hnh util options)
   )
 
 (define options
diff --git a/module/calp/entry-points/text.scm b/module/calp/entry-points/text.scm
index 6da524ae..0a5744b3 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 (calp util io)
-  :use-module (calp util options)
+  :use-module (hnh util io)
+  :use-module (hnh util options)
   )
 
 
diff --git a/module/calp/entry-points/tidsrapport.scm b/module/calp/entry-points/tidsrapport.scm
index abdd7aa2..5ff43cf7 100644
--- a/module/calp/entry-points/tidsrapport.scm
+++ b/module/calp/entry-points/tidsrapport.scm
@@ -39,8 +39,8 @@
 
 (define-module (calp entry-points tidsrapport)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
   )
@@ -52,7 +52,7 @@
              (datetime)
              (vcomponent util instance)
              (vcomponent util instance methods)
-             (calp util)
+             (hnh util)
              (ice-9 regex)
              (ice-9 popen)
              )
diff --git a/module/calp/html/caltable.scm b/module/calp/html/caltable.scm
index 2f5a6d31..dd2d4b03 100644
--- a/module/calp/html/caltable.scm
+++ b/module/calp/html/caltable.scm
@@ -1,5 +1,5 @@
 (define-module (calp html caltable)
-  :use-module (calp util)
+  :use-module (hnh 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 36ec5166..2f8c85ec 100644
--- a/module/calp/html/components.scm
+++ b/module/calp/html/components.scm
@@ -1,5 +1,5 @@
 (define-module (calp html components)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (ice-9 curried-definitions)
   :use-module (ice-9 match)
   :export (xhtml-doc)
diff --git a/module/calp/html/config.scm b/module/calp/html/config.scm
index 081777ac..6bd1e0ec 100644
--- a/module/calp/html/config.scm
+++ b/module/calp/html/config.scm
@@ -1,5 +1,5 @@
 (define-module (calp html config)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (calp util config)
   )
 
diff --git a/module/calp/html/util.scm b/module/calp/html/util.scm
index 40852279..ecb54198 100644
--- a/module/calp/html/util.scm
+++ b/module/calp/html/util.scm
@@ -1,5 +1,5 @@
 (define-module (calp html util)
-  :use-module (calp util))
+  :use-module (hnh util))
 
 
 (define-public (date-link date)
diff --git a/module/calp/html/vcomponent.scm b/module/calp/html/vcomponent.scm
index 2abf370d..34aeca66 100644
--- a/module/calp/html/vcomponent.scm
+++ b/module/calp/html/vcomponent.scm
@@ -1,5 +1,5 @@
 (define-module (calp html vcomponent)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module ((rnrs io ports) :select (put-bytevector))
@@ -10,7 +10,7 @@
   :use-module (calp html util)
   :use-module ((calp html config) :select (edit-mode debug))
   :use-module ((calp html components) :select (btn tabset form with-label))
-  :use-module ((calp util color) :select (calculate-fg-color))
+  :use-module ((hnh util color) :select (calculate-fg-color))
   :use-module ((crypto) :select (sha256 checksum->string))
   :use-module ((xdg basedir) :prefix xdg-)
   :use-module ((vcomponent recurrence) :select (repeating?))
diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm
index 64fafb3d..ecdce291 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 (calp util)
+  :use-module (hnh util)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
                :select (events-between))
diff --git a/module/calp/html/view/calendar/month.scm b/module/calp/html/view/calendar/month.scm
index 6506b0ea..2b4c888a 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 (calp util)
+  :use-module (hnh 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 badea7b9..de09e00a 100644
--- a/module/calp/html/view/calendar/shared.scm
+++ b/module/calp/html/view/calendar/shared.scm
@@ -1,6 +1,6 @@
 (define-module (calp html view calendar shared)
-  :use-module (calp util)
-  :use-module ((calp util exceptions) :select (assert))
+  :use-module (hnh util)
+  :use-module ((hnh util exceptions) :select (assert))
   :use-module (srfi srfi-1)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
@@ -9,7 +9,7 @@
                         event-length/clamped))
   :use-module ((vcomponent datetime output)
                :select (format-summary))
-  :use-module (calp util tree)
+  :use-module (hnh 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 1714c6c4..5b12a351 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 (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (rnrs records syntactic)
diff --git a/module/calp/html/view/search.scm b/module/calp/html/view/search.scm
index b939e7a2..b6f36612 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 (calp util)
+  :use-module (hnh util)
   :use-module (vcomponent)
   :use-module (vcomponent util search)
   :use-module ((ice-9 pretty-print) :select (pretty-print))
diff --git a/module/calp/main.scm b/module/calp/main.scm
index 770be556..d1e33d55 100644
--- a/module/calp/main.scm
+++ b/module/calp/main.scm
@@ -1,16 +1,16 @@
 ;; -*- geiser-scheme-implementation: guile -*-
 (define-module (calp main)
-  :use-module (calp util)
+  :use-module (hnh util)
 
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-88)             ; keyword syntax
 
   :use-module ((calp util config) :select (set-config! get-config get-configuration-documentation))
-  :use-module (calp util options)
+  :use-module (hnh util options)
   :use-module ((calp util hooks) :select (shutdown-hook))
 
   :use-module ((text markup) :select (sxml->ansi-text))
-  :use-module ((calp util exceptions) :select (filter-stack))
+  :use-module ((hnh util exceptions) :select (filter-stack))
 
   :use-module (ice-9 getopt-long)
   :use-module (ice-9 regex)
@@ -215,7 +215,7 @@
       ;; (define path (read-line pipe))
       (define line ((@ (ice-9 rdelim) read-line) pipe))
       (define names (string-split line #\space))
-      ((@ (calp util io) with-atomic-output-to-file)
+      ((@ (hnh util io) with-atomic-output-to-file)
        (path-append (xdg-data-home) "/calp/zoneinfo.scm")
        (lambda ()
          (write `(set-config! 'tz-list ',names)) (newline)
diff --git a/module/calp/repl.scm b/module/calp/repl.scm
index 0765b65c..e25c2649 100644
--- a/module/calp/repl.scm
+++ b/module/calp/repl.scm
@@ -6,7 +6,7 @@
   :use-module (system repl server)
   :use-module (ice-9 regex)
   :use-module ((calp util hooks) :select (shutdown-hook))
-  :use-module ((calp util exceptions) :select (warning))
+  :use-module ((hnh util exceptions) :select (warning))
   )
 
 (define-public (repl-start address)
diff --git a/module/calp/server/routes.scm b/module/calp/server/routes.scm
index a435bbc0..b53e1cad 100644
--- a/module/calp/server/routes.scm
+++ b/module/calp/server/routes.scm
@@ -1,7 +1,7 @@
 (define-module (calp server routes)
-  :use-module (calp util)
-  :use-module (calp util options)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util options)
+  :use-module (hnh util exceptions)
 
   :use-module (srfi srfi-1)
 
diff --git a/module/calp/server/server.scm b/module/calp/server/server.scm
index ae2117ab..fc185033 100644
--- a/module/calp/server/server.scm
+++ b/module/calp/server/server.scm
@@ -1,5 +1,5 @@
 (define-module (calp server server)
-  :use-module (calp util)
+  :use-module (hnh 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 1014b94c..cd1d0c9d 100644
--- a/module/calp/terminal.scm
+++ b/module/calp/terminal.scm
@@ -4,7 +4,7 @@
   #:use-module (srfi srfi-17)
   #:use-module (srfi srfi-26)
   #:use-module ((srfi srfi-41) :select (stream-car))
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:use-module (vulgar)
   #:use-module (vulgar info)
   #:use-module (vulgar color)
diff --git a/module/calp/util/config.scm b/module/calp/util/config.scm
index fbe35d59..2fe2b9b0 100644
--- a/module/calp/util/config.scm
+++ b/module/calp/util/config.scm
@@ -5,7 +5,7 @@
 ;;; Code:
 
 (define-module (calp util config)
-  :use-module (calp util)
+  :use-module (hnh 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/calp/util.scm b/module/hnh/util.scm
index e1e2131a..0b22555b 100644
--- a/module/calp/util.scm
+++ b/module/hnh/util.scm
@@ -1,4 +1,4 @@
-(define-module (calp util)
+(define-module (hnh 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/calp/util/color.scm b/module/hnh/util/color.scm
index 161e6707..b626316d 100644
--- a/module/calp/util/color.scm
+++ b/module/hnh/util/color.scm
@@ -1,4 +1,4 @@
-(define-module (calp util color)
+(define-module (hnh util color)
   )
 
 ;; Returns a color with good contrast to the given background color.
diff --git a/module/calp/util/exceptions.scm b/module/hnh/util/exceptions.scm
index d9df30ed..fef0f1b5 100644
--- a/module/calp/util/exceptions.scm
+++ b/module/hnh/util/exceptions.scm
@@ -1,6 +1,6 @@
-(define-module (calp util exceptions)
+(define-module (hnh util exceptions)
   #:use-module (srfi srfi-1)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:use-module (calp util config)
   #:use-module (ice-9 format)
 
diff --git a/module/calp/util/graph.scm b/module/hnh/util/graph.scm
index 6a01a9ee..912f9612 100644
--- a/module/calp/util/graph.scm
+++ b/module/hnh/util/graph.scm
@@ -4,8 +4,8 @@
 ;; order on symbols in scheme.
 ;;; Code:
 
-(define-module (calp util graph)
-  :use-module (calp util)
+(define-module (hnh util graph)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9 gnu))
 
diff --git a/module/calp/util/io.scm b/module/hnh/util/io.scm
index 7db1eee2..04e54a9e 100644
--- a/module/calp/util/io.scm
+++ b/module/hnh/util/io.scm
@@ -1,4 +1,4 @@
-(define-module (calp util io)
+(define-module (hnh util io)
   :use-module ((ice-9 rdelim) :select (read-line)))
 
 (define-public (open-input-port str)
diff --git a/module/calp/util/options.scm b/module/hnh/util/options.scm
index 20263c45..57473816 100644
--- a/module/calp/util/options.scm
+++ b/module/hnh/util/options.scm
@@ -1,5 +1,5 @@
-(define-module (calp util options)
-  :use-module (calp util)
+(define-module (hnh util options)
+  :use-module (hnh util)
   :use-module (ice-9 match)
   :use-module (srfi srfi-1)
   :use-module (text markup)
diff --git a/module/calp/util/tree.scm b/module/hnh/util/tree.scm
index b7856aa9..6c4f765d 100644
--- a/module/calp/util/tree.scm
+++ b/module/hnh/util/tree.scm
@@ -1,6 +1,6 @@
-(define-module (calp util tree)
+(define-module (hnh util tree)
   #:use-module (srfi srfi-1)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:export (make-tree left-subtree
                       right-subtree
                       length-of-longst-branch