townforge/spirit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extract_uint: Fixed IgnoreOverflowDigits=true problem at overflow

Browse Source 
The IgnoreOverflowDigits=true parser always succeeds and because of that it
expects from the digits parser that a number passed as inout argument will be
changed only on success.

Changed negative_accumulator and X3 for consistency.
This commit is contained in:
Nikita Kniazev 2019-02-21 23:20:30 +03:00
parent 92596fe02e
commit eb8eeb2fbc
3 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp
View File

@ -154,14 +154,14 @@ namespace boost { namespace spirit { namespace qi { namespace detail
if (n > val)
return false;
n *= Radix;
T tmp = n * Radix;
// Ensure n += digit will not overflow
const int digit = radix_traits<Radix>::digit(ch);
if (n > max - digit)
if (tmp > max - digit)
return false;
n += static_cast<T>(digit);
n = tmp + static_cast<T>(digit);
return true;
}
};
@ -186,14 +186,14 @@ namespace boost { namespace spirit { namespace qi { namespace detail
if (n < val)
return false;
n *= Radix;
T tmp = n * Radix;
// Ensure n -= digit will not underflow
int const digit = radix_traits<Radix>::digit(ch);
if (n < min + digit)
if (tmp < min + digit)
return false;
n -= static_cast<T>(digit);
n = tmp - static_cast<T>(digit);
return true;
}
};

12
include/boost/spirit/home/x3/support/numeric_utils/detail/extract_int.hpp
View File

@ -152,14 +152,14 @@ namespace boost { namespace spirit { namespace x3 { namespace detail
if (n > val)
return false;
n *= Radix;
T tmp = n * Radix;
// Ensure n += digit will not overflow
const int digit = radix_traits<Radix>::digit(ch);
if (n > max - digit)
if (tmp > max - digit)
return false;
n += static_cast<T>(digit);
n = tmp + static_cast<T>(digit);
return true;
}
};
@ -183,14 +183,14 @@ namespace boost { namespace spirit { namespace x3 { namespace detail
if (n < val)
return false;
n *= Radix;
T tmp = n * Radix;
// Ensure n -= digit will not underflow
int const digit = radix_traits<Radix>::digit(ch);
if (n < min + digit)
if (tmp < min + digit)
return false;
n -= static_cast<T>(digit);
n = tmp - static_cast<T>(digit);
return true;
}
};

29
test/qi/extract_int.cpp
View File

@ -127,6 +127,33 @@ void test_unparsed_digits_are_not_consumed(char const* it, char const* end, int
}
}
template <typename T, int Base>
void test_ignore_overflow_digits(char const* it, char const* end, int i)
{
// TODO: Check accumulating too?
if (i < 0) return; // extract_int does not support IgnoreOverflowDigits
bool has_sign = *it == '+' || *it == '-';
char const* begin = it;
int initial = Base - i % Base; // just a 'random' non-equal to i number
T x(initial);
BOOST_TEST((qi::extract_uint<T, Base, 1, -1, false, true>::call(it, end, x)));
if (T::min <= i && i <= T::max) {
BOOST_TEST(it == end);
BOOST_TEST_EQ(x, i);
}
else {
BOOST_TEST_EQ(it - begin, (qi::detail::digits_traits<T, Base>::value) + has_sign);
if (Base == std::numeric_limits<T>::radix)
BOOST_TEST_EQ(it - begin, std::numeric_limits<T>::digits + has_sign);
if (Base == 10)
BOOST_TEST_EQ(it - begin, std::numeric_limits<T>::digits10 + has_sign);
int expected = i;
for (char const* p = it; p < end; ++p) expected /= Base;
BOOST_TEST_EQ(x, expected);
}
}
template <typename T, int Base>
void run_tests(char const* begin, char const* end, int i)
{
@ -136,6 +163,8 @@ void run_tests(char const* begin, char const* end, int i)
test_overflow_handling<T, Base, 2>(begin, end, i);
// Check that unparsed digits are not consumed
test_unparsed_digits_are_not_consumed<T, Base>(begin, end, i);
// Check that IgnoreOverflowDigits does what we expect
test_ignore_overflow_digits<T, Base>(begin, end, i);
}
int main()