Remove switch
GCC and Clang cannot agree on what constitutes a good switch statement.
This commit is contained in:
parent
e7fd707698
commit
bf19c1a0be
@ -139,50 +139,33 @@ bool LookaheadParser::EnterArray() {
|
||||
}
|
||||
|
||||
const char* LookaheadParser::NextObjectKey() {
|
||||
switch (st_) {
|
||||
case kHasKey: {
|
||||
if (st_ == kHasKey) {
|
||||
const char* result = v_.GetString();
|
||||
ParseNext();
|
||||
return result;
|
||||
}
|
||||
|
||||
case kExitingObject:
|
||||
if (st_ == kExitingObject) {
|
||||
ParseNext();
|
||||
return 0;
|
||||
}
|
||||
|
||||
case kError:
|
||||
case kHasNull:
|
||||
case kHasBool:
|
||||
case kHasNumber:
|
||||
case kHasString:
|
||||
case kEnteringObject:
|
||||
case kEnteringArray:
|
||||
case kExitingArray:
|
||||
st_ = kError;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
bool LookaheadParser::NextArrayValue() {
|
||||
switch (st_) {
|
||||
case kExitingArray:
|
||||
if (st_ == kExitingArray) {
|
||||
ParseNext();
|
||||
return false;
|
||||
}
|
||||
|
||||
case kError:
|
||||
case kExitingObject:
|
||||
case kHasKey:
|
||||
if (st_ == kError || st_ == kExitingObject || st_ == kHasKey) {
|
||||
st_ = kError;
|
||||
return false;
|
||||
|
||||
case kHasNull:
|
||||
case kHasBool:
|
||||
case kHasNumber:
|
||||
case kHasString:
|
||||
case kEnteringObject:
|
||||
case kEnteringArray:
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int LookaheadParser::GetInt() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user