blob: 906ce563c6200c8dab73b23353f23a5904c46b65 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From 6e9b264f861c84fafd611a850f7c9d7f131171b3 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Thu, 29 Feb 2024 19:11:44 +0100
Subject: [PATCH v1] SRFI-19: Add support for ISO 8601 zones with a colon.
* module/srfi/srfi-19.scm (zone-reader): handle a colon in the zone.
* test-suite/tests/srfi-19.test (SRFI date/time library test): Add test.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
module/srfi/srfi-19.scm | 5 +++++
test-suite/tests/srfi-19.test | 3 +++
2 files changed, 8 insertions(+)
diff --git a/module/srfi/srfi-19.scm b/module/srfi/srfi-19.scm
index 570f933ca..23d115926 100644
--- a/module/srfi/srfi-19.scm
+++ b/module/srfi/srfi-19.scm
@@ -1271,6 +1271,11 @@
(if (eof-object? ch)
(time-error 'string->date 'bad-date-template-string
(list "Invalid time zone number" ch)))
+ (if (char=? ch #\:)
+ (set! ch (read-char port))
+ (if (eof-object? ch)
+ (time-error 'string->date 'bad-date-template-string
+ (list "Invalid time zone number" ch))))
(set! offset (+ offset (* (char->int ch)
10 60))))
(let ((ch (read-char port)))
diff --git a/test-suite/tests/srfi-19.test b/test-suite/tests/srfi-19.test
index 1d56214e4..55eb82320 100644
--- a/test-suite/tests/srfi-19.test
+++ b/test-suite/tests/srfi-19.test
@@ -120,6 +120,9 @@ incomplete numerical tower implementation.)"
(pass-if "string->date works"
(begin (string->date "2001-06-01@14:00" "~Y-~m-~d@~H:~M")
#t))
+ (pass-if "string->date accepts ISO 8601 zones with a colon"
+ (begin (string->date "2024-12-31T23:59:59+01:00" "~Y-~m-~dT~H:~M:~S~z")
+ #t))
;; check for code paths where reals were passed to quotient, which
;; doesn't work in Guile (and is unspecified in R5RS)
(test-time->date time-utc->date date->time-utc)
base-commit: 9e0f03c5fd36764827c8bb03887f14640c883b70
--
2.41.0
|
