From: Hong Xu <hong@topbug.net>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 25086@debbugs.gnu.org
Subject: bug#25086: [PATCH] Fix the timezone detection of parse-iso8601-time-string.
Date: Sat, 17 Dec 2016 19:11:58 -0800 [thread overview]
Message-ID: <87d1gqlym9.fsf@topbug.net> (raw)
In-Reply-To: <87eg16z3qm.fsf@topbug.net>
[-- Attachment #1.1: Type: text/plain, Size: 362 bytes --]
On 2016-12-17 Sat 12:42 GMT-0800, Hong Xu <hong@topbug.net> wrote:
>
> I've added the tests now. And indeed, it exposes a bug in the original patch.
>
> Again, I decomposed the patch to two different parts, one for the stable
> branch and the other (with only test files) for the master branch.
>
Attached is a newer version which has fixed a few edge cases.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-Fix-the-timezone-detection-of-parse-iso8601-time-str.patch --]
[-- Type: text/x-diff, Size: 4837 bytes --]
From a7050f2785a74c6669dae556fa9a1deae84081a8 Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Sat, 17 Dec 2016 12:07:45 -0800
Subject: [PATCH] Fix the timezone detection of parse-iso8601-time-string.
* parse-time.el (parse-iso8601-time-string): Fix its timezone
parsing and make it autoload.
* parse-time.el: Add doc for parse-iso8601-time-string.
* editfns.c (Fdecode-time): Minor doc improvement for decode-time.
* emacs-mime.texi (time-date): Add an example for
parse-iso8601-time-string.
---
doc/misc/emacs-mime.texi | 3 +++
lisp/calendar/parse-time.el | 27 ++++++++++++++++++++-------
src/editfns.c | 5 ++---
3 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 4d68246bba4b..8d6536265416 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1536,6 +1536,9 @@ time-date
(date-to-time "Sat Sep 12 12:21:54 1998 +0200")
@result{} (13818 19266)
+(parse-iso8601-time-string "1998-09-12T12:21:54+0200")
+@result{} (13818 19266)
+
(float-time '(13818 19266))
@result{} 905595714.0
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index 6ba26a4a00d0..be1107ee3d29 100644
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -195,7 +195,7 @@ parse-time-iso8601-regexp
(time-minute 2digit)
(time-second 2digit)
(time-secfrac "\\(\\.[0-9]+\\)?")
- (time-numoffset (concat "[-+]\\(" time-hour "\\):" time-minute))
+ (time-numoffset (concat "\\([-+]\\)" time-hour ":?" time-minute "?"))
(time-offset (concat "Z" time-numoffset))
(partial-time (concat time-hour colon time-minute colon time-second
time-secfrac))
@@ -204,19 +204,23 @@ parse-time-iso8601-regexp
(date-time (concat full-date "T" full-time)))
(list (concat "^" full-date)
(concat "T" partial-time)
- (concat "Z" time-numoffset)))
+ (concat "\\(Z\\|" time-numoffset "\\)")))
"List of regular expressions matching ISO 8601 dates.
1st regular expression matches the date.
2nd regular expression matches the time.
3rd regular expression matches the (optional) timezone specification.")
+;;;###autoload
(defun parse-iso8601-time-string (date-string)
+ "Parse an ISO 8601 time string, such as 2016-12-01T23:35:06-05:00.
+If DATE-STRING cannot be parsed, it falls back to
+`parse-time-string'."
(let* ((date-re (nth 0 parse-time-iso8601-regexp))
(time-re (nth 1 parse-time-iso8601-regexp))
(tz-re (nth 2 parse-time-iso8601-regexp))
- re-start
- time seconds minute hour fractional-seconds
- day month year day-of-week dst tz)
+ re-start
+ time seconds minute hour fractional-seconds
+ day month year day-of-week dst tz)
;; We need to populate 'time' with
;; (SEC MIN HOUR DAY MON YEAR DOW DST TZ)
@@ -235,10 +239,19 @@ parse-iso8601-time-string
"0"))
re-start (match-end 0))
(when (string-match tz-re date-string re-start)
- (setq tz (match-string 1 date-string)))
+ (if (string= "Z" (match-string 1 date-string))
+ (setq tz 0) ;; UTC timezone indicated by Z
+ (setq tz (+
+ (* 3600
+ (string-to-number (match-string 3 date-string)))
+ (* 60
+ (string-to-number
+ (or (match-string 4 date-string) "0")))))
+ (when (string= "-" (match-string 2 date-string))
+ (setq tz (- tz)))))
(setq time (list seconds minute hour day month year day-of-week dst tz))))
- ;; Fall back to having Gnus do fancy things for us.
+ ;; Fall back to having `parse-time-string' do fancy things for us.
(when (not time)
(setq time (parse-time-string date-string)))
diff --git a/src/editfns.c b/src/editfns.c
index 5cc4a67ab19b..2f1f412d9e4e 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2101,9 +2101,8 @@ format_time_string (char const *format, ptrdiff_t formatlen,
DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 2, 0,
doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST UTCOFF).
-The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED),
-as from `current-time' and `file-attributes', or nil to use the
-current time.
+The optional TIME should be a list of (HIGH LOW . IGNORED), as from
+`current-time' and `file-attributes', or nil to use the current time.
It can also be a single integer number of seconds since the epoch.
The obsolete form (HIGH . LOW) is also still accepted.
The optional ZONE is omitted or nil for Emacs local time, t for
--
2.1.4
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0001-Add-tests-for-parse-iso8601-time-string.patch --]
[-- Type: text/x-diff, Size: 1921 bytes --]
From f53bed4fa277af83c5194854c092687a1002d709 Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Sat, 17 Dec 2016 12:38:26 -0800
Subject: [PATCH] Add tests for parse-iso8601-time-string.
* parse-time-tests.el (parse-time-tests): Add tests for
parse-iso8601-time-string.
---
test/lisp/calendar/parse-time-tests.el | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/test/lisp/calendar/parse-time-tests.el b/test/lisp/calendar/parse-time-tests.el
index 9bcf2b4a53c7..6dc23372f249 100644
--- a/test/lisp/calendar/parse-time-tests.el
+++ b/test/lisp/calendar/parse-time-tests.el
@@ -42,7 +42,23 @@
(should (equal (parse-time-string "Monday, 22 february 2016 19:35:42 +0100")
'(42 35 19 22 2 2016 1 nil 3600)))
(should (equal (parse-time-string "Monday, 22 february 2016 19:35:42 PDT")
- '(42 35 19 22 2 2016 1 t -25200))))
+ '(42 35 19 22 2 2016 1 t -25200)))
+ (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54-0200")
+ '(13818 33666)))
+ (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54-0230")
+ '(13818 35466)))
+ (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54-02:00")
+ '(13818 33666)))
+ (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54-02")
+ '(13818 33666)))
+ (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54+0230")
+ '(13818 17466)))
+ (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54+02")
+ '(13818 19266)))
+ (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54Z")
+ '(13818 26466)))
+ (should (equal (parse-iso8601-time-string "1998-09-12T12:21:54")
+ (encode-time 54 21 12 12 9 1998))))
(provide 'parse-time-tests)
--
2.1.4
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
next prev parent reply other threads:[~2016-12-18 3:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 3:46 bug#25086: [PATCH] Fix the timezone detection of parse-iso8601-time-string Hong Xu
2016-12-02 3:55 ` Hong Xu
2016-12-02 4:04 ` Hong Xu
[not found] ` <qf5fum6ubn4.fsf@marmstrong-macbookpro.roam.corp.google.com>
2016-12-02 6:13 ` Hong Xu
2016-12-12 0:37 ` Hong Xu
2016-12-12 17:22 ` Matt Armstrong
2016-12-12 17:58 ` Eli Zaretskii
2016-12-17 14:58 ` Eli Zaretskii
2016-12-17 20:42 ` Hong Xu
2016-12-18 3:11 ` Hong Xu [this message]
2016-12-24 12:41 ` Eli Zaretskii
2016-12-24 21:04 ` Hong Xu
2016-12-25 3:29 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d1gqlym9.fsf@topbug.net \
--to=hong@topbug.net \
--cc=25086@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).