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

Fixes #5585 and adds test on it

Browse Source 
[SVN r72315]
This commit is contained in:
Antony Polukhin
2011-05-31 20:46:37 +00:00
parent ccaa3059e8
commit cd0167d6b8
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/lexical_cast.hpp
+24 -4
View File
@@ -654,6 +654,7 @@ namespace boost
unsigned char current_grouping = 0;
CharT const thousands_sep = np.thousands_sep();
char remained = grouping[current_grouping] - 1;
bool shall_we_return = true;
for(;end>=begin; --end)
{
@@ -671,12 +672,31 @@ namespace boost
multiplier *= 10;
--remained;
} else {
if ( !Traits::eq(*end, thousands_sep) || begin == end ) return false;
if (current_grouping < grouping_size-1 ) ++current_grouping;
remained = grouping[current_grouping];
if ( !Traits::eq(*end, thousands_sep) ) //|| begin == end ) return false;
{
/*
* According to Programming languages - C++
* Digit grouping is checked. That is, the positions of discarded
* separators is examined for consistency with
* use_facet<numpunct<charT> >(loc ).grouping()
*
* BUT what if there is no separators at all and grouping()
* is not empty? Well, we have no extraced separators, so we
* won`t check them for consistency. This will allow us to
* work with "C" locale from other locales
*/
shall_we_return = false;
break;
} else {
if ( begin == end ) return false;
if (current_grouping < grouping_size-1 ) ++current_grouping;
remained = grouping[current_grouping];
}
}
}
} else
if (shall_we_return) return true;
}
#endif
{
while ( begin <= end )