jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Date/time parsing with minor changes requested by Dom96

Browse source
This commit is contained in:
Jeff 2015-02-09 21:46:18 +09:00
commit 5424ab3d7e
1 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/pure/times.nim
View file

@ -26,9 +26,6 @@ type
WeekDay* = enum ## represents a weekday WeekDay* = enum ## represents a weekday
dMon, dTue, dWed, dThu, dFri, dSat, dSun dMon, dTue, dWed, dThu, dFri, dSat, dSun
const
digits = {'0','1','2','3','4','5','6','7','8','9'}
var var
timezone {.importc, header: "<time.h>".}: int timezone {.importc, header: "<time.h>".}: int
tzname {.importc, header: "<time.h>" .}: array[0..1, cstring] tzname {.importc, header: "<time.h>" .}: array[0..1, cstring]
@ -780,7 +777,7 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
## Helper of the parse proc to parse individual tokens. ## Helper of the parse proc to parse individual tokens.
case token case token
of "d": of "d":
if value[j+1] in digits: if value[j+1] in Digits:
# two digit format # two digit format
info.monthday = value[j..j+1].parseInt() info.monthday = value[j..j+1].parseInt()
j += 2 j += 2
@ -835,7 +832,7 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
else: else:
raise newException(ValueError, "invalid day of week ") raise newException(ValueError, "invalid day of week ")
of "h", "H": of "h", "H":
if value[j+1] in digits: if value[j+1] in Digits:
# two digit format # two digit format
info.hour = value[j..j+1].parseInt() info.hour = value[j..j+1].parseInt()
j += 2 j += 2
@ -847,7 +844,7 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
info.hour = value[j..j+1].parseInt() info.hour = value[j..j+1].parseInt()
j += 2 j += 2
of "m": of "m":
if value[j+1] in digits: if value[j+1] in Digits:
# two digit format # two digit format
info.minute = value[j..j+1].parseInt() info.minute = value[j..j+1].parseInt()
j += 2 j += 2
@ -860,7 +857,7 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
j += 2 j += 2
of "M": of "M":
var month: int var month: int
if value[j+1] in digits: if value[j+1] in Digits:
# two digit format # two digit format
month = value[j..j+1].parseInt() month = value[j..j+1].parseInt()
j += 2 j += 2
@ -941,7 +938,7 @@ proc parseToken(info: var TimeInfo; token, value: string; j: var int) =
else: else:
raise newException(ValueError, "invalid month") raise newException(ValueError, "invalid month")
of "s": of "s":
if value[j+1] in digits: if value[j+1] in Digits:
# two digit format # two digit format
info.second = value[j..j+1].parseInt() info.second = value[j..j+1].parseInt()
j += 2 j += 2
@ -1098,12 +1095,12 @@ when isMainModule:
" ss t tt y yy yyy yyyy yyyyy z zz zzz ZZZ") == " ss t tt y yy yyy yyyy yyyyy z zz zzz ZZZ") ==
"27 27 Mon Monday 4 04 16 16 6 06 1 01 Jan January 29 29 P PM 5 75 975 1975 01975 0 00 00:00 UTC" "27 27 Mon Monday 4 04 16 16 6 06 1 01 Jan January 29 29 P PM 5 75 975 1975 01975 0 00 00:00 UTC"
# when not defined(JS) and sizeof(Time) == 8: when not defined(JS) and sizeof(Time) == 8:
# var t3 = getGMTime(fromSeconds(889067643645)) # Fri 7 Jun 19:20:45 BST 30143 var t3 = getGMTime(fromSeconds(889067643645)) # Fri 7 Jun 19:20:45 BST 30143
# assert t3.format("d dd ddd dddd h hh H HH m mm M MM MMM MMMM s" & assert t3.format("d dd ddd dddd h hh H HH m mm M MM MMM MMMM s" &
# " ss t tt y yy yyy yyyy yyyyy z zz zzz ZZZ") == " ss t tt y yy yyy yyyy yyyyy z zz zzz ZZZ") ==
# "7 07 Fri Friday 6 06 18 18 20 20 6 06 Jun June 45 45 P PM 3 43 143 0143 30143 0 00 00:00 UTC" "7 07 Fri Friday 6 06 18 18 20 20 6 06 Jun June 45 45 P PM 3 43 143 0143 30143 0 00 00:00 UTC"
# assert t3.format(":,[]()-/") == ":,[]()-/" assert t3.format(":,[]()-/") == ":,[]()-/"
var t4 = getGMTime(fromSeconds(876124714)) # Mon 6 Oct 08:58:34 BST 1997 var t4 = getGMTime(fromSeconds(876124714)) # Mon 6 Oct 08:58:34 BST 1997
assert t4.format("M MM MMM MMMM") == "10 10 Oct October" assert t4.format("M MM MMM MMMM") == "10 10 Oct October"