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

parseutils: integerOutOfRangeDefect => integerOutOfRangeError (#14627)

Browse source
This commit is contained in:
Timothee Cour 2020-06-09 23:57:27 -07:00 • committed by GitHub
commit b7b84fa165
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pure/parseutils.nim
View file

@ -393,7 +393,7 @@ proc captureBetween*(s: string, first: char, second = '\0', start = 0): string =
result = "" result = ""
discard s.parseUntil(result, if second == '\0': first else: second, i) discard s.parseUntil(result, if second == '\0': first else: second, i)
proc integerOutOfRangeDefect() {.noinline.} = proc integerOutOfRangeError() {.noinline.} =
raise newException(ValueError, "Parsed integer outside of valid range") raise newException(ValueError, "Parsed integer outside of valid range")
# See #6752 # See #6752
@ -416,11 +416,11 @@ proc rawParseInt(s: string, b: var BiggestInt, start = 0): int =
if b >= (low(BiggestInt) + c) div 10: if b >= (low(BiggestInt) + c) div 10:
b = b * 10 - c b = b * 10 - c
else: else:
integerOutOfRangeDefect() integerOutOfRangeError()
inc(i) inc(i)
while i < s.len and s[i] == '_': inc(i) # underscores are allowed and ignored while i < s.len and s[i] == '_': inc(i) # underscores are allowed and ignored
if sign == -1 and b == low(BiggestInt): if sign == -1 and b == low(BiggestInt):
integerOutOfRangeDefect() integerOutOfRangeError()
else: else:
b = b * sign b = b * sign
result = i - start result = i - start
@ -459,7 +459,7 @@ proc parseInt*(s: string, number: var int, start = 0): int {.
result = parseBiggestInt(s, res, start) result = parseBiggestInt(s, res, start)
when sizeof(int) <= 4: when sizeof(int) <= 4:
if res < low(int) or res > high(int): if res < low(int) or res > high(int):
integerOutOfRangeDefect() integerOutOfRangeError()
if result != 0: if result != 0:
number = int(res) number = int(res)
@ -493,7 +493,7 @@ proc rawParseUInt(s: string, b: var BiggestUInt, start = 0): int =
prev = 0.BiggestUInt prev = 0.BiggestUInt
i = start i = start
if i < s.len - 1 and s[i] == '-' and s[i + 1] in {'0'..'9'}: if i < s.len - 1 and s[i] == '-' and s[i + 1] in {'0'..'9'}:
integerOutOfRangeDefect() integerOutOfRangeError()
if i < s.len and s[i] == '+': inc(i) # Allow if i < s.len and s[i] == '+': inc(i) # Allow
if i < s.len and s[i] in {'0'..'9'}: if i < s.len and s[i] in {'0'..'9'}:
b = 0 b = 0
@ -501,7 +501,7 @@ proc rawParseUInt(s: string, b: var BiggestUInt, start = 0): int =
prev = res prev = res
res = res * 10 + (ord(s[i]) - ord('0')).BiggestUInt res = res * 10 + (ord(s[i]) - ord('0')).BiggestUInt
if prev > res: if prev > res:
integerOutOfRangeDefect() integerOutOfRangeError()
inc(i) inc(i)
while i < s.len and s[i] == '_': inc(i) # underscores are allowed and ignored while i < s.len and s[i] == '_': inc(i) # underscores are allowed and ignored
b = res b = res
@ -540,7 +540,7 @@ proc parseUInt*(s: string, number: var uint, start = 0): int {.
result = parseBiggestUInt(s, res, start) result = parseBiggestUInt(s, res, start)
when sizeof(BiggestUInt) > sizeof(uint) and sizeof(uint) <= 4: when sizeof(BiggestUInt) > sizeof(uint) and sizeof(uint) <= 4:
if res > 0xFFFF_FFFF'u64: if res > 0xFFFF_FFFF'u64:
integerOutOfRangeDefect() integerOutOfRangeError()
if result != 0: if result != 0:
number = uint(res) number = uint(res)