diff options
| author | Timothee Cour <timothee.cour2@gmail.com> | 2020-06-09 23:57:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 23:57:27 -0700 |
| commit | b7b84fa1652e6ef4ea203f553a6c1f0aed51bcf3 (patch) | |
| tree | 82593dd53b4713f87539073673660c41163c9877 /lib | |
| parent | d81bc69587efb9249ad2e022d1bc3f8e4865506f (diff) | |
| download | Nim-b7b84fa1652e6ef4ea203f553a6c1f0aed51bcf3.tar.gz | |
parseutils: integerOutOfRangeDefect => integerOutOfRangeError (#14627)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/parseutils.nim | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/pure/parseutils.nim b/lib/pure/parseutils.nim index c185eca37..c358005f1 100644 --- a/lib/pure/parseutils.nim +++ b/lib/pure/parseutils.nim @@ -393,7 +393,7 @@ proc captureBetween*(s: string, first: char, second = '\0', start = 0): string = result = "" 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") # See #6752 @@ -416,11 +416,11 @@ proc rawParseInt(s: string, b: var BiggestInt, start = 0): int = if b >= (low(BiggestInt) + c) div 10: b = b * 10 - c else: - integerOutOfRangeDefect() + integerOutOfRangeError() inc(i) while i < s.len and s[i] == '_': inc(i) # underscores are allowed and ignored if sign == -1 and b == low(BiggestInt): - integerOutOfRangeDefect() + integerOutOfRangeError() else: b = b * sign result = i - start @@ -459,7 +459,7 @@ proc parseInt*(s: string, number: var int, start = 0): int {. result = parseBiggestInt(s, res, start) when sizeof(int) <= 4: if res < low(int) or res > high(int): - integerOutOfRangeDefect() + integerOutOfRangeError() if result != 0: number = int(res) @@ -493,7 +493,7 @@ proc rawParseUInt(s: string, b: var BiggestUInt, start = 0): int = prev = 0.BiggestUInt i = start 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] in {'0'..'9'}: b = 0 @@ -501,7 +501,7 @@ proc rawParseUInt(s: string, b: var BiggestUInt, start = 0): int = prev = res res = res * 10 + (ord(s[i]) - ord('0')).BiggestUInt if prev > res: - integerOutOfRangeDefect() + integerOutOfRangeError() inc(i) while i < s.len and s[i] == '_': inc(i) # underscores are allowed and ignored b = res @@ -540,7 +540,7 @@ proc parseUInt*(s: string, number: var uint, start = 0): int {. result = parseBiggestUInt(s, res, start) when sizeof(BiggestUInt) > sizeof(uint) and sizeof(uint) <= 4: if res > 0xFFFF_FFFF'u64: - integerOutOfRangeDefect() + integerOutOfRangeError() if result != 0: number = uint(res) |