update cppjson source code

Author: coderhare

cpp_json/JsonAPI/Jsonparser.cpp

@@ -84,16 +84,17 @@ namespace Jsonparser{
  }
  }
 
- PARSE_RESULT parser::parse_string_raw(char **str, size_t &len) {
+ PARSE_RESULT parser::parse_string_raw(string & s) {
  size_t head = this->stk.top;
  unsigned u, u2;
  stk.expect('\"');
  while(true){
  char ch = *stk.json++;
  switch(ch){
  case '\"':{
- len = this->stk.top - head;
- *str = (char*)stk.pop(len);
+ size_t len = this->stk.top - head;
+ char * p = (char *)stk.pop(len);
+ while(len--) s += *p++;
  return PARSE_OK;
  }
  case '\\':
@@ -140,9 +141,8 @@ namespace Jsonparser{
 
  PARSE_RESULT parser::parse_string(){
  PARSE_RESULT ret;
- char * s;
- size_t len;
- if((ret = parse_string_raw(&s, len)) == PARSE_OK) {
+ string s;
+ if((ret = parse_string_raw(s)) == PARSE_OK) {
  j.set_string(s);
  }
  return ret;
@@ -216,13 +216,12 @@ namespace Jsonparser{
  }
  while(true){
  if(*stk.json != '\"') return PARSE_MISS_KEY;
- char * str;
- size_t len;
- if((ret = parse_string_raw(&str, len)) != PARSE_OK)
+ string s;
+ if((ret = parse_string_raw(s)) != PARSE_OK)
  return ret;
  //we parse key and value and then we make_pair
  stk.parse_whitespace();
- string key(str, len);
+ string key(s);
  if(*stk.json != ':') return PARSE_MISS_COLON;
  stk.json++;
  stk.parse_whitespace();

cpp_json/JsonAPI/Jsonparser.h

@@ -41,7 +41,7 @@ constexpr int PARSER_STACK_INIT_SIZE = 256;
  private:
  PARSE_RESULT parse_literal(const char * literal, JSON::JSON_TYPE type);
 
- PARSE_RESULT parse_string_raw(char ** str, size_t & len);
+ PARSE_RESULT parse_string_raw(string & s);
 
  PARSE_RESULT parse_string();
 

cpp_json/cmake-build-debug/CMakeFiles/cpp_json.dir/CXX.includecache

@@ -6,10 +6,6 @@
 
 #IncludeRegexTransform: 
 
-/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Json.cpp
-Json.h
-/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Json.h
-
 /Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Json.h
 iostream
 -
@@ -26,3 +22,25 @@ memory
 cerrno
 -
 
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Jsonparser.h
+stack.h
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/stack.h
+Json.h
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Json.h
+
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Jsonstringifier.h
+stack.h
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/stack.h
+Json.h
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Json.h
+
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/stack.h
+Json.h
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Json.h
+
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/main.cpp
+JsonAPI/Jsonparser.h
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Jsonparser.h
+JsonAPI/Jsonstringifier.h
+/Users/wocaibujiaoquanmei/iCloud 云盘（归档）/GitHub/cppjson/cpp_json/JsonAPI/Jsonstringifier.h
+

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

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

cpp_json/cmake-build-debug/CMakeFiles/cpp_json.dir/main.cpp.o

@@ -7,9 +7,50 @@
 int main() {
  JSON::json j, j2;
  Jsonparser::parser p(j);
- p.parse("{\"key\":[true, false, {\"1\":true}, {\"2\": false}, \"sfjdls\", [true, {\"a\": false}]]}");
+ p.parse("{\n"
+ " \"name\": \"vue_test\",\n"
+ " \"version\": \"0.1.0\",\n"
+ " \"private\": true,\n"
+ " \"scripts\": {\n"
+ " \"serve\": \"vue-cli-service serve\",\n"
+ " \"build\": \"vue-cli-service build\",\n"
+ " \"lint\": \"vue-cli-service lint\"\n"
+ " },\n"
+ " \"dependencies\": {\n"
+ " \"core-js\": \"^3.6.5\",\n"
+ " \"vue\": \"^2.6.11\"\n"
+ " },\n"
+ " \"devDependencies\": {\n"
+ " \"@vue/cli-plugin-babel\": \"~4.5.0\",\n"
+ " \"@vue/cli-plugin-eslint\": \"~4.5.0\",\n"
+ " \"@vue/cli-service\": \"~4.5.0\",\n"
+ " \"babel-eslint\": \"^10.1.0\",\n"
+ " \"eslint\": \"^6.7.2\",\n"
+ " \"eslint-plugin-vue\": \"^6.2.2\",\n"
+ " \"vue-template-compiler\": \"^2.6.11\"\n"
+ " },\n"
+ " \"eslintConfig\": {\n"
+ " \"root\": true,\n"
+ " \"env\": {\n"
+ " \"node\": true\n"
+ " },\n"
+ " \"extends\": [\n"
+ " \"plugin:vue/essential\",\n"
+ " \"eslint:recommended\"\n"
+ " ],\n"
+ " \"parserOptions\": {\n"
+ " \"parser\": \"babel-eslint\"\n"
+ " },\n"
+ " \"rules\": {}\n"
+ " },\n"
+ " \"browserslist\": [\n"
+ " \"> 1%\",\n"
+ " \"last 2 versions\",\n"
+ " \"not dead\"\n"
+ " ]\n"
+ "}");
  Jsonparser::parser p2(j2);
- p2.parse("{\"key\":[true, false, {\"1\":true}, {\"2\": false}, \"sfjdls\", [true, {\"a\": false}]]}");
+ //p2.parse("{\"key\":[true, false, {\"1\":true}, {\"2\": false}, \"sfjdls\", [true, {\"a\": false}]]}");
  cout << j.get_type_format() << ' ' << endl;
  Jsonstringifier::stringifier g;
  cout << g.stringify(j);