schedule-segments-until and schedule-extract-until!

diff --git a/loopy.scm b/loopy.scm
index 96d6a9044a1138ad622aade1c71887638c1639d5..7172e9b57b3a6d7cefcaad6fe29c00248f3c6bd1 100644 (file)
--- a/loopy.scm
+++ b/loopy.scm
@@ -3,6 +3,7 @@
   #:use-module (srfi srfi-9 gnu)
   #:use-module (ice-9 q)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 receive)
   #:export (make-agenda
             agenda?
             agenda-queue agenda-prompt-tag
@@ -20,6 +21,8 @@
             schedule-add! schedule-empty?
             schedule-segments
 
+            schedule-segments-until schedule-extract-until!
+
             make-port-mapping
             port-mapping-set! port-mapping-remove!
             port-mapping-empty? port-mapping-non-empty?
@@ -145,7 +148,7 @@
       (match segments
         ;; If we're at the end of the list, time to make a new
         ;; segment...
-        ('() (cons (make-time-segment time) '()))
+        ('() (cons (new-time-segment) '()))
         ;; If the segment's time is exactly our time, good news
         ;; everyone!  Let's append our stuff to its queue
         (((? segment-equals-time? first) rest ...)
@@ -166,6 +169,41 @@
 (define (schedule-empty? schedule)
   (eq? (schedule-segments schedule) '()))
 
+(define (schedule-segments-until schedule time)
+  "Does a multiple value return of time segments before/at and after TIME"
+  (let ((time (time-segment-right-format time)))
+    (define (segment-is-now? segment)
+      (time-= (time-segment-time segment) time))
+    (define (segment-is-before-now? segment)
+      (time-< (time-segment-time segment) time))
+
+    (let loop ((segments-before '())
+               (segments-left (schedule-segments schedule)))
+      (match segments-left
+        ;; end of the line, return
+        ('()
+         (values (reverse segments-before) '()))
+
+        ;; It's right now, so time to stop, but include this one in before
+        ;; but otherwise return
+        (((? segment-is-now? first) rest ...)
+         (values (reverse (cons first segments-before)) rest))
+
+        ;; This is prior or at now, so add it and keep going
+        (((? segment-is-before-now? first) rest ...)
+         (loop (cons first segments-before) rest))
+
+        ;; Otherwise it's past now, just return what we have
+        (segments-after
+         (values segments-before segments-after))))))
+
+(define (schedule-extract-until! schedule time)
+  "Extract all segments until TIME from SCHEDULE, and pop old segments off"
+  (receive (segments-before segments-after)
+      (schedule-split-segments-until schedule time)
+    (set-schedule-segments! schedule segments-after)
+    segments-before))
+
 
 \f
 ;;; Port handling