collarbone-annihilation/libjsonincpp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of useless junk + fixed parser bug

Browse Source
This commit is contained in:
Андреев Григорий 2024-09-01 17:25:50 +03:00
parent 7f8bc8a93a
commit 69874f45ea
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/library/jsonincpp/parser.cpp
View File

@ -43,7 +43,7 @@ namespace json {
break;
skip(pctx);
if (ch == '0' && d == 0)
break;
return;
if (d < 18) {
mantis_max18 = mantis_max18 * 10 + (ch - '0');
d++;
@ -208,37 +208,25 @@ namespace json {
return NULL;
}
int parse_str(const std::string& text, JSON& ret_ans, WrongSyntax& ret_error) {
assert(ret_ans.isNull());
ParserContext pctx(text);
try {
std::vector<std::unique_ptr<ParsingCall>> callStack;
callStack.push_back(std::make_unique<ValueParseCall>(ret_ans));
while (!callStack.empty()) {
std::unique_ptr<ParsingCall> rt = callStack.back()->here(pctx);
if (rt) {
callStack.push_back(std::move(rt));
} else {
callStack.pop_back();
}
}
skipWhitespaces(pctx);
if (!isEof(pctx))
throw bad_syntax();
return 0;
} catch (bad_syntax&) {
ret_error.line = pctx.line;
ret_error.column = pctx.column;
return -1;
}
}
JSON parse_str_flawless(const std::string &text) {
WrongSyntax wsErr;
ParserContext pctx(text);
JSON result;
int ret = parse_str(text, result, wsErr);
if (ret < 0)
throw misuse("JSON parsing error");
std::vector<std::unique_ptr<ParsingCall>> callStack;
callStack.push_back(std::make_unique<ValueParseCall>(result));
while (!callStack.empty()) {
std::unique_ptr<ParsingCall> rt = callStack.back()->here(pctx);
if (rt) {
callStack.push_back(std::move(rt));
} else {
callStack.pop_back();
}
}
skipWhitespaces(pctx);
if (!isEof(pctx))
throw bad_syntax();
return result;
}
}

2
src/tests/test0.cpp
View File

@ -48,6 +48,8 @@ void ftest(int i) {
}
int main(){
prettyprint_json(parse_str_flawless("{\"C\":{\"L\":0}}"));
json::JSON A;
A[1].asString();
A[0].asInteger();