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

Minor refactoring

Browse Source
This commit is contained in:
Milo Yip 2016-02-02 12:56:53 +08:00
parent ba7aa979a5
commit dd2076f8d8
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/rapidjson/schema.h
View File

@ -1550,7 +1550,6 @@ public:
, depth_(0) , depth_(0)
#endif #endif
{ {
CreateOwnAllocator();
} }
//! Constructor with output handler. //! Constructor with output handler.
@ -1579,7 +1578,6 @@ public:
, depth_(0) , depth_(0)
#endif #endif
{ {
CreateOwnAllocator();
} }
//! Destructor. //! Destructor.
@ -1592,7 +1590,7 @@ public:
void Reset() { void Reset() {
while (!schemaStack_.Empty()) while (!schemaStack_.Empty())
PopSchema(); PopSchema();
//documentStack_.Clear(); documentStack_.Clear();
valid_ = true; valid_ = true;
} }
@ -1615,10 +1613,6 @@ public:
return documentStack_.Empty() ? PointerType() : PointerType(documentStack_.template Bottom<Ch>(), documentStack_.GetSize() / sizeof(Ch)); return documentStack_.Empty() ? PointerType() : PointerType(documentStack_.template Bottom<Ch>(), documentStack_.GetSize() / sizeof(Ch));
} }
StateAllocator& GetStateAllocator() {
return *stateAllocator_;
}
#if RAPIDJSON_SCHEMA_VERBOSE #if RAPIDJSON_SCHEMA_VERBOSE
#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \ #define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
RAPIDJSON_MULTILINEMACRO_BEGIN\ RAPIDJSON_MULTILINEMACRO_BEGIN\
@ -1774,12 +1768,12 @@ private:
, depth_(depth) , depth_(depth)
#endif #endif
{ {
CreateOwnAllocator();
} }
void CreateOwnAllocator() { StateAllocator& GetStateAllocator() {
if (!stateAllocator_) if (!stateAllocator_)
stateAllocator_ = ownStateAllocator_ = RAPIDJSON_NEW(StateAllocator()); stateAllocator_ = ownStateAllocator_ = RAPIDJSON_NEW(StateAllocator());
return *stateAllocator_;
} }
bool BeginValue() { bool BeginValue() {

2
test/unittest/schematest.cpp
View File

@ -1148,6 +1148,8 @@ TEST(SchemaValidatingWriter, Simple) {
d.Parse("\"ABCD\""); d.Parse("\"ABCD\"");
EXPECT_FALSE(d.Accept(validator)); EXPECT_FALSE(d.Accept(validator));
EXPECT_FALSE(validator.IsValid()); EXPECT_FALSE(validator.IsValid());
EXPECT_TRUE(validator.GetInvalidSchemaPointer() == SchemaDocument::PointerType(""));
EXPECT_TRUE(validator.GetInvalidDocumentPointer() == SchemaDocument::PointerType(""));
} }
#ifdef __clang__ #ifdef __clang__