From b22827a7977d2e8b11d30f9692d9da47ab8da738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sat, 25 Jun 2022 16:18:52 +0200
Subject: Change date/time interface.

---
 module/vcomponent/datetime/output.scm     |  2 +-
 module/vcomponent/recurrence/generate.scm | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'module/vcomponent')

diff --git a/module/vcomponent/datetime/output.scm b/module/vcomponent/datetime/output.scm
index 614438da..fb3d0478 100644
--- a/module/vcomponent/datetime/output.scm
+++ b/module/vcomponent/datetime/output.scm
@@ -73,7 +73,7 @@
          (let ((s (prop ev 'DTSTART))
                (e (prop ev 'DTEND)))
            (if e
-               (let ((fmt-str (if (date= (get-date s) (get-date e))
+               (let ((fmt-str (if (date= (datetime-date s) (datetime-date e))
                                   (_ "~H:~M")
                                   ;; Note the non-breaking space
                                   (_ "~Y-~m-~d ~H:~M"))))
diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm
index 07305647..cc725b09 100644
--- a/module/vcomponent/recurrence/generate.scm
+++ b/module/vcomponent/recurrence/generate.scm
@@ -119,7 +119,7 @@
   (branching-fold
    (lambda (rule dt)
      (let* ((key value (car+cdr rule))
-            (d (if (date? dt) dt (get-date dt)))
+            (d (if (date? dt) dt (datetime-date dt)))
             ;; NOTE It's proably an error to give BYHOUR, BYMINUTE, and BYSECOND
             ;; rules for a date object. This doesn't warn if those are given, but
             ;; instead silently discards them.
@@ -128,8 +128,8 @@
                      (if (date? dt)
                          (if (date? o) o d)
                          (if (date? o)
-                             (datetime date: o time: t tz: (get-timezone dt))
-                             (datetime date: d time: o tz: (get-timezone dt)))))))
+                             (datetime date: o time: t tz: (tz dt))
+                             (datetime date: d time: o tz: (tz dt)))))))
        (case key
          [(BYMONTH)
           (if (and (eq? 'YEARLY (freq rrule))
@@ -141,11 +141,11 @@
                (concatenate
                 (map (lambda (wday)
                        (all-wday-in-month
-                        wday (start-of-month (set (month d) value))))
+                        wday (start-of-month (month d value))))
                      (map cdr (byday rrule)))))
 
               ;; else
-              (to-dt (set (month d) value)))]
+              (to-dt (month d value)))]
 
          [(BYDAY)
           (let* ((offset value (car+cdr value)))
@@ -201,12 +201,12 @@
          [(BYYEARDAY) (to-dt (date+ (start-of-year d)
                                     (date day: (1- value))))]
          [(BYMONTHDAY)
-          (to-dt (set (day d)
+          (to-dt (day d
                       (if (positive? value)
                           value (+ 1 value (days-in-month d)))))]
-         [(BYHOUR) (to-dt (set (hour t) value))]
-         [(BYMINUTE) (to-dt (set (minute t) value))]
-         [(BYSECOND) (to-dt (set (second t) value))]
+         [(BYHOUR) (to-dt (hour t value))]
+         [(BYMINUTE) (to-dt (minute t value))]
+         [(BYSECOND) (to-dt (second t value))]
          [else (scm-error 'wrong-type-arg "update"
                           "Unrecognized by-extender ~s"
                           key #f)])))
@@ -254,7 +254,7 @@
    (extend-recurrence-set
     rrule
     (if (date? base-date)
-        (date+ base-date (get-date (make-date-increment rrule)))
+        (date+ base-date (datetime-date (make-date-increment rrule)))
         (datetime+ base-date (make-date-increment rrule))))))
 
 (define ((month-mod d) value)
@@ -273,7 +273,7 @@
          #t
          (let ((key values (car+cdr (car remaining)))
                (t (as-time dt))
-               (d (if (date? dt) dt (get-date dt))))
+               (d (if (date? dt) dt (datetime-date dt))))
            (and (case key
                   [(BYMONTH) (memv (month d) values)]
                   [(BYMONTHDAY) (memv (day d) (map (month-mod d) values))]
-- 
cgit v1.2.3