Remove with-stream macro.

It was an extra (rather complicated) macro to support, which had 2
unresolved TODO:s, and made the resulting code hard to read since it
wasn't immediately apparent which procedures where replaced by their
stream counterparts.

The only using code was rewritten using a threading macro, which is way
more readable.

2 files changed, 8 insertions, 46 deletions

diff --git a/module/datetime.scm b/module/datetime.scm
index 9657a803..d5ef03b1 100644
--- a/module/datetime.scm
+++ b/module/datetime.scm
@@ -10,12 +10,10 @@
   :use-module (srfi srfi-9 gnu)
 
   :use-module ((hnh util)
-               :select (vector-last define*-public set! -> swap case* set
+               :select (vector-last define*-public set! -> ->> swap case* set
                                     span-upto let* set->))
 
   :use-module (srfi srfi-41)
-  :use-module ((srfi srfi-41 util)
-               :select (with-streams))
   :use-module (ice-9 i18n)
   :use-module (ice-9 format)
   :use-module (ice-9 regex)
@@ -538,12 +536,12 @@
 ;; The amount of days in the given interval, both end pointts inclusive
 (define-public (days-in-interval start-date end-date)
   (let ((diff (date-difference (date+ end-date (date day: 1)) start-date)))
-    (with-streams
-     (fold + (day diff)
-           (map days-in-month
-                (take (+ (month diff)
-                         (* 12 (year diff)))
-                      (month-stream start-date)))))))
+    (->> (month-stream start-date)
+         (stream-take (+ (month diff)
+                         (* 12 (year diff))))
+         (stream-map days-in-month)
+         (stream-fold + (day diff)))))
+
 
 ;; Day from start of the year, so 1 feb would be day 32.
 ;; Also known as Julian day.
diff --git a/module/srfi/srfi-41/util.scm b/module/srfi/srfi-41/util.scm
index 7c062003..9a172e2d 100644
--- a/module/srfi/srfi-41/util.scm
+++ b/module/srfi/srfi-41/util.scm
@@ -3,7 +3,7 @@
   #:use-module (srfi srfi-41)
   #:use-module ((ice-9 sandbox) :select (call-with-time-limit))
   #:use-module (hnh util) ; let*, find-min
-  #:export (stream-car+cdr interleave-streams with-streams
+  #:export (stream-car+cdr interleave-streams
                            stream-timeslice-limit))
 
 (define (stream-car+cdr stream)
@@ -132,39 +132,3 @@
           (stream-timeslice-limit (stream-cdr strm) timeslice)))
    (lambda _ stream-null)))
 
-;; Evaluates @var{body} in a context where most list fundamentals are
-;; replaced by stream alternatives.
-;; commented defifinitions are items which could be included, but for
-;; one reason or another isn't.
-;; TODO Possibly give access to list-primitives under a list- prefix.
-;; TODO since this macro is inhygienic it requires that (srfi srfi-41)
-;; is included at the point of use.
-(define-macro (with-streams . body)
-  `(let-syntax
-       ((cons        (identifier-syntax stream-cons))
-        (null?       (identifier-syntax stream-null?))
-        (pair?       (identifier-syntax stream-pair?))
-        (car         (identifier-syntax stream-car))
-        (cdr         (identifier-syntax stream-cdr))
-        ;;           stream-lambda
-        ;;           define-stream
-        (append      (identifier-syntax stream-append))
-        (concat      (identifier-syntax stream-concat))
-        ;; (const    stream-constant)
-        (drop        (identifier-syntax stream-drop))
-        (drop-while  (identifier-syntax stream-drop-while))
-        (filter      (identifier-syntax stream-filter))
-        (fold        (identifier-syntax stream-fold))
-        (for-each    (identifier-syntax stream-for-each))
-        (length      (identifier-syntax stream-length))
-        ;;           stream-let
-        (map         (identifier-syntax stream-map))
-        ;;           stream-match
-        ;;           stream-range
-        ;;           stream-ref
-        (reverse     (identifier-syntax stream-reverse))
-        ;;           stream-scan
-        (take        (identifier-syntax stream-take))
-        (take-while  (identifier-syntax stream-take-while))
-        (zip         (identifier-syntax stream-zip)))
-     ,@body))