feedc0de/boost_conversion
1
0
Fork 0
forked from boostorg/conversion
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Antony Polukhin
2014-03-14 23:47:58 +04:00
parent 9e6aa219d3 d1a51b897d
commit e3e4d3836a
2 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/boost/lexical_cast.hpp
View File

@@ -1878,35 +1878,37 @@ namespace boost {
} }
#endif #endif
/*
* case "-0" || "0" || "+0" : output = false; return true;
* case "1" || "+1": output = true; return true;
* default: return false;
*/
bool operator>>(bool& output) BOOST_NOEXCEPT { bool operator>>(bool& output) BOOST_NOEXCEPT {
output = false; // Suppress warning about uninitalized variable
if (start == finish) return false;
CharT const zero = lcast_char_constants<CharT>::zero; CharT const zero = lcast_char_constants<CharT>::zero;
CharT const plus = lcast_char_constants<CharT>::plus; CharT const plus = lcast_char_constants<CharT>::plus;
CharT const minus = lcast_char_constants<CharT>::minus; CharT const minus = lcast_char_constants<CharT>::minus;
output = false; // Suppress warning about uninitalized variable const CharT* const dec_finish = finish - 1;
switch (finish - start) { output = Traits::eq(*dec_finish, zero + 1);
case 1: if (!output && !Traits::eq(*dec_finish, zero)) {
output = Traits::eq(start[0], zero+1); return false; // Does not ends on '0' or '1'
return output || Traits::eq(start[0], zero );
case 2:
if (Traits::eq(plus, *start)) {
++start;
output = Traits::eq(start[0], zero + 1);
return output || Traits::eq(start[0], zero );
} else {
return Traits::eq( minus, *start)
&& Traits::eq( zero, start[1]);
}
default:
return false;
} }
if (start == dec_finish) return true;
// We may have sign at the beginning
if (Traits::eq(plus, *start) || (Traits::eq(minus, *start) && !output)) {
++ start;
}
// Skipping zeros
while (start != dec_finish) {
if (!Traits::eq(zero, *start)) {
return false; // Not a zero => error
}
++ start;
}
return true;
} }
bool operator>>(float& output) { return lcast_ret_float<Traits>(output,start,finish); } bool operator>>(float& output) { return lcast_ret_float<Traits>(output,start,finish); }

27
test/lexical_cast_test.cpp
View File

@@ -272,11 +272,32 @@ void test_conversion_to_bool()
BOOST_CHECK_THROW( BOOST_CHECK_THROW(
lexical_cast<bool>(std::string("Test")), bad_lexical_cast); lexical_cast<bool>(std::string("Test")), bad_lexical_cast);
BOOST_CHECK(lexical_cast<bool>("+1") == true ); BOOST_CHECK(lexical_cast<bool>("+1") == true);
BOOST_CHECK(lexical_cast<bool>("+0") == false ); BOOST_CHECK(lexical_cast<bool>("+0") == false);
BOOST_CHECK(lexical_cast<bool>("-0") == false ); BOOST_CHECK(lexical_cast<bool>("-0") == false);
BOOST_CHECK_THROW(lexical_cast<bool>("--0"), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<bool>("--0"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("-+-0"), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<bool>("-+-0"), bad_lexical_cast);
BOOST_CHECK(lexical_cast<bool>("0") == false);
BOOST_CHECK(lexical_cast<bool>("1") == true);
BOOST_CHECK(lexical_cast<bool>("00") == false);
BOOST_CHECK(lexical_cast<bool>("00000000000") == false);
BOOST_CHECK(lexical_cast<bool>("000000000001") == true);
BOOST_CHECK(lexical_cast<bool>("+00") == false );
BOOST_CHECK(lexical_cast<bool>("-00") == false );
BOOST_CHECK(lexical_cast<bool>("+00000000001") == true );
BOOST_CHECK_THROW(lexical_cast<bool>("020"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("00200"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("-00200"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("+00200"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("000000000002"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("-1"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("-0000000001"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("00000000011"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("001001"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("-00000000010"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<bool>("-000000000100"), bad_lexical_cast);
} }
void test_conversion_to_string() void test_conversion_to_string()