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

Merge pull request #2321 from def-/times-js

Browse source 
Fix some compiler warnings in times
This commit is contained in:
Andreas Rumpf 2015-03-12 16:18:55 +01:00
commit e0c3b8a452
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pure/times.nim
View file

@ -26,9 +26,10 @@ type
WeekDay* = enum ## represents a weekday
dMon, dTue, dWed, dThu, dFri, dSat, dSun
var
timezone {.importc, header: "<time.h>".}: int
tzname {.importc, header: "<time.h>" .}: array[0..1, cstring]
when not defined(JS):
var
timezone {.importc, header: "<time.h>".}: int
tzname {.importc, header: "<time.h>" .}: array[0..1, cstring]
when defined(posix) and not defined(JS):
type
@ -482,7 +483,7 @@ elif defined(JS):
return newDate()
const
weekDays: array [0..6, TWeekDay] = [
weekDays: array [0..6, WeekDay] = [
dSun, dMon, dTue, dWed, dThu, dFri, dSat]
proc getLocalTime(t: Time): TimeInfo =
@ -490,7 +491,7 @@ elif defined(JS):
result.minute = t.getMinutes()
result.hour = t.getHours()
result.monthday = t.getDate()
result.month = TMonth(t.getMonth())
result.month = Month(t.getMonth())
result.year = t.getFullYear()
result.weekday = weekDays[t.getDay()]
result.yearday = 0
@ -500,7 +501,7 @@ elif defined(JS):
result.minute = t.getUTCMinutes()
result.hour = t.getUTCHours()
result.monthday = t.getUTCDate()
result.month = TMonth(t.getUTCMonth())
result.month = Month(t.getUTCMonth())
result.year = t.getUTCFullYear()
result.weekday = weekDays[t.getUTCDay()]
result.yearday = 0
@ -554,7 +555,7 @@ proc `$`*(day: WeekDay): string =
return lookup[day]
proc `$`*(m: Month): string =
## stingify operator for ``TMonth``.
## stingify operator for ``Month``.
const lookup: array[Month, string] = ["January", "February", "March",
"April", "May", "June", "July", "August", "September", "October",
"November", "December"]
@ -1104,4 +1105,4 @@ when isMainModule:
# Kitchen = "3:04PM"
s = "3:04PM"
f = "h:mmtt"
echo "Kitchen: " & $s.parse(f)
echo "Kitchen: " & $s.parse(f)