From 8cb32b73d8d84402b63f94b612357f144c7a69e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Fri, 8 Mar 2019 13:27:06 +0100 Subject: Fix main. --- srfi/srfi-19/util.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'srfi') diff --git a/srfi/srfi-19/util.scm b/srfi/srfi-19/util.scm index ab951ea4..05deb39b 100644 --- a/srfi/srfi-19/util.scm +++ b/srfi/srfi-19/util.scm @@ -5,7 +5,8 @@ #:export (copy-date drop-time! drop-time localize-date - date-today? + ;; date-today? + today? seconds minutes hours days weeks date-add time-add @@ -52,11 +53,20 @@ transposed to the current timezone. Current timezone gotten from (time-utc->date (date->time-utc date) (date-zone-offset (current-date)))) +(define seconds 1) +(define minutes 60) +(define hours (* 60 minutes)) +(define days (* 24 hours)) +(define weeks (* 7 days)) + +(define (time-add time amount unit) + (add-duration time (make-time time-duration 0 (* amount unit)))) + (define (today? time) - (let* ((now (current-date)) - (then (add-duration time (make-time time-difference 0 (* 24 3600))))) - (and (time<=? time now) - (time<=? now then)))) + (let* ((now (date->time-utc (current-date))) + (then (time-add now 1 days))) + (and (time<=? now time) + (time<=? time then)))) #; (define (date-today? input-date) @@ -68,15 +78,6 @@ transposed to the current timezone. Current timezone gotten from (and (%date<=? now input-date) (%date<=? input-date then)))) -(define seconds 1) -(define minutes 60) -(define hours (* 60 minutes)) -(define days (* 24 hours)) -(define weeks (* 7 days)) - -(define (time-add time amount unit) - (add-duration time (make-time time-duration 0 (* amount unit)))) - #; (define (date-add date amount unit) (time-utc->date (add-duration (date->time-utc date) -- cgit v1.2.3