Skip to content

fix(strconv): adjust the logic for validating base #2015

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

Merged
merged 2 commits into from
Apr 28, 2025
Merged

fix(strconv): adjust the logic for validating base #2015

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
83927be
test(strconv): add test to show questionable behavior
peter-jerry-ye Apr 27, 2025
44bb164
fix(strconv): adjust the logic for validating base
peter-jerry-ye Apr 27, 2025
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
37 changes: 17 additions & 20 deletions strconv/int.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,30 @@ fn check_and_consume_base(
view : @string.StringView,
base : Int
) -> (Int, @string.StringView, Bool)!StrConvError {
match view {
['0', 'x' | 'X', .. rest] => {
guard base is (0 | 16) else { base_err!() }
(16, rest, true)
// if the base is not given, we need to determine it from the prefix
if base == 0 {
match view {
['0', 'x' | 'X', .. rest] => (16, rest, true)
['0', 'o' | 'O', .. rest] => (8, rest, true)
['0', 'b' | 'B', .. rest] => (2, rest, true)
_ => (10, view, false)
}
['0', 'o' | 'O', .. rest] => {
guard base is (0 | 8) else { base_err!() }
(8, rest, true)
}
['0', 'b' | 'B', .. rest] => {
guard base is (0 | 2) else { base_err!() }
(2, rest, true)
} else {
// if the base is given, we need to check whether the prefix is consistent with it
match view {
['0', 'x' | 'X', .. rest] if base == 16 => (16, rest, true)
['0', 'o' | 'O', .. rest] if base == 8 => (8, rest, true)
['0', 'b' | 'B', .. rest] if base == 2 => (2, rest, true)
_ => if base is (2..=36) { (base, view, false) } else { base_err!() }
}
rest =>
match base {
0 => (10, rest, false)
2..=36 => (base, rest, false)
_ => base_err!()
}
}
}

///|
test {
inspect!(parse_int64?("0b01", base=3), content="Err(invalid base)")
inspect!(parse_int64?("0x01", base=3), content="Err(invalid base)")
inspect!(parse_int64?("0o01", base=3), content="Err(invalid base)")
inspect!(parse_int64?("0b01", base=3), content="Err(invalid syntax)")
inspect!(parse_int64?("0x01", base=3), content="Err(invalid syntax)")
inspect!(parse_int64?("0o01", base=3), content="Err(invalid syntax)")
}

///|
Expand Down
25 changes: 25 additions & 0 deletions strconv/int_test.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,28 @@ test "edge cases" {
// Underscore is allowed between the prefix and the first digit
inspect!(@strconv.parse_int64?("0x_DEADBEEF"), content="Ok(3735928559)")
}

///|
test "more edge cases" {
inspect!(@strconv.parse_int64?("0b01", base=16), content="Ok(2817)")
inspect!(
@strconv.parse_int64?("0o01", base=16),
content="Err(invalid syntax)",
)
inspect!(@strconv.parse_int64?("0x01", base=16), content="Ok(1)")
inspect!(@strconv.parse_int?("0b01", base=16), content="Ok(2817)")
inspect!(@strconv.parse_int?("0o01", base=16), content="Err(invalid syntax)")
inspect!(@strconv.parse_int?("0x01", base=16), content="Ok(1)")
inspect!(@strconv.parse_uint?("0b01", base=16), content="Ok(2817)")
inspect!(@strconv.parse_uint?("0o01", base=16), content="Err(invalid syntax)")
inspect!(@strconv.parse_uint?("0x01", base=16), content="Ok(1)")
inspect!(@strconv.parse_uint64?("0b01", base=16), content="Ok(2817)")
inspect!(
@strconv.parse_uint64?("0o01", base=16),
content="Err(invalid syntax)",
)
inspect!(@strconv.parse_uint64?("0x01", base=16), content="Ok(1)")
inspect!(@strconv.parse_int?("0b01", base=10), content="Err(invalid syntax)")
inspect!(@strconv.parse_int?("0o01", base=10), content="Err(invalid syntax)")
inspect!(@strconv.parse_int?("0x01", base=10), content="Err(invalid syntax)")
}