Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions include/fast_float/ascii_number.h
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,8 @@ parse_int_string(UC const *p, UC const *pend, T &value,

UC const *const start_digits = p;

FASTFLOAT_IF_CONSTEXPR17((std::is_same<T, std::uint8_t>::value)) {
FASTFLOAT_IF_CONSTEXPR17((std::is_same<T, std::uint8_t>::value &&
sizeof(UC) == 1)) {
if (base == 10) {
const size_t len = (size_t)(pend - p);
if (len == 0) {
Expand Down Expand Up @@ -692,7 +693,8 @@ parse_int_string(UC const *p, UC const *pend, T &value,
}
}

FASTFLOAT_IF_CONSTEXPR17((std::is_same<T, std::uint16_t>::value)) {
FASTFLOAT_IF_CONSTEXPR17((std::is_same<T, std::uint16_t>::value &&
sizeof(UC) == 1)) {
if (base == 10) {
const size_t len = size_t(pend - p);
if (len == 0) {
Expand Down
57 changes: 57 additions & 0 deletions tests/fast_int.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1295,6 +1295,63 @@ int main() {
return EXIT_FAILURE;
}
}
// The uint8_t and uint16_t base-10 paths use a byte-oriented fast path. A
// wider code unit whose low byte is an ASCII digit (e.g. U+2131..U+2139) must
// not be mistaken for that digit. The generic path already rejects these for
// int; the fixed-width fast paths must agree. Lengths of 1..5 exercise both
// the uint8_t path and the 4-digit uint16_t SWAR path.
{
const std::u16string bad16[] = {
u"ℹ",
u"ℱℲ",
u"ℱℲℳ",
u"ℱℲℳℴ",
u"ℱℲℳℴℵ",
};
const std::u32string bad32[] = {
U"ℹ",
U"ℱℲℳ",
U"ℱℲℳℴ",
U"ℱℲℳℴℵ",
};
bool failed = false;
for (auto const &s : bad16) {
uint8_t r8 = 123;
auto a8 = fast_float::from_chars(s.data(), s.data() + s.size(), r8);
if (a8.ec == std::errc()) {
failed = true;
std::cerr << "Incorrectly parsed wide units as uint8_t " << unsigned(r8)
<< "." << std::endl;
}
uint16_t r16 = 123;
auto a16 = fast_float::from_chars(s.data(), s.data() + s.size(), r16);
if (a16.ec == std::errc()) {
failed = true;
std::cerr << "Incorrectly parsed wide units as uint16_t " << r16 << "."
<< std::endl;
}
}
for (auto const &s : bad32) {
uint8_t r8 = 123;
auto a8 = fast_float::from_chars(s.data(), s.data() + s.size(), r8);
if (a8.ec == std::errc()) {
failed = true;
std::cerr << "Incorrectly parsed wide units as uint8_t " << unsigned(r8)
<< "." << std::endl;
}
uint16_t r16 = 123;
auto a16 = fast_float::from_chars(s.data(), s.data() + s.size(), r16);
if (a16.ec == std::errc()) {
failed = true;
std::cerr << "Incorrectly parsed wide units as uint16_t " << r16 << "."
<< std::endl;
}
}

if (failed) {
return EXIT_FAILURE;
}
}

return EXIT_SUCCESS;
}
Expand Down
Loading