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

fix #18702(fix parseutils.parseFloat) (#18703) [backport:1.0]

Browse source 
* fix #18702
* Apply suggestions from code review
This commit is contained in:
flywind 2021-08-16 21:14:35 +08:00 • committed by GitHub
commit 901c5ded52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/system/strmantle.nim
View file

@ -211,15 +211,16 @@ proc nimParseBiggestFloat(s: string, number: var BiggestFloat,
var ti = 0 var ti = 0
let maxlen = t.high - "e+000".len # reserve enough space for exponent let maxlen = t.high - "e+000".len # reserve enough space for exponent
result = i - start let endPos = i
result = endPos - start
i = start i = start
# re-parse without error checking, any error should be handled by the code above. # re-parse without error checking, any error should be handled by the code above.
if i < s.len and s[i] == '.': i.inc if i < endPos and s[i] == '.': i.inc
while i < s.len and s[i] in {'0'..'9','+','-'}: while i < endPos and s[i] in {'0'..'9','+','-'}:
if ti < maxlen: if ti < maxlen:
t[ti] = s[i]; inc(ti) t[ti] = s[i]; inc(ti)
inc(i) inc(i)
while i < s.len and s[i] in {'.', '_'}: # skip underscore and decimal point while i < endPos and s[i] in {'.', '_'}: # skip underscore and decimal point
inc(i) inc(i)
# insert exponent # insert exponent

13
tests/stdlib/tparseutils.nim
View file

@ -1,5 +1,5 @@
import parseutils import std/[parseutils, sequtils, sugar]
import sequtils
let input = "$test{} $this is ${an{ example}} " let input = "$test{} $this is ${an{ example}} "
let expected = @[(ikVar, "test"), (ikStr, "{} "), (ikVar, "this"), let expected = @[(ikVar, "test"), (ikStr, "{} "), (ikVar, "this"),
@ -41,3 +41,12 @@ doAssert value == 1_000_000
var i64Value: int64 var i64Value: int64
discard parseBiggestInt("9223372036854775807", i64Value) discard parseBiggestInt("9223372036854775807", i64Value)
doAssert i64Value == 9223372036854775807 doAssert i64Value == 9223372036854775807
block:
var f: float
let res = collect:
for x in ["9.123456789012345+","11.123456789012345+","9.123456789012345-","8.123456789012345+","9.12345678901234-","9.123456789012345"]:
(parseFloat(x, f, 0), $f)
doAssert res == @[(17, "9.123456789012344"), (18, "11.123456789012344"),
(17, "9.123456789012344"), (17, "8.123456789012344"),
(16, "9.12345678901234"), (17, "9.123456789012344")]