gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nested ref

Browse Source
This commit is contained in:
Milo Yip 2015-05-16 16:15:00 +08:00
parent 5b6061c7e6
commit 9acea17d2f
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/rapidjson/schema.h
View File

@ -50,11 +50,7 @@ RAPIDJSON_DIAG_OFF(effc++)
#if RAPIDJSON_SCHEMA_VERBOSE #if RAPIDJSON_SCHEMA_VERBOSE
#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) \ #define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) \
RAPIDJSON_MULTILINEMACRO_BEGIN\ printf("Fail keyword: %s\n", keyword)
StringBuffer sb;\
context.schema->GetPointer().Stringify(sb);\
printf("Fail schema: %s\nFail keyword: %s\n", sb.GetString(), keyword);\
RAPIDJSON_MULTILINEMACRO_END
#else #else
#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) #define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
#endif #endif
@ -287,7 +283,6 @@ public:
friend class GenericSchemaDocument<ValueType, AllocatorType>; friend class GenericSchemaDocument<ValueType, AllocatorType>;
Schema(SchemaDocumentType* document, const PointerType& p, const ValueType& value, AllocatorType* allocator) : Schema(SchemaDocumentType* document, const PointerType& p, const ValueType& value, AllocatorType* allocator) :
pointer_(p),
allocator_(allocator), allocator_(allocator),
enum_(), enum_(),
enumCount_(), enumCount_(),
@ -528,8 +523,6 @@ public:
#endif #endif
} }
const PointerType& GetPointer() const { return pointer_; }
bool BeginValue(Context& context) const { bool BeginValue(Context& context) const {
if (context.inArray) { if (context.inArray) {
if (uniqueItems_) if (uniqueItems_)
@ -1088,7 +1081,6 @@ private:
RegexType* pattern; RegexType* pattern;
}; };
PointerType pointer_;
AllocatorType* allocator_; AllocatorType* allocator_;
uint64_t* enum_; uint64_t* enum_;
SizeType enumCount_; SizeType enumCount_;
@ -1181,11 +1173,12 @@ public:
while (!schemaRef_.Empty()) { while (!schemaRef_.Empty()) {
SchemaRefEntry* refEntry = schemaRef_.template Pop<SchemaRefEntry>(1); SchemaRefEntry* refEntry = schemaRef_.template Pop<SchemaRefEntry>(1);
if (const SchemaType* s = GetSchema(refEntry->target)) { if (const SchemaType* s = GetSchema(refEntry->target)) {
*refEntry->schema = s; if (refEntry->schema)
*refEntry->schema = s;
// Create entry in map if not exist // Create entry in map if not exist
if (!GetSchema(refEntry->source)) { if (!GetSchema(refEntry->source)) {
new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(const_cast<SchemaType*>(s), false); new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(refEntry->source, const_cast<SchemaType*>(s), false);
} }
} }
refEntry->~SchemaRefEntry(); refEntry->~SchemaRefEntry();
@ -1214,11 +1207,12 @@ private:
}; };
struct SchemaEntry { struct SchemaEntry {
SchemaEntry(SchemaType* s, bool o) : schema(s), owned(o) {} SchemaEntry(const PointerType& p, SchemaType* s, bool o) : pointer(p), schema(s), owned(o) {}
~SchemaEntry() { ~SchemaEntry() {
if (owned) if (owned)
schema->~SchemaType(); schema->~SchemaType();
} }
PointerType pointer;
SchemaType* schema; SchemaType* schema;
bool owned; bool owned;
}; };
@ -1245,9 +1239,9 @@ private:
void CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v) { void CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v) {
RAPIDJSON_ASSERT(pointer.IsValid()); RAPIDJSON_ASSERT(pointer.IsValid());
if (v.IsObject()) { if (v.IsObject()) {
if (!schema || !HandleRefSchema(pointer, schema, v)) { if (!HandleRefSchema(pointer, schema, v)) {
SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, allocator_); SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, allocator_);
new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(s, true); new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(pointer, s, true);
if (schema) if (schema)
*schema = s; *schema = s;
} }
@ -1255,7 +1249,6 @@ private:
} }
bool HandleRefSchema(const Pointer& source, const SchemaType** schema, const ValueType& v) { bool HandleRefSchema(const Pointer& source, const SchemaType** schema, const ValueType& v) {
RAPIDJSON_ASSERT(schema != 0);
typename ValueType::ConstMemberIterator itr = v.FindMember("$ref"); typename ValueType::ConstMemberIterator itr = v.FindMember("$ref");
if (itr == v.MemberEnd()) if (itr == v.MemberEnd())
return false; return false;
@ -1274,7 +1267,8 @@ private:
PointerType pointer(&s[i], len - i); PointerType pointer(&s[i], len - i);
if (pointer.IsValid()) { if (pointer.IsValid()) {
if (const SchemaType* s = remoteDocument->GetSchema(pointer)) { if (const SchemaType* s = remoteDocument->GetSchema(pointer)) {
*schema = s; if (schema)
*schema = s;
return true; return true;
} }
} }
@ -1299,13 +1293,16 @@ private:
const SchemaType* GetSchema(const PointerType& pointer) const { const SchemaType* GetSchema(const PointerType& pointer) const {
for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target) for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
if (pointer == target->schema->pointer_) if (pointer == target->pointer)
return target->schema; return target->schema;
return 0; return 0;
} }
PointerType GetPointer(const SchemaType* schema) const { PointerType GetPointer(const SchemaType* schema) const {
return schema->pointer_; for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
if (schema== target->schema)
return target->pointer;
return PointerType();
} }
static const size_t kInitialSchemaMapSize = 64; static const size_t kInitialSchemaMapSize = 64;
@ -1389,7 +1386,7 @@ public:
virtual bool IsValid() const { return valid_; } virtual bool IsValid() const { return valid_; }
PointerType GetInvalidSchemaPointer() const { PointerType GetInvalidSchemaPointer() const {
return schemaStack_.Empty() ? PointerType() : CurrentSchema().GetPointer(); return schemaStack_.Empty() ? PointerType() : schemaDocument_->GetPointer(&CurrentSchema());
} }
const char* GetInvalidSchemaKeyword() const { const char* GetInvalidSchemaKeyword() const {
@ -1495,6 +1492,7 @@ RAPIDJSON_MULTILINEMACRO_END
RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount)); RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
} }
#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_ #undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_
#undef RAPIDJSON_SCHEMA_HANDLE_PARALLEL_ #undef RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
#undef RAPIDJSON_SCHEMA_HANDLE_VALUE_ #undef RAPIDJSON_SCHEMA_HANDLE_VALUE_
@ -1569,7 +1567,7 @@ private:
#if RAPIDJSON_SCHEMA_VERBOSE #if RAPIDJSON_SCHEMA_VERBOSE
StringBuffer sb; StringBuffer sb;
CurrentSchema().GetPointer().Stringify(sb); schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
*documentStack_.template Push<Ch>() = '\0'; *documentStack_.template Push<Ch>() = '\0';
documentStack_.template Pop<Ch>(1); documentStack_.template Pop<Ch>(1);