Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RangeError are actually defect and not catchable. #111

Merged
merged 2 commits into from
Oct 8, 2021
Merged

RangeError are actually defect and not catchable. #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e48243
RangeError are actually defect and not catchable.
mratsim Oct 6, 2021
83d6090
Don't use range types at runtime they throw RangeDefect
mratsim Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions stint/io.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ func stint*(x: StInt, bits: static[int]): StInt[bits] {.inline.} =
# due to bug #92, we skip negative range check
when false:
const dmin = stint((type result).low, N)
if x < dmin: raise newException(RangeError, "value out of range")
if x < dmin: raise newException(ValueError, "value out of range")

template checkPositiveRange() =
const dmax = stint((type result).high, N)
if x > dmax: raise newException(RangeError, "value out of range")
if x > dmax: raise newException(ValueError, "value out of range")

when bits <= 64:
if x.isNegative:
Expand All @@ -183,7 +183,7 @@ func stint*(x: StInt, bits: static[int]): StInt[bits] {.inline.} =
func stint*(x: StUint, bits: static[int]): StInt[bits] {.inline.} =
const N = bitsof(x.data)
const dmax = stuint((type result).high, N)
if x > dmax: raise newException(RangeError, "value out of range")
if x > dmax: raise newException(ValueError, "value out of range")
when N < bits:
when N <= 64:
result = stint(x.data, bits)
Expand All @@ -209,6 +209,8 @@ func readHexChar(c: char): int8 {.inline.}=
func skipPrefixes(current_idx: var int, str: string, radix: range[2..16]) {.inline.} =
## Returns the index of the first meaningful char in `hexStr` by skipping
## "0x" prefix
# Always called from a context where radix is known at compile-time
# and checked within 2..16 and so cannot throw a RangeDefect at runtime

if str.len < 2:
return
Expand Down Expand Up @@ -237,9 +239,11 @@ func nextNonBlank(current_idx: var int, s: string) {.inline.} =
while current_idx < s.len and s[current_idx] in blanks:
inc current_idx

func readDecChar(c: range['0'..'9']): int {.inline.}=
func readDecChar(c: char): int {.inline.}=
## Converts a decimal char to an int
# specialization without branching for base <= 10.
if c notin {'0'..'9'}:
raise newException(ValueError, "Character out of '0'..'9' range")
ord(c) - ord('0')

func parse*[bits: static[int]](input: string, T: typedesc[Stuint[bits]], radix: static[uint8] = 10): T =
Expand Down
2 changes: 1 addition & 1 deletion tests/test_conversion.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ template chkStuintToStint(chk: untyped, N, bits: static[int]) =
# expect(...) cannot run in Nim VM
discard
else:
expect(RangeError):
expect(ValueError):
discard stint(v, bits)
else:
let vv = stint(v, bits)
Expand Down