-------- Forwarded Message --------
Subject: [PATCH v1] SRFI-19: Add support for ISO 8601 zones with a colon.
Date: Thu, 29 Feb 2024 22:23:43 +0100
From: Denis 'GNUtoo' Carikli <xxxxxx@cyberdimension.org>
To: xxxxxx@gnu.org
CC: Denis 'GNUtoo' Carikli <xxxxxx@cyberdimension.org>

* 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 <xxxxxx@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 "xxxxxx@14:00" "~Y-~m-~xxxxxx@~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