make std::string optional

Author: Steve Hanson

include/rapidjson/internal/strfunc.h

@@ -45,6 +45,20 @@ inline SizeType StrLen(const wchar_t* s) {
     return SizeType(std::wcslen(s));
 }
 
+//! Custom strcmpn() which works on different character types.
+/*! \tparam Ch Character type (e.g. char, wchar_t, short)
+    \param s1 Null-terminated input string.
+    \param s2 Null-terminated input string.
+    \return 0 if equal
+*/
+template<typename Ch>
+inline int StrCmp(const Ch* s1, const Ch* s2) {
+    RAPIDJSON_ASSERT(s1 != 0);
+    RAPIDJSON_ASSERT(s2 != 0);
+    while(*s1 && (*s1 == *s2)) { s1++; s2++; }
+    return static_cast<unsigned>(*s1) < static_cast<unsigned>(*s2) ? -1 : static_cast<unsigned>(*s1) > static_cast<unsigned>(*s2);
+}
+
 //! Returns number of code points in a encoded string.
 template<typename Encoding>
 bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {

include/rapidjson/pointer.h

@@ -554,8 +554,7 @@ class GenericPointer {
                     // See if we have an id, and if so resolve with the current base
                     typename ValueType::MemberIterator m = v->FindMember(kIdValue);
                     if (m != v->MemberEnd() && (m->value).IsString()) {
-                        UriType here = UriType(m->value);
-                        here.Resolve(base);
+                        UriType here = UriType(m->value, allocator_).Resolve(base, allocator_);
                         base = here;
                     }
                     m = v->FindMember(GenericValue<EncodingType>(GenericStringRef<Ch>(t->name, t->length)));
@@ -576,7 +575,7 @@ class GenericPointer {
             // Error: unresolved token
             if (unresolvedTokenIndex)
                 *unresolvedTokenIndex = static_cast<size_t>(t - tokens_);
-            return UriType();
+            return UriType(allocator_);
         }
         return base;
     }

include/rapidjson/schema.h

@@ -494,9 +494,8 @@ class Schema {
         // If we have an id property, resolve it with the in-scope id
         if (const ValueType* v = GetMember(value, GetIdString())) {
             if (v->IsString()) {
-                UriType local = UriType(*v);
-                local.Resolve(id_);
-                id_ = local;
+                UriType local(*v, allocator);
+                id_ = local.Resolve(id_, allocator);
             }
         }
 
@@ -1659,7 +1658,7 @@ class GenericSchemaDocument {
 
         Ch noUri[1] = {0};
         uri_.SetString(uri ? uri : noUri, uriLength, *allocator_);
-        docId_ = UriType(uri_);
+        docId_ = UriType(uri_, allocator_);
 
         typeless_ = static_cast<SchemaType*>(allocator_->Malloc(sizeof(SchemaType)));
         new (typeless_) SchemaType(this, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), allocator_, docId_);
@@ -1792,8 +1791,7 @@ class GenericSchemaDocument {
             if (len > 0) {
                 // First resolve $ref against the in-scope id
                 UriType scopeId = id;
-                UriType ref = UriType(itr->value);
-                ref.Resolve(scopeId);
+                UriType ref = UriType(itr->value, allocator_).Resolve(scopeId, allocator_);
                 // See if the resolved $ref minus the fragment matches a resolved id in this document
                 // Search from the root. Returns the subschema in the document and its absolute JSON pointer.
                 PointerType basePointer = PointerType();
@@ -1851,7 +1849,7 @@ class GenericSchemaDocument {
                         // See if the fragment matches an id in this document.
                         // Search from the base we just established. Returns the subschema in the document and its absolute JSON pointer.
                         PointerType pointer = PointerType();
-                        if (const ValueType *pv = FindId(*base, ref, pointer, UriType(ref.GetBase()), true, basePointer)) {
+                        if (const ValueType *pv = FindId(*base, ref, pointer, UriType(ref.GetBaseString(), ref.GetBaseStringLength(), allocator_), true, basePointer)) {
                             if (!IsCyclicRef(pointer)) {
                                 //GenericStringBuffer<EncodingType> sb;
                                 //pointer.StringifyUriFragment(sb);
@@ -1887,8 +1885,7 @@ class GenericSchemaDocument {
             // Establish the base URI of this object
             typename ValueType::ConstMemberIterator m = doc.FindMember(SchemaType::GetIdString());
             if (m != doc.MemberEnd() && m->value.GetType() == kStringType) {
-                localuri = UriType(m->value);
-                localuri.Resolve(baseuri);
+                localuri = UriType(m->value, allocator_).Resolve(baseuri, allocator_);
             }
             // See if it matches
             if (localuri.Match(finduri, full)) {