Move std::string -> String from value type

Now starting to change over to the new memory allocation, care has been
taken to leave exceptions in the original allocator

Author: dawesc

include/json/reader.h

@@ -34,6 +34,7 @@ namespace detail {
 template<class _Value>
 class JSON_API Reader {
 public:
+  typedef typename _Value::String String;
   typedef char Char;
   typedef const Char* Location;
 
@@ -74,7 +75,7 @@ class JSON_API Reader {
    * error occurred.
    */
   bool
-  parse(const std::string& document, _Value& root, bool collectComments = true);
+  parse(const String& document, _Value& root, bool collectComments = true);
 
   /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
    document.
@@ -205,7 +206,7 @@ class JSON_API Reader {
   bool decodeNumber(Token& token);
   bool decodeNumber(Token& token, _Value& decoded);
   bool decodeString(Token& token);
-  bool decodeString(Token& token, std::string& decoded);
+  bool decodeString(Token& token, String& decoded);
   bool decodeDouble(Token& token);
   bool decodeDouble(Token& token, _Value& decoded);
   bool decodeUnicodeCodePoint(Token& token,
@@ -226,20 +227,20 @@ class JSON_API Reader {
   Char getNextChar();
   void
   getLocationLineAndColumn(Location location, int& line, int& column) const;
-  std::string getLocationLineAndColumn(Location location) const;
+  String getLocationLineAndColumn(Location location) const;
   void addComment(Location begin, Location end, CommentPlacement placement);
   void skipCommentTokens(Token& token);
 
   typedef std::stack<_Value*> Nodes;
   Nodes nodes_;
   Errors errors_;
-  std::string document_;
+  String document_;
   Location begin_;
   Location end_;
   Location current_;
   Location lastValueEnd_;
   _Value* lastValue_;
-  std::string commentsBefore_;
+  String commentsBefore_;
   Features features_;
   bool collectComments_;
 };  // Reader
@@ -296,6 +297,7 @@ class JSON_API CharReader {
 template<class _Value>
 class JSON_API CharReaderBuilder : public CharReader<_Value>::Factory {
 public:
+  typedef typename _Value::String String;
   // Note: We use a Json::Value so that we can add data-members to this class
   // without a major version bump.
   /** Configuration of this builder.
@@ -348,7 +350,7 @@ class JSON_API CharReaderBuilder : public CharReader<_Value>::Factory {
 
   /** A simple way to update a specific setting.
    */
-  _Value& operator[](std::string key);
+  _Value& operator[](String key);
 
   /** Called by ctor, but you can use this to reset settings_.
    * \pre 'settings' != NULL (but Json::null is fine)

include/json/reader.inl

@@ -76,7 +76,7 @@ Reader<_Value>::Reader(const Features& features)
 
 template<class _Value>
 bool
-Reader<_Value>::parse(const std::string& document, _Value& root, bool collectComments) {
+Reader<_Value>::parse(const String& document, _Value& root, bool collectComments) {
   document_ = document;
   const char* begin = document_.c_str();
   const char* end = begin + document_.length();
@@ -92,7 +92,7 @@ bool Reader<_Value>::parse(std::istream& sin, _Value& root, bool collectComments
 
   // Since std::string is reference-counted, this at least does not
   // create an extra copy.
-  std::string doc;
+  String doc;
   std::getline(sin, doc, (char)EOF);
   return parse(doc, root, collectComments);
 }
@@ -356,8 +356,8 @@ bool Reader<_Value>::readComment() {
 }
 
 template<class _Value>
-static std::string normalizeEOL(typename Reader<_Value>::Location begin, typename Reader<_Value>::Location end) {
-  std::string normalized;
+static typename _Value::String normalizeEOL(typename Reader<_Value>::Location begin, typename Reader<_Value>::Location end) {
+  typename _Value::String normalized;
   normalized.reserve(end - begin);
   typename Reader<_Value>::Location current = begin;
   while (current != end) {
@@ -379,7 +379,7 @@ template<class _Value>
 void
 Reader<_Value>::addComment(Location begin, Location end, CommentPlacement placement) {
   assert(collectComments_);
-  const std::string& normalized = normalizeEOL<_Value>(begin, end);
+  const String& normalized = normalizeEOL<_Value>(begin, end);
   if (placement == commentAfterOnSameLine) {
     assert(lastValue_ != 0);
     lastValue_->setComment(normalized, placement);
@@ -454,7 +454,7 @@ bool Reader<_Value>::readString() {
 template<class _Value>
 bool Reader<_Value>::readObject(Token& tokenStart) {
   Token tokenName;
-  std::string name;
+  String name;
   _Value init(objectValue);
   currentValue().swapPayload(init);
   currentValue().setOffsetStart(tokenStart.start_ - begin_);
@@ -615,10 +615,10 @@ bool Reader<_Value>::decodeDouble(Token& token) {
 template<class _Value>
 bool Reader<_Value>::decodeDouble(Token& token, _Value& decoded) {
   double value = 0;
-  std::string buffer(token.start_, token.end_);
+  String buffer(token.start_, token.end_);
   std::istringstream is(buffer);
   if (!(is >> value))
-    return addError("'" + std::string(token.start_, token.end_) +
+    return addError("'" + String(token.start_, token.end_) +
                         "' is not a number.",
                     token);
   decoded = value;
@@ -627,7 +627,7 @@ bool Reader<_Value>::decodeDouble(Token& token, _Value& decoded) {
 
 template<class _Value>
 bool Reader<_Value>::decodeString(Token& token) {
-  std::string decoded_string;
+  String decoded_string;
   if (!decodeString(token, decoded_string))
     return false;
   _Value decoded(decoded_string);
@@ -638,7 +638,7 @@ bool Reader<_Value>::decodeString(Token& token) {
 }
 
 template<class _Value>
-bool Reader<_Value>::decodeString(Token& token, std::string& decoded) {
+bool Reader<_Value>::decodeString(Token& token, String& decoded) {
   decoded.reserve(token.end_ - token.start_ - 2);
   Location current = token.start_ + 1; // skip '"'
   Location end = token.end_ - 1;       // do not include '"'
@@ -679,7 +679,7 @@ bool Reader<_Value>::decodeString(Token& token, std::string& decoded) {
         unsigned int unicode;
         if (!decodeUnicodeCodePoint(token, current, end, unicode))
           return false;
-        decoded += codePointToUTF8(unicode);
+        decoded += codePointToUTF8<String>(unicode);
       } break;
       default:
         return addError("Bad escape sequence in string", token, current);
@@ -818,7 +818,7 @@ void Reader<_Value>::getLocationLineAndColumn(Location location,
 }
 
 template<class _Value>
-std::string Reader<_Value>::getLocationLineAndColumn(Location location) const {
+typename _Value::String Reader<_Value>::getLocationLineAndColumn(Location location) const {
   int line, column;
   getLocationLineAndColumn(location, line, column);
   char buffer[18 + 16 + 16 + 1];
@@ -929,6 +929,7 @@ public:
 template<class _Value>
 class OurReader {
 public:
+  typedef typename _Value::String String;
   typedef char Char;
   typedef const Char* Location;
   struct StructuredError {
@@ -1716,7 +1717,7 @@ bool OurReader<_Value>::decodeString(Token& token, std::string& decoded) {
         unsigned int unicode;
         if (!decodeUnicodeCodePoint(token, current, end, unicode))
           return false;
-        decoded += codePointToUTF8(unicode);
+        decoded += codePointToUTF8<String>(unicode);
       } break;
       default:
         return addError("Bad escape sequence in string", token, current);
@@ -2019,7 +2020,7 @@ bool CharReaderBuilder<_Value>::validate(_Value* invalid) const
   return 0u == inv.size();
 }
 template<class _Value>
-_Value& CharReaderBuilder<_Value>::operator[](std::string key)
+_Value& CharReaderBuilder<_Value>::operator[](String key)
 {
   return settings_[key];
 }

include/json/tool.h

@@ -15,8 +15,9 @@
 namespace Json {
 
 /// Converts a unicode code-point to UTF-8.
-static inline std::string codePointToUTF8(unsigned int cp) {
-  std::string result;
+template<class _String>
+static inline _String codePointToUTF8(unsigned int cp) {
+  _String result;
 
   // based on description from http://en.wikipedia.org/wiki/UTF-8
 

include/json/value.h

@@ -167,6 +167,8 @@ class JSON_API Value {
   template<typename T>
   friend class ValueIteratorBase;
 public:
+  typedef _String String;
+  typedef _Alloc Allocator;
   typedef std::vector<std::string> Members;
   typedef ValueIterator<Value> iterator;
   typedef ValueConstIterator<Value> const_iterator;
@@ -295,7 +297,7 @@ Json::Value obj_value(Json::objectValue); // {}
    * \endcode
    */
   Value(const Json::StaticString& value);
-  Value(const std::string& value); ///< Copy data() til size(). Embedded zeroes too.
+  Value(const String& value); ///< Copy data() til size(). Embedded zeroes too.
 #ifdef JSON_USE_CPPTL
   Value(const CppTL::ConstString& value);
 #endif
@@ -328,7 +330,7 @@ Json::Value obj_value(Json::objectValue); // {}
   int compare(const Value& other) const;
 
   const char* asCString() const; ///< Embedded zeroes could cause you trouble!
-  std::string asString() const; ///< Embedded zeroes are possible.
+  String asString() const; ///< Embedded zeroes are possible.
   /** Get raw char* of string-value.
    *  \return false if !string. (Seg-fault if str or end are NULL.)
    */
@@ -432,11 +434,11 @@ Json::Value obj_value(Json::objectValue); // {}
   const Value& operator[](const char* key) const;
   /// Access an object value by name, create a null member if it does not exist.
   /// \param key may contain embedded nulls.
-  Value& operator[](const std::string& key);
+  Value& operator[](const String& key);
   /// Access an object value by name, returns null if there is no member with
   /// that name.
   /// \param key may contain embedded nulls.
-  const Value& operator[](const std::string& key) const;
+  const Value& operator[](const String& key) const;
   /** \brief Access an object value by name, create a null member if it does not
    exist.
 
@@ -467,7 +469,7 @@ Json::Value obj_value(Json::objectValue); // {}
   /// Return the member named key if it exist, defaultValue otherwise.
   /// \note deep copy
   /// \param key may contain embedded nulls.
-  Value get(const std::string& key, const Value& defaultValue) const;
+  Value get(const String& key, const Value& defaultValue) const;
 #ifdef JSON_USE_CPPTL
   /// Return the member named key if it exist, defaultValue otherwise.
   /// \note deep copy
@@ -492,7 +494,7 @@ Json::Value obj_value(Json::objectValue); // {}
   /// Same as removeMember(const char*)
   /// \param key may contain embedded nulls.
   /// \deprecated
-  Value removeMember(const std::string& key);
+  Value removeMember(const String& key);
   /// Same as removeMember(const char* begin, const char* end, Value* removed),
   /// but 'key' is null-terminated.
   bool removeMember(const char* key, Value* removed);
@@ -502,8 +504,8 @@ Json::Value obj_value(Json::objectValue); // {}
       \param key may contain embedded nulls.
       \return true iff removed (no exceptions)
   */
-  bool removeMember(std::string const& key, Value* removed);
-  /// Same as removeMember(std::string const& key, Value* removed)
+  bool removeMember(String const& key, Value* removed);
+  /// Same as removeMember(String const& key, Value* removed)
   bool removeMember(const char* begin, const char* end, Value* removed);
   /** \brief Remove the indexed array element.
 
@@ -518,8 +520,8 @@ Json::Value obj_value(Json::objectValue); // {}
   bool isMember(const char* key) const;
   /// Return true if the object has a member named key.
   /// \param key may contain embedded nulls.
-  bool isMember(const std::string& key) const;
-  /// Same as isMember(std::string const& key)const
+  bool isMember(const String& key) const;
+  /// Same as isMember(String const& key)const
   bool isMember(const char* begin, const char* end) const;
 #ifdef JSON_USE_CPPTL
   /// Return true if the object has a member named key.
@@ -539,17 +541,17 @@ Json::Value obj_value(Json::objectValue); // {}
   //# endif
 
   /// \deprecated Always pass len.
-  JSONCPP_DEPRECATED("Use setComment(std::string const&) instead.")
+  JSONCPP_DEPRECATED("Use setComment(String const&) instead.")
   void setComment(const char* comment, CommentPlacement placement);
   /// Comments must be //... or /* ... */
   void setComment(const char* comment, size_t len, CommentPlacement placement);
   /// Comments must be //... or /* ... */
-  void setComment(const std::string& comment, CommentPlacement placement);
+  void setComment(const String& comment, CommentPlacement placement);
   bool hasComment(CommentPlacement placement) const;
   /// Include delimiters and embedded newlines.
-  std::string getComment(CommentPlacement placement) const;
+  String getComment(CommentPlacement placement) const;
 
-  std::string toStyledString() const;
+  String toStyledString() const;
 
   const_iterator begin() const;
   const_iterator end() const;
@@ -613,21 +615,22 @@ Json::Value obj_value(Json::objectValue); // {}
 template<class _Value>
 class JSON_API PathArgument {
 public:
+  typedef typename _Value::String String;
   template<typename T>
   friend class Path;
 
   PathArgument();
   PathArgument(ArrayIndex index);
   PathArgument(const char* key);
-  PathArgument(const std::string& key);
+  PathArgument(const String& key);
 
 private:
   enum Kind {
     kindNone = 0,
     kindIndex,
     kindKey
   };
-  std::string key_;
+  String key_;
   ArrayIndex index_;
   Kind kind_;
 };
@@ -646,7 +649,8 @@ class JSON_API PathArgument {
 template<class _Value>
 class JSON_API Path {
 public:
-  Path(const std::string& path,
+  typedef typename _Value::String String;
+  Path(const String& path,
        const PathArgument<_Value>& a1 = PathArgument<_Value>(),
        const PathArgument<_Value>& a2 = PathArgument<_Value>(),
        const PathArgument<_Value>& a3 = PathArgument<_Value>(),
@@ -663,12 +667,12 @@ class JSON_API Path {
   typedef std::vector<const PathArgument<_Value>*> InArgs;
   typedef std::vector<PathArgument<_Value>> Args;
 
-  void makePath(const std::string& path, const InArgs& in);
-  void addPathInArg(const std::string& path,
+  void makePath(const String& path, const InArgs& in);
+  void addPathInArg(const String& path,
                     const InArgs& in,
                     typename InArgs::const_iterator& itInArg,
 					typename PathArgument<_Value>::Kind kind);
-  void invalidPath(const std::string& path, int location);
+  void invalidPath(const String& path, int location);
 
   Args args_;
 };
@@ -679,6 +683,7 @@ class JSON_API Path {
 template<class _Value>
 class JSON_API ValueIteratorBase {
 public:
+  typedef typename _Value::String String;
   typedef std::bidirectional_iterator_tag iterator_category;
   typedef unsigned int size_t;
   typedef int difference_type;
@@ -702,7 +707,7 @@ class JSON_API ValueIteratorBase {
   /// Return the member name of the referenced Value, or "" if it is not an
   /// objectValue.
   /// \note Avoid `c_str()` on result, as embedded zeroes are possible.
-  std::string name() const;
+  String name() const;
 
   /// Return the member name of the referenced Value. "" if it is not an
   /// objectValue.