Remove currentToken asserts
This commit is contained in:
@@ -515,7 +515,6 @@ private:
|
|||||||
|
|
||||||
PRESERVE_NONE static bool keepGoing(Parser2 *self) {
|
PRESERVE_NONE static bool keepGoing(Parser2 *self) {
|
||||||
if (self->empty()) {
|
if (self->empty()) {
|
||||||
assert(self->currentToken == T_EOF);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
auto token = self->nextToken();
|
auto token = self->nextToken();
|
||||||
@@ -529,7 +528,6 @@ private:
|
|||||||
}
|
}
|
||||||
PRESERVE_NONE static bool object(Parser2 *self) {
|
PRESERVE_NONE static bool object(Parser2 *self) {
|
||||||
self->pop();
|
self->pop();
|
||||||
assert(self->currentToken == T_LBRACE);
|
|
||||||
self->callbacks->on_begin_object(self->data);
|
self->callbacks->on_begin_object(self->data);
|
||||||
if (!self->push({T_STRING, T_COLON, N_VALUE, N_OBJECT_MAYBE_CONTINUE})) {
|
if (!self->push({T_STRING, T_COLON, N_VALUE, N_OBJECT_MAYBE_CONTINUE})) {
|
||||||
return false;
|
return false;
|
||||||
@@ -554,12 +552,10 @@ private:
|
|||||||
}
|
}
|
||||||
PRESERVE_NONE static bool string(Parser2 *self) {
|
PRESERVE_NONE static bool string(Parser2 *self) {
|
||||||
self->pop();
|
self->pop();
|
||||||
assert(self->currentToken == T_STRING);
|
|
||||||
MUSTTAIL return keepGoing(self);
|
MUSTTAIL return keepGoing(self);
|
||||||
}
|
}
|
||||||
PRESERVE_NONE static bool array(Parser2 *self) {
|
PRESERVE_NONE static bool array(Parser2 *self) {
|
||||||
self->pop();
|
self->pop();
|
||||||
assert(self->currentToken == T_LBRACKET);
|
|
||||||
self->callbacks->on_begin_array(self->data);
|
self->callbacks->on_begin_array(self->data);
|
||||||
if (!self->push({N_VALUE, N_ARRAY_MAYBE_CONTINUE})) {
|
if (!self->push({N_VALUE, N_ARRAY_MAYBE_CONTINUE})) {
|
||||||
return false;
|
return false;
|
||||||
@@ -568,7 +564,6 @@ private:
|
|||||||
}
|
}
|
||||||
PRESERVE_NONE static bool continueArray(Parser2 *self) {
|
PRESERVE_NONE static bool continueArray(Parser2 *self) {
|
||||||
self->pop();
|
self->pop();
|
||||||
assert(self->currentToken == T_COMMA);
|
|
||||||
if (!self->push({N_VALUE, N_ARRAY_MAYBE_CONTINUE})) {
|
if (!self->push({N_VALUE, N_ARRAY_MAYBE_CONTINUE})) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -576,7 +571,6 @@ private:
|
|||||||
}
|
}
|
||||||
PRESERVE_NONE static bool continueObject(Parser2 *self) {
|
PRESERVE_NONE static bool continueObject(Parser2 *self) {
|
||||||
self->pop();
|
self->pop();
|
||||||
assert(self->currentToken == T_COMMA);
|
|
||||||
if (!self->push({T_STRING, T_COLON, N_VALUE, N_OBJECT_MAYBE_CONTINUE})) {
|
if (!self->push({T_STRING, T_COLON, N_VALUE, N_OBJECT_MAYBE_CONTINUE})) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -584,13 +578,11 @@ private:
|
|||||||
}
|
}
|
||||||
PRESERVE_NONE static bool finishArray(Parser2 *self) {
|
PRESERVE_NONE static bool finishArray(Parser2 *self) {
|
||||||
self->pop();
|
self->pop();
|
||||||
assert(self->currentToken == T_RBRACKET);
|
|
||||||
self->callbacks->on_end_array(self->data);
|
self->callbacks->on_end_array(self->data);
|
||||||
MUSTTAIL return keepGoing(self);
|
MUSTTAIL return keepGoing(self);
|
||||||
}
|
}
|
||||||
PRESERVE_NONE static bool finishObject(Parser2 *self) {
|
PRESERVE_NONE static bool finishObject(Parser2 *self) {
|
||||||
self->pop();
|
self->pop();
|
||||||
assert(self->currentToken == T_RBRACE);
|
|
||||||
self->callbacks->on_end_object(self->data);
|
self->callbacks->on_end_object(self->data);
|
||||||
MUSTTAIL return keepGoing(self);
|
MUSTTAIL return keepGoing(self);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user