diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-06-12 21:09:35 +0200 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-06-13 04:11:35 +0200 |
commit | 73a4bfc3d8e9bb5365e33a11a6ad3b8340d5195b (patch) | |
tree | e52324edc63a240e5c0b88081c325f789168a4c5 /module/vulgar | |
parent | Document timespec and zic. (diff) | |
download | calp-73a4bfc3d8e9bb5365e33a11a6ad3b8340d5195b.tar.gz calp-73a4bfc3d8e9bb5365e33a11a6ad3b8340d5195b.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | module/vulgar.scm | 11 | ||||
-rw-r--r-- | module/vulgar/components.scm | 6 | ||||
-rw-r--r-- | module/vulgar/info.scm | 5 |
3 files changed, 12 insertions, 10 deletions
diff --git a/module/vulgar.scm b/module/vulgar.scm index 20b93164..5e32baa5 100644 --- a/module/vulgar.scm +++ b/module/vulgar.scm @@ -26,11 +26,12 @@ (with-vulgar (bitwise-not (bitwise-ior ECHO ICANON)) thunk)) ((bits thunk) - (let* ((ifd (current-input-port)) - (ofd (current-output-port)) - (iattr (make-termios)) - (oattr (make-termios)) - iattr* oattr*) + (let ((ifd (current-input-port)) + (ofd (current-output-port)) + (iattr (make-termios)) + (oattr (make-termios)) + (iattr* #f) + (oattr* #f)) (dynamic-wind (lambda () (tcgetattr! iattr ifd) diff --git a/module/vulgar/components.scm b/module/vulgar/components.scm index 882da849..740e64c3 100644 --- a/module/vulgar/components.scm +++ b/module/vulgar/components.scm @@ -4,9 +4,9 @@ #:export ()) (define-public (display-calendar-header! date) - (let* ((day (number->string (day date))) - (month (number->string (month date))) - (year (number->string (year date)))) + (let ((day (number->string (day date))) + (month (number->string (month date))) + (year (number->string (year date)))) ;; BSD cal only supports setting highlighted day explicitly for ;; testing the functionality. This seems to at least give me ;; an (almost) working display, albeit ugly. diff --git a/module/vulgar/info.scm b/module/vulgar/info.scm index 963e20c8..0f55c942 100644 --- a/module/vulgar/info.scm +++ b/module/vulgar/info.scm @@ -1,10 +1,11 @@ (define-module (vulgar info) - :use-module (hnh util)) + :use-module ((srfi srfi-1) :select (car+cdr)) + :use-module (srfi srfi-71)) ;; Sort-of backwards subprocess call since we want the current terminal to be ;; inherited by stty (define-public (get-terminal-size) - (let* (((rpipe . wpipe) (pipe))) + (let ((rpipe wpipe (car+cdr (pipe)))) (system (format #f "stty size > /proc/~s/fd/~s" (getpid) (port->fdes wpipe))) (values (read rpipe) |