diff options
author | Michael Kasch <michael.kasch@gmail.com> | 2018-03-02 19:03:21 +0100 |
---|---|---|
committer | Brad Fitzpatrick <bradfitz@golang.org> | 2018-03-08 17:15:35 +0000 |
commit | 9f2c611fa7cccfacd317b88eff14d3ba64e855ff (patch) | |
tree | 7782b30892dc03ed686ac25ad21842fb269f250d /src/time/format.go | |
parent | 3d69ef37b8b3f7db8162689c88180781612b83c7 (diff) | |
download | go-9f2c611fa7cccfacd317b88eff14d3ba64e855ff.tar.gz go-9f2c611fa7cccfacd317b88eff14d3ba64e855ff.zip |
time: add support for parsing timezones denoted by sign and offset
IANA Zoneinfo does not provide names for all timezones. Some are denoted
by a sign and an offset only. E.g: Europe/Turkey is currently +03 or
America/La_Paz which is -04 (https://data.iana.org/time-zones/releases/tzdata2018c.tar.gz)
Fixes #24071
Change-Id: I9c230a719945e1263c5b52bab82084d22861be3e
Reviewed-on: https://go-review.googlesource.com/98157
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/time/format.go')
-rw-r--r-- | src/time/format.go | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/time/format.go b/src/time/format.go index a60474f026..7994052510 100644 --- a/src/time/format.go +++ b/src/time/format.go @@ -1117,6 +1117,11 @@ func parseTimeZone(value string) (length int, ok bool) { length = parseGMT(value) return length, true } + // Special Case 3: Some time zones are not named, but have +/-00 format + if value[0] == '+' || value[0] == '-' { + length = parseSignedOffset(value) + return length, true + } // How many upper-case letters are there? Need at least three, at most five. var nUpper int for nUpper = 0; nUpper < 6; nUpper++ { @@ -1153,21 +1158,29 @@ func parseGMT(value string) int { if len(value) == 0 { return 3 } + + return 3 + parseSignedOffset(value) +} + +// parseSignedOffset parses a signed timezone offset (e.g. "+03" or "-04"). +// The function checks for a signed number in the range -14 through +12 excluding zero. +// Returns length of the found offset string or 0 otherwise +func parseSignedOffset(value string) int { sign := value[0] if sign != '-' && sign != '+' { - return 3 + return 0 } x, rem, err := leadingInt(value[1:]) if err != nil { - return 3 + return 0 } if sign == '-' { x = -x } if x == 0 || x < -14 || 12 < x { - return 3 + return 0 } - return 3 + len(value) - len(rem) + return len(value) - len(rem) } func parseNanoseconds(value string, nbytes int) (ns int, rangeErrString string, err error) { |