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

Merge branch 'devel' of github.com:nim-lang/Nim into devel

Browse source
This commit is contained in:
Andreas Rumpf 2017-11-17 16:24:03 +01:00
commit fccdbb3238
2 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pure/strutils.nim
View file

@ -1984,7 +1984,7 @@ proc formatBiggestFloat*(f: BiggestFloat, format: FloatFormatMode = ffDefault,
# but nothing else is possible: # but nothing else is possible:
if buf[i] in {'.', ','}: result[i] = decimalsep if buf[i] in {'.', ','}: result[i] = decimalsep
else: result[i] = buf[i] else: result[i] = buf[i]
when defined(vcc): when defined(windows):
# VS pre 2015 violates the C standard: "The exponent always contains at # VS pre 2015 violates the C standard: "The exponent always contains at
# least two digits, and only as many more digits as necessary to # least two digits, and only as many more digits as necessary to
# represent the exponent." [C11 §7.21.6.1] # represent the exponent." [C11 §7.21.6.1]
@ -2478,8 +2478,7 @@ when isMainModule:
doAssert formatBiggestFloat(0.00000000001, ffScientific, 1, ',') in doAssert formatBiggestFloat(0.00000000001, ffScientific, 1, ',') in
["1,0e-11", "1,0e-011"] ["1,0e-11", "1,0e-011"]
# bug #6589 # bug #6589
doAssert formatFloat(123.456, ffScientific, precision = -1) in doAssert formatFloat(123.456, ffScientific, precision = -1) == "1.234560e+02"
["1.234560e+02", "1.234560e+002"]
doAssert "$# $3 $# $#" % ["a", "b", "c"] == "a c b c" doAssert "$# $3 $# $#" % ["a", "b", "c"] == "a c b c"
doAssert "${1}12 ${-1}$2" % ["a", "b"] == "a12 bb" doAssert "${1}12 ${-1}$2" % ["a", "b"] == "a12 bb"

3
lib/system/sysstr.nim
View file

@ -322,6 +322,9 @@ proc nimIntToStr(x: int): string {.compilerRtl.} =
result.add x result.add x
proc add*(result: var string; x: float) = proc add*(result: var string; x: float) =
when nimvm:
result.add $x
else:
var buf: array[0..64, char] var buf: array[0..64, char]
when defined(nimNoArrayToCstringConversion): when defined(nimNoArrayToCstringConversion):
var n: int = c_sprintf(addr buf, "%.16g", x) var n: int = c_sprintf(addr buf, "%.16g", x)