External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

to add diabolical test case with trailing zeros and no radix point

Browse Source
This commit is contained in:
Cameron T. Druyor 2016-04-29 16:48:05 -04:00
parent cd2e559efd
commit e2163c36b5
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/json.hpp
View File

@ -6295,19 +6295,6 @@ class basic_json
<< std::fixed << m_value.number_float; << std::fixed << m_value.number_float;
o << ss.str(); o << ss.str();
} }
std::stringstream applesauce;
applesauce << o.rdbuf();
std::string s2 = applesauce.str();
if(isIssue230(m_type,m_value)) {
printf("m_type.bits.exp_cap = %i \n",m_type.bits.exp_cap);
printf("m_type.bits.exp_plus = %i \n",m_type.bits.exp_plus);
printf("m_type.bits.has_exp = %i \n",m_type.bits.has_exp);
printf("m_type.bits.parsed = %i \n",m_type.bits.parsed);
printf("m_type.bits.precision = %i \n",m_type.bits.precision);
printf("m_type.bits.type = %i \n",m_type.bits.type);
printf("m_value = %f\n",m_value.number_float);
throw std::logic_error("found it");
}
} }
else else
{ {
@ -8635,7 +8622,23 @@ basic_json_parser_63:
// If no radix point was found then precision would now be set to // If no radix point was found then precision would now be set to
// the number of digits, which is wrong - clear it. // the number of digits, which is wrong - clear it.
result.m_type.bits.precision = precision & found_radix_point; if(found_radix_point == 0) {
auto ptr = m_start;
int trailing_zeros = 0;
for (int j = precision-1;j>=0;--j){
if(*(ptr+j) == '0')
++trailing_zeros;
else if(*(ptr+j) > '0' and *(ptr+j) <= '9' or *(ptr+j) == '-')
break;
else
throw std::logic_error("wtf character did I grab?: "+std::to_string(*(ptr+j)));
}
precision -= trailing_zeros;
result.m_type.bits.precision = precision-1;
}
else{
result.m_type.bits.precision = precision & found_radix_point;
}
// save the value (if not a float) // save the value (if not a float)
if (type == value_t::number_unsigned) if (type == value_t::number_unsigned)

5
test/unit.cpp
View File

@ -12717,6 +12717,8 @@ TEST_CASE("regression tests")
json j2a = 2342e-2; json j2a = 2342e-2;
//issue #230 //issue #230
json j2b = json::parse("2342e-2"); json j2b = json::parse("2342e-2");
//diabolical version
json j2c = json::parse("234200e-4");
json j3a = 10E3; json j3a = 10E3;
json j3b = json::parse("10E3"); json j3b = json::parse("10E3");
@ -12740,7 +12742,8 @@ TEST_CASE("regression tests")
CHECK(j2a.dump() == "23.42"); CHECK(j2a.dump() == "23.42");
//issue #230 //issue #230
CHECK(j2b.dump() == "23.42"); CHECK(j2b.dump() == "2.342e01");
CHECK(j2c.dump() == "2.342e01");
CHECK(j3a.dump() == "10000"); CHECK(j3a.dump() == "10000");
CHECK(j3b.dump() == "1E04"); CHECK(j3b.dump() == "1E04");