From aae2f816a08a265340f84c6e50fd8665c6ab4617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 18 Mar 2019 23:23:07 +0100 Subject: Update monad library. --- fmt-stack.scm | 6 ++---- main.scm | 12 ++++++------ monad | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/fmt-stack.scm b/fmt-stack.scm index ced6be3..e1aaca4 100644 --- a/fmt-stack.scm +++ b/fmt-stack.scm @@ -4,10 +4,8 @@ make-fmt-frame empty-fmt-frame fmt-frame->ansi-esc) - #:use-module (control monad) - #:use-module (control monad state) - - #:use-module (data optional) + #:use-module (monad) + #:use-module (monad state) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9 gnu)) diff --git a/main.scm b/main.scm index 320df14..fc11a26 100755 --- a/main.scm +++ b/main.scm @@ -24,9 +24,9 @@ (macros arrow) (util) - (control monad) - (control monad state) - (data stack) + (monad) + (monad state) + (monad stack) (fmt-stack) (html) @@ -82,14 +82,14 @@ fmt-before <- (get-attr) (push (class-handlers class)) fmt-with <- (get-attr) - ret <- (fmap (cut string-append fmt-with <> fmt-before) - (fmap string-concatenate (sequence (map fmt-tag nodes)))) + ret <- (<$> (cut string-append fmt-with <> fmt-before) + (<$> string-concatenate (sequence (map fmt-tag nodes)))) (pop) (return-state ret))] ;; Default rule, since the above case requires a class list [(tag _ node nodes ...) - (fmap string-concatenate (sequence (map fmt-tag (cons node nodes))))] + (<$> string-concatenate (sequence (map fmt-tag (cons node nodes))))] ;; Just ignore tags without children [(tag _) (return-state "")] diff --git a/monad b/monad index a4a7edd..d6c7a20 160000 --- a/monad +++ b/monad @@ -1 +1 @@ -Subproject commit a4a7edd487d4d2207829462d06c40578dc757337 +Subproject commit d6c7a20b9895653d3ab24a1776781cdfe18ccf4b -- cgit v1.2.3