aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2019-03-18 23:23:07 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2019-03-18 23:23:07 +0100
commitaae2f816a08a265340f84c6e50fd8665c6ab4617 (patch)
tree12f78ddba92efc2f491ae08a39b3afc1cbf5c3bd
parentBetter cache. (diff)
downloadtexttv-aae2f816a08a265340f84c6e50fd8665c6ab4617.tar.gz
texttv-aae2f816a08a265340f84c6e50fd8665c6ab4617.tar.xz
Update monad library.
-rw-r--r--fmt-stack.scm6
-rwxr-xr-xmain.scm12
m---------monad0
3 files changed, 8 insertions, 10 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
-Subproject a4a7edd487d4d2207829462d06c40578dc75733
+Subproject d6c7a20b9895653d3ab24a1776781cdfe18ccf4