From e6f0df7910231b0132784a550885eb0d05b1d91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 26 Apr 2020 22:04:12 +0200
Subject: Remove use-modules*.

---
 module/entry-points/server.scm | 55 +++++++++++++++++++++++++++---------------
 module/server/macro.scm        |  5 ++--
 module/util.scm                |  9 -------
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/module/entry-points/server.scm b/module/entry-points/server.scm
index 8553da50..46277339 100644
--- a/module/entry-points/server.scm
+++ b/module/entry-points/server.scm
@@ -1,20 +1,35 @@
 (define-module (entry-points server)
-  :export (main)
   :use-module (util)
-  :use-module (vcomponent)
-  )
 
-(use-modules* (web (server request response uri))
-              (output (html))
-              (server (util macro))
-              (sxml (simple))
-              (ice-9 (match control rdelim curried-definitions ftw
-                            getopt-long
-                            iconv regex #| regex here due to bad macros |#  ))
-              (srfi (srfi-1 srfi-88)))
+  :use-module (srfi srfi-1)
+
+  :use-module (ice-9 match)
+  :use-module (ice-9 control)
+  :use-module (ice-9 rdelim)
+  :use-module (ice-9 curried-definitions)
+  :use-module (ice-9 ftw)
+  :use-module (ice-9 getopt-long)
+  :use-module (ice-9 iconv)
+  :use-module (ice-9 regex) #| regex here due to bad macros |#
+
+  :use-module (web server)
+  :use-module (web request)
+  :use-module (web response)
+  :use-module (web uri)
+
+  :use-module (sxml simple)
 
-(use-modules (datetime)
-             (datetime util))
+  :use-module (server util)
+  :use-module (server macro)
+
+  :use-module (vcomponent)
+  :use-module (datetime)
+  :use-module (datetime util)
+  :use-module (output html)
+  :use-module (output ical)
+
+  :export (main)
+  )
 
 (define (file-extension name)
   (car (last-pair (string-split name #\.))))
@@ -76,12 +91,12 @@
                                      ))))))
 
    ;; TODO export all events in interval
-   ;; (GET "/calendar" (start end)
-   ;;      (ical-main calendars
-   ;;                 regular
-   ;;                 repeating
-   ;;                 (parse-iso-date start)
-   ;;                 (parse-iso-date end)))
+   (GET "/calendar" (start end)
+        (ical-main calendar
+                   regular
+                   repeating
+                   (parse-iso-date start)
+                   (parse-iso-date end)))
 
    ;; TODO this returns "invalid" events, since the surrounding VCALENDAR is missing.
    (GET "/calendar/:uid.ics" (uid)
@@ -92,7 +107,7 @@
                        repeating))
              (return '((content-type text/calendar))
                      (with-output-to-string
-                       (lambda () ((@ (output ical) print-components-with-fake-parent)
+                       (lambda () (print-components-with-fake-parent
                               (list it)))))
              (return (build-response code: 404)
                      (format #f "No component with UID=~a found." uid))))
diff --git a/module/server/macro.scm b/module/server/macro.scm
index e325401a..b9ce94bb 100644
--- a/module/server/macro.scm
+++ b/module/server/macro.scm
@@ -3,9 +3,8 @@
   :use-module (util)
   :use-module (ice-9 regex)
   :use-module (srfi srfi-1)
-  )
-
-(use-modules* (web (response uri)))
+  :use-module (web response)
+  :use-module (web uri))
 
 
 
diff --git a/module/util.scm b/module/util.scm
index ebfa0ed6..fb0e0063 100644
--- a/module/util.scm
+++ b/module/util.scm
@@ -12,7 +12,6 @@
                 catch-multiple
                 quote?
                 re-export-modules
-                use-modules*
                 -> ->> set set-> aif awhen
                 tree-map let-lazy let-env
                 case* define-many
@@ -405,14 +404,6 @@
             (cons (car rem) (loop (not flipflop) (cdr rem)))
             ))))
 
-(define-macro (use-modules* . forms)
-  `(use-modules
-    ,@(concatenate
-       (map (lambda (form)
-              (map (lambda (sub) (list (car form) sub))
-                   (cadr form)))
-            forms))))
-
 
 
 (define-syntax ->
-- 
cgit v1.2.3