Remove custom let*.

While it was nice, the most important part was the multi-valued let from
srfi-71 (which is implemented in srfi-71)). The minor pattern matching
structures could often be replaced with car+cdr, or a propper match.

6 files changed, 25 insertions, 21 deletions

diff --git a/module/calp/html/vcomponent.scm b/module/calp/html/vcomponent.scm
index 9e70f910..27a1f994 100644
--- a/module/calp/html/vcomponent.scm
+++ b/module/calp/html/vcomponent.scm
@@ -229,7 +229,8 @@
 
 ;; Single event in side bar (text objects)
 (define-public (fmt-day day)
-  (let* (((date . events) day))
+  (let ((date (car day))
+        (events (cdr day)))
     `(section (@ (class "text-day"))
               (header (h2 ,(let ((s (date->string date
                                                   ;; Header for sidebar day
@@ -265,10 +266,10 @@
   `(style
        ,(lambda () (format #t "~:{ [data-calendar=\"~a\"] { --color: ~a; --complement: ~a }~%~}"
                       (map (lambda (c)
-                             (let* ((name (base64encode (prop c 'NAME)))
-                                    (bg-color (prop c 'COLOR))
-                                    (fg-color (and=> (prop c 'COLOR)
-                                                     calculate-fg-color)))
+                             (let ((name (base64encode (prop c 'NAME)))
+                                   (bg-color (prop c 'COLOR))
+                                   (fg-color (and=> (prop c 'COLOR)
+                                                    calculate-fg-color)))
                                (list name (or bg-color 'white) (or fg-color 'black))))
                            calendars)))))
 
diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm
index dd94dc16..a6ebdfba 100644
--- a/module/calp/html/view/calendar.scm
+++ b/module/calp/html/view/calendar.scm
@@ -22,6 +22,7 @@
   :use-module (srfi srfi-26)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
+  :use-module (srfi srfi-71)
 
   :use-module ((vcomponent recurrence) :select (repeating? generate-recurrence-set))
   :use-module ((vcomponent util group)
diff --git a/module/calp/html/view/calendar/month.scm b/module/calp/html/view/calendar/month.scm
index 205d6049..1c162aaa 100644
--- a/module/calp/html/view/calendar/month.scm
+++ b/module/calp/html/view/calendar/month.scm
@@ -7,6 +7,7 @@
   :use-module (calp html view calendar shared)
   :use-module (calp html config)
   :use-module (vcomponent)
+  :use-module (ice-9 match)
   :use-module ((vcomponent datetime)
                :select (really-long-event?
                         events-between))
@@ -47,15 +48,15 @@
                      long-event-groups))))
          ,@(map (lambda (d) `(div (@ (class "thead")) ,(string-titlecase (week-day-name d))))
                 (weekday-list))
-         ,@(map (lambda (group i)
-                  (let* (((s e . events) group))
-                    `(div (@ (class "cal-cell longevents event-container")
-                             (style "grid-area: long " ,i ";"
-                                    "grid-column: 1 / span 7;")
-                             (data-start ,(date->string s))
-                             (data-end ,(date->string (add-day e))))
-                          ,@(lay-out-long-events
-                             s e events))))
+         ,@(map (match-lambda*
+                  (((s e events ...) i)
+                   `(div (@ (class "cal-cell longevents event-container")
+                            (style "grid-area: long " ,i ";"
+                                   "grid-column: 1 / span 7;")
+                            (data-start ,(date->string s))
+                            (data-end ,(date->string (add-day e))))
+                         ,@(lay-out-long-events
+                            s e events))))
                 long-event-groups
                 (iota (length long-event-groups) 1))
 
diff --git a/module/calp/html/view/calendar/week.scm b/module/calp/html/view/calendar/week.scm
index b68184f9..ed3f00ec 100644
--- a/module/calp/html/view/calendar/week.scm
+++ b/module/calp/html/view/calendar/week.scm
@@ -2,6 +2,7 @@
   :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
+  :use-module (srfi srfi-71)
   :use-module (rnrs records syntactic)
   :use-module (datetime)
   :use-module (calp html view calendar shared)
@@ -122,7 +123,7 @@
 ;; Lay out complete day (graphical)
 ;; (date . (events)) -> sxml
 (define (lay-out-day day)
-  (let* (((day-date . events) day)
+  (let* ((day-date events (car+cdr day))
          (time-obj (datetime date: day-date))
          (short-events (stream->list events))
          #;
diff --git a/module/calp/server/routes.scm b/module/calp/server/routes.scm
index 762681d9..3d90cc04 100644
--- a/module/calp/server/routes.scm
+++ b/module/calp/server/routes.scm
@@ -73,7 +73,7 @@
                                        path-join)))
                          ,(_ "Return up"))))
      ,@(map (lambda (k)
-              (let* ((stat (lstat (path-append prefix dir k))))
+              (let ((stat (lstat (path-append prefix dir k))))
                 `(tr (td ,(case (stat:type stat)
                             [(directory) "📁"]
                             [(regular) "📰"]
@@ -108,7 +108,7 @@
    (lambda (search-term)
      (aif (hash-ref query-pages search-term)
           it
-          (let* ((q (prepare-query
+          (let ((q (prepare-query
                      (build-query-proc search-term)
                      (get-event-set global-event-object))))
             (hash-set! query-pages search-term q)
@@ -150,7 +150,7 @@
    ;; TODO any exception in this causes the whole page to fail
    ;; It would be much better if most of the page could still make it.
    (GET "/week/:start-date.html" (start-date html)
-        (let* ((start-date (start-of-week (parse-iso-date start-date))))
+        (let ((start-date (start-of-week (parse-iso-date start-date))))
           (return `((content-type ,(content-type html)))
                   (with-output-to-string
                     (lambda ()
@@ -166,7 +166,7 @@
                                       )))))))
 
    (GET "/month/:start-date.html" (start-date html)
-        (let* ((start-date (start-of-month (parse-iso-date start-date))))
+        (let ((start-date (start-of-month (parse-iso-date start-date))))
           (return `((content-type ,(content-type html)))
                   (with-output-to-string
                     (lambda ()
diff --git a/module/calp/terminal.scm b/module/calp/terminal.scm
index d91dc584..a0fafd11 100644
--- a/module/calp/terminal.scm
+++ b/module/calp/terminal.scm
@@ -174,8 +174,8 @@
                                 (- height 8 5 (length events) 5)))))))
 
 (define (get-line prompt)
-  (let* ((attr (make-termios))
-         (input-string #f))
+  (let ((attr (make-termios))
+        (input-string #f))
     (tcgetattr! attr)
     (set! (lflag attr) (logior ECHO (lflag attr)))
     (tcsetattr! attr)