diff options
Diffstat (limited to 'src/qjsonparser.cpp')
| -rw-r--r-- | src/qjsonparser.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/qjsonparser.cpp b/src/qjsonparser.cpp index 9d33ff0..1163bb6 100644 --- a/src/qjsonparser.cpp +++ b/src/qjsonparser.cpp @@ -162,11 +162,11 @@ QtJson::JsonDocument QJsonParser::parse() data = (char *)malloc(dataLength); // fill in Header data - Header *h = (Header *)data; + Private::Header *h = (Private::Header *)data; h->tag = QBJS_Tag; h->version = 1u; - current = sizeof(Header); + current = sizeof(Private::Header); char token = nextToken(); DEBUG << token; @@ -182,7 +182,7 @@ QtJson::JsonDocument QJsonParser::parse() END; { - Data *d = new Data(data, current); + Private::Data *d = new Private::Data(data, current); return JsonDocument(d); } @@ -201,7 +201,7 @@ error: bool QJsonParser::parseObject() { - int objectOffset = reserveSpace(sizeof(Object)); + int objectOffset = reserveSpace(sizeof(Private::Object)); BEGIN << "parseObject pos=" << objectOffset << current << json; QVarLengthArray<uint> offsets; @@ -238,7 +238,7 @@ bool QJsonParser::parseObject() #endif } - Object *o = (Object *)(data + objectOffset); + Private::Object *o = (Private::Object *)(data + objectOffset); o->tableOffset = table - objectOffset; o->size = current - objectOffset; o->is_object = true; @@ -254,7 +254,7 @@ bool QJsonParser::parseObject() */ bool QJsonParser::parseMember(int baseOffset) { - int entryOffset = reserveSpace(sizeof(Entry)); + int entryOffset = reserveSpace(sizeof(Private::Entry)); BEGIN << "parseMember pos=" << entryOffset; bool latin1; @@ -263,12 +263,12 @@ bool QJsonParser::parseMember(int baseOffset) char token = nextToken(); if (token != NameSeparator) return false; - Value val; + Private::Value val; if (!parseValue(&val, baseOffset)) return false; // finalize the entry - Entry *e = (Entry *)(data + entryOffset); + Private::Entry *e = (Private::Entry *)(data + entryOffset); e->value = val; e->value.latinKey = latin1; @@ -282,9 +282,9 @@ bool QJsonParser::parseMember(int baseOffset) bool QJsonParser::parseArray() { BEGIN << "parseArray"; - int arrayOffset = reserveSpace(sizeof(Array)); + int arrayOffset = reserveSpace(sizeof(Private::Array)); - QVarLengthArray<Value> values; + QVarLengthArray<Private::Value> values; if (!eatSpace()) return false; @@ -292,7 +292,7 @@ bool QJsonParser::parseArray() nextToken(); } else { while (1) { - Value val; + Private::Value val; if (!parseValue(&val, arrayOffset)) return false; values.append(val); @@ -308,12 +308,12 @@ bool QJsonParser::parseArray() int table = arrayOffset; // finalize the object if (values.size()) { - int tableSize = values.size()*sizeof(Value); + int tableSize = values.size()*sizeof(Private::Value); table = reserveSpace(tableSize); memcpy(data + table, values.constData(), tableSize); } - Array *a = (Array *)(data + arrayOffset); + Private::Array *a = (Private::Array *)(data + arrayOffset); a->tableOffset = table - arrayOffset; a->size = current - arrayOffset; a->is_object = false; @@ -329,7 +329,7 @@ value = false / null / true / object / array / number / string */ -bool QJsonParser::parseValue(Value *val, int baseOffset) +bool QJsonParser::parseValue(Private::Value *val, int baseOffset) { BEGIN << "parse Value" << json; val->_dummy = 0; @@ -341,7 +341,7 @@ bool QJsonParser::parseValue(Value *val, int baseOffset) if (*json++ == 'u' && *json++ == 'l' && *json++ == 'l') { - val->type = NullValue; + val->type = JsonValue::Null; DEBUG << "value: null"; END; return true; @@ -353,7 +353,7 @@ bool QJsonParser::parseValue(Value *val, int baseOffset) if (*json++ == 'r' && *json++ == 'u' && *json++ == 'e') { - val->type = BooleanValue; + val->type = JsonValue::Boolean; val->val = true; DEBUG << "value: true"; END; @@ -367,7 +367,7 @@ bool QJsonParser::parseValue(Value *val, int baseOffset) *json++ == 'l' && *json++ == 's' && *json++ == 'e') { - val->type = BooleanValue; + val->type = JsonValue::Boolean; val->val = false; DEBUG << "value: false"; END; @@ -375,7 +375,7 @@ bool QJsonParser::parseValue(Value *val, int baseOffset) } return false; case Quote: { - val->type = StringValue; + val->type = JsonValue::String; val->val = current - baseOffset; bool latin1; if (!parseString(&latin1)) @@ -386,7 +386,7 @@ bool QJsonParser::parseValue(Value *val, int baseOffset) return true; } case BeginArray: - val->type = ArrayValue; + val->type = JsonValue::Array; val->val = current - baseOffset; if (!parseArray()) return false; @@ -394,7 +394,7 @@ bool QJsonParser::parseValue(Value *val, int baseOffset) END; return true; case BeginObject: - val->type = ObjectValue; + val->type = JsonValue::Object; val->val = current - baseOffset; if (!parseObject()) return false; @@ -430,10 +430,10 @@ bool QJsonParser::parseValue(Value *val, int baseOffset) */ -bool QJsonParser::parseNumber(Value *val, int baseOffset) +bool QJsonParser::parseNumber(Private::Value *val, int baseOffset) { BEGIN << "parseNumber" << json; - val->type = NumberValue; + val->type = JsonValue::Number; const char *start = json; bool isInt = true; @@ -679,7 +679,7 @@ bool QJsonParser::parseString(bool *latin1) // no unicode string, we are done if (*latin1) { // write string length - *(qle_ushort *)(data + stringPos) = current - outStart - sizeof(ushort); + *(Private::qle_ushort *)(data + stringPos) = current - outStart - sizeof(ushort); int pos = reserveSpace((4 - current) & 3); while (pos & 3) data[pos++] = 0; @@ -706,11 +706,11 @@ bool QJsonParser::parseString(bool *latin1) } if (ch > 0xffff) { int pos = reserveSpace(4); - *(qle_ushort *)(data + pos) = QChar::highSurrogate(ch); - *(qle_ushort *)(data + pos + 2) = QChar::lowSurrogate(ch); + *(Private::qle_ushort *)(data + pos) = QChar::highSurrogate(ch); + *(Private::qle_ushort *)(data + pos + 2) = QChar::lowSurrogate(ch); } else { int pos = reserveSpace(2); - *(qle_ushort *)(data + pos) = (ushort)ch; + *(Private::qle_ushort *)(data + pos) = (ushort)ch; } } ++json; @@ -719,7 +719,7 @@ bool QJsonParser::parseString(bool *latin1) return false; // write string length - *(qle_int *)(data + stringPos) = (current - outStart - sizeof(int))/2; + *(Private::qle_int *)(data + stringPos) = (current - outStart - sizeof(int))/2; int pos = reserveSpace((4 - current) & 3); while (pos & 3) data[pos++] = 0; |