Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e462f1477 |
+9
-19
@@ -139,8 +139,7 @@ struct Parser3 {
|
||||
stackPtr = stack();
|
||||
std::ignore = push({N_VALUE, N_WHITESPACE, T_EOF});
|
||||
inKey = false;
|
||||
rejected = false;
|
||||
overflowed = false;
|
||||
terminalStatus = WeaselJson_OK;
|
||||
utf8Codepoint = 0;
|
||||
utf16Surrogate = 0;
|
||||
minCodepoint = 0;
|
||||
@@ -163,8 +162,7 @@ struct Parser3 {
|
||||
NumDfa numDfa;
|
||||
Utf8Dfa strDfa;
|
||||
bool inKey = false;
|
||||
bool rejected = false;
|
||||
bool overflowed = false;
|
||||
WeaselJsonStatus terminalStatus = WeaselJson_OK;
|
||||
|
||||
#ifndef HAS_MUSTTAIL
|
||||
char *stashBufForTrampoline;
|
||||
@@ -1072,16 +1070,12 @@ constexpr inline struct ContinuationTable {
|
||||
inline WeaselJsonStatus Parser3::parse(char *buf, int len) {
|
||||
this->dataBegin = this->writeBuf = buf;
|
||||
|
||||
if (this->rejected) [[unlikely]] {
|
||||
return WeaselJson_REJECT;
|
||||
}
|
||||
|
||||
if (this->overflowed) [[unlikely]] {
|
||||
return WeaselJson_OVERFLOW;
|
||||
if (this->terminalStatus != WeaselJson_OK) [[unlikely]] {
|
||||
return this->terminalStatus;
|
||||
}
|
||||
|
||||
if (len < 0) [[unlikely]] {
|
||||
this->rejected = true;
|
||||
this->terminalStatus = WeaselJson_REJECT;
|
||||
return WeaselJson_REJECT;
|
||||
}
|
||||
|
||||
@@ -1091,10 +1085,8 @@ inline WeaselJsonStatus Parser3::parse(char *buf, int len) {
|
||||
// range.
|
||||
ContinuationStatus status =
|
||||
symbolTables.continuations[top()](this, buf, buf + len);
|
||||
if (status == WeaselJson_REJECT) {
|
||||
this->rejected = true;
|
||||
} else if (status == WeaselJson_OVERFLOW) {
|
||||
this->overflowed = true;
|
||||
if (status == WeaselJson_REJECT || status == WeaselJson_OVERFLOW) {
|
||||
this->terminalStatus = WeaselJsonStatus(status);
|
||||
}
|
||||
return WeaselJsonStatus(status);
|
||||
#else
|
||||
@@ -1103,10 +1095,8 @@ inline WeaselJsonStatus Parser3::parse(char *buf, int len) {
|
||||
while ((result = symbolTables.continuations[top()](
|
||||
this, stashBufForTrampoline, buf + len)) == kBounce)
|
||||
;
|
||||
if (result == WeaselJson_REJECT) {
|
||||
this->rejected = true;
|
||||
} else if (result == WeaselJson_OVERFLOW) {
|
||||
this->overflowed = true;
|
||||
if (result == WeaselJson_REJECT || result == WeaselJson_OVERFLOW) {
|
||||
this->terminalStatus = WeaselJsonStatus(result);
|
||||
}
|
||||
return WeaselJsonStatus(result);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user