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

Merge branch 'devel' into araq

Browse source
This commit is contained in:
Andreas Rumpf 2017-11-02 18:24:33 +01:00
commit 17ccb7f6b6
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/condsyms.nim
View file

@ -109,3 +109,4 @@ proc initDefines*() =
defineSymbol("nimGenericInOutFlags") defineSymbol("nimGenericInOutFlags")
when false: defineSymbol("nimHasOpt") when false: defineSymbol("nimHasOpt")
defineSymbol("nimNoArrayToCstringConversion") defineSymbol("nimNoArrayToCstringConversion")
defineSymbol("nimNewRoof")

2
lib/pure/times.nim
View file

@ -1225,7 +1225,7 @@ when not defined(JS):
result.minute = t.minute result.minute = t.minute
result.hour = t.hour result.hour = t.hour
result.monthday = t.monthday result.monthday = t.monthday
result.month = ord(t.month) result.month = cint(t.month)
result.year = cint(t.year - 1900) result.year = cint(t.year - 1900)
result.weekday = weekDays[t.weekday] result.weekday = weekDays[t.weekday]
result.yearday = t.yearday result.yearday = t.yearday

2
lib/system/sysio.nim
View file

@ -192,7 +192,7 @@ proc write(f: File, r: float32) =
proc write(f: File, r: BiggestFloat) = proc write(f: File, r: BiggestFloat) =
if c_fprintf(f, "%g", r) < 0: checkErr(f) if c_fprintf(f, "%g", r) < 0: checkErr(f)
proc write(f: File, c: char) = discard c_putc(ord(c), f) proc write(f: File, c: char) = discard c_putc(cint(c), f)
proc write(f: File, a: varargs[string, `$`]) = proc write(f: File, a: varargs[string, `$`]) =
for x in items(a): write(f, x) for x in items(a): write(f, x)

1
web/website.ini
View file

@ -65,6 +65,7 @@ srcdoc2: "pure/md5;pure/rationals"
srcdoc2: "posix/posix;pure/distros;pure/oswalkdir" srcdoc2: "posix/posix;pure/distros;pure/oswalkdir"
srcdoc2: "pure/fenv;pure/securehash;impure/rdstdin" srcdoc2: "pure/fenv;pure/securehash;impure/rdstdin"
srcdoc2: "pure/basic2d;pure/basic3d;pure/mersenne;pure/coro;pure/httpcore" srcdoc2: "pure/basic2d;pure/basic3d;pure/mersenne;pure/coro;pure/httpcore"
srcdoc2: "pure/bitops;pure/nimtracker;pure/punycode;pure/volatile"
; Note: everything under 'webdoc' doesn't get listed in the index, so wrappers ; Note: everything under 'webdoc' doesn't get listed in the index, so wrappers
; should live here ; should live here