update cppjson source code

Author: coderhare

cpp_json/JsonAPI/Json.cpp

@@ -76,6 +76,7 @@ namespace JSON{
  case JSON_FALSE: return "boolean";
  case JSON_ARRAY: return "array";
  case JSON_OBJECT: return "object";
+ case JSON_NUMBER: return "number";
  }
  }
 

cpp_json/JsonAPI/Jsonparser.cpp

@@ -148,6 +148,7 @@ namespace Jsonparser{
  return ret;
  }
  PARSE_RESULT parser::parse_number(){
+ const char * p = this->stk.json, *q;
  if(*this->stk.json == '-') this->stk.json++;
  if(*this->stk.json == '0') this->stk.json++;
  else{
@@ -167,7 +168,10 @@ namespace Jsonparser{
  }
  errno = 0;
  j.set_null();
- j.set_number(strtod(this->stk.json, nullptr));
+ q = stk.json;
+ stk.json = p;
+ j.set_number(std::stod(stk.json));
+ stk.json = q;
  if(errno == ERANGE && (j.get_number() == HUGE_VAL || j.get_number() == -HUGE_VAL))
  return PARSE_NUMBER_TOO_BIG;
  return PARSE_OK;

cpp_json/JsonAPI/Jsonstringifier.cpp

@@ -41,7 +41,7 @@ namespace Jsonstringifier{
  case JSON::JSON_NULL: stk.put_string( "null"); break;
  case JSON::JSON_FALSE: stk.put_string("false"); break;
  case JSON::JSON_TRUE: stk.put_string("true"); break;
- case JSON::JSON_NUMBER: stk.top -= 32 - sprintf((char*)stk.push( 32), "%.17g", j.get_number()); break;
+ case JSON::JSON_NUMBER: stk.top -= 32 - sprintf((char*)stk.push( 32), "%.16g", j.get_number()); break;
  case JSON::JSON_STRING: stringify_string(j.get_string()); break;
  case JSON::JSON_ARRAY:
  stk.put_char('[');

cpp_json/cmake-build-debug/CMakeFiles/cpp_json.dir/JsonAPI/Jsonparser.cpp.o

@@ -1,3 +1,3 @@
-Start testing: Dec 18 18:29 CST
+Start testing: Dec 19 17:36 CST
 ----------------------------------------------------------
-End testing: Dec 18 18:29 CST
+End testing: Dec 19 17:36 CST

cpp_json/cmake-build-debug/CMakeFiles/cpp_json.dir/JsonAPI/Jsonstringifier.cpp.o

@@ -9,7 +9,7 @@ int main() {
  Jsonparser::parser p(j);
  p.parse("{\n"
  " \"name\": \"vue_test\",\n"
- " \"version\": \"0.1.0\",\n"
+ " \"version\": 1.4,\n"
  " \"private\": true,\n"
  " \"scripts\": {\n"
  " \"serve\": \"vue-cli-service serve\",\n"
@@ -49,6 +49,8 @@ int main() {
  " \"not dead\"\n"
  " ]\n"
  "}");
+ //p.parse("1.4");
+ //cout << j.get_number() << endl;
  Jsonparser::parser p2(j2);
  //p2.parse("{\"key\":[true, false, {\"1\":true}, {\"2\": false}, \"sfjdls\", [true, {\"a\": false}]]}");
  cout << j.get_type_format() << ' ' << endl;