Merge remote-tracking branch 'origin/master' into issue120floatprecision

MeltwaterArchive · Nov 30, 2014 · 92554b5 · 92554b5
2 parents 23b7a5e + 7eee430
commit 92554b5
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 92 deletions.
diff --git a/example/tutorial/tutorial.cpp b/example/tutorial/tutorial.cpp
@@ -7,6 +7,7 @@
 #include <cstdio>
 
 using namespace rapidjson;
+using namespace std;
 
 int main(int, char*[]) {
     ////////////////////////////////////////////////////////////////////////////

diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
@@ -1896,9 +1896,26 @@ template <typename SourceAllocator>
 inline
 GenericValue<Encoding,Allocator>::GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator)
 {
-    GenericDocument<Encoding,Allocator> d(&allocator);
-    rhs.Accept(d);
-    RawAssign(*d.stack_.template Pop<GenericValue>(1));
+    switch (rhs.GetType()) {
+    case kObjectType:
+    case kArrayType: { // perform deep copy via SAX Handler
+            GenericDocument<Encoding,Allocator> d(&allocator);
+            rhs.Accept(d);
+            RawAssign(*d.stack_.template Pop<GenericValue>(1));
+        }
+        break;
+    case kStringType:
+        if (rhs.flags_ == kConstStringFlag) {
+            flags_ = rhs.flags_;
+            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
+        } else {
+            SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
+        }
+        break;
+    default: // kNumberType, kTrueType, kFalseType, kNullType
+        flags_ = rhs.flags_;
+        data_  = *reinterpret_cast<const Data*>(&rhs.data_);
+    }
 }
 
 RAPIDJSON_NAMESPACE_END

diff --git a/include/rapidjson/filereadstream.h b/include/rapidjson/filereadstream.h
@@ -40,7 +40,7 @@ class FileReadStream {
         \param buffer user-supplied buffer.
         \param bufferSize size of buffer in bytes. Must >=4 bytes.
     */
-    FileReadStream(FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
+    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
         RAPIDJSON_ASSERT(fp_ != 0);
         RAPIDJSON_ASSERT(bufferSize >= 4);
         Read();
@@ -79,7 +79,7 @@ class FileReadStream {
         }
     }
 
-    FILE* fp_;
+    std::FILE* fp_;
     Ch *buffer_;
     size_t bufferSize_;
     Ch *bufferLast_;

diff --git a/include/rapidjson/filestream.h b/include/rapidjson/filestream.h
@@ -36,7 +36,7 @@ class FileStream {
 public:
     typedef char Ch;    //!< Character type. Only support char.
 
-    FileStream(FILE* fp) : fp_(fp), current_('\0'), count_(0) { Read(); }
+    FileStream(std::FILE* fp) : fp_(fp), current_('\0'), count_(0) { Read(); }
     char Peek() const { return current_; }
     char Take() { char c = current_; Read(); return c; }
     size_t Tell() const { return count_; }
@@ -63,7 +63,7 @@ class FileStream {
             current_ = '\0';
     }
 
-    FILE* fp_;
+    std::FILE* fp_;
     char current_;
     size_t count_;
 };

diff --git a/include/rapidjson/filewritestream.h b/include/rapidjson/filewritestream.h
@@ -34,7 +34,7 @@ class FileWriteStream {
 public:
     typedef char Ch;    //!< Character type. Only support char.
 
-    FileWriteStream(FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
+    FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
         RAPIDJSON_ASSERT(fp_ != 0);
     }
 
@@ -80,7 +80,7 @@ class FileWriteStream {
     FileWriteStream(const FileWriteStream&);
     FileWriteStream& operator=(const FileWriteStream&);
 
-    FILE* fp_;
+    std::FILE* fp_;
     char *buffer_;
     char *bufferEnd_;
     char *current_;

diff --git a/test/unittest/stringbuffertest.cpp b/test/unittest/stringbuffertest.cpp
@@ -25,116 +25,122 @@
 using namespace rapidjson;
 
 TEST(StringBuffer, InitialSize) {
-  StringBuffer buffer;
-  EXPECT_EQ(0u, buffer.GetSize());
-  EXPECT_STREQ("", buffer.GetString());
+    StringBuffer buffer;
+    EXPECT_EQ(0u, buffer.GetSize());
+    EXPECT_STREQ("", buffer.GetString());
 }
 
 TEST(StringBuffer, Put) {
-  StringBuffer buffer;
-  buffer.Put('A');
+    StringBuffer buffer;
+    buffer.Put('A');
 
-  EXPECT_EQ(1u, buffer.GetSize());
-  EXPECT_STREQ("A", buffer.GetString());
+    EXPECT_EQ(1u, buffer.GetSize());
+    EXPECT_STREQ("A", buffer.GetString());
 }
 
 TEST(StringBuffer, Clear) {
-  StringBuffer buffer;
-  buffer.Put('A');
-  buffer.Put('B');
-  buffer.Put('C');
-  buffer.Clear();
-
-  EXPECT_EQ(0u, buffer.GetSize());
-  EXPECT_STREQ("", buffer.GetString());
+    StringBuffer buffer;
+    buffer.Put('A');
+    buffer.Put('B');
+    buffer.Put('C');
+    buffer.Clear();
+
+    EXPECT_EQ(0u, buffer.GetSize());
+    EXPECT_STREQ("", buffer.GetString());
 }
 
 TEST(StringBuffer, Push) {
-  StringBuffer buffer;
-  buffer.Push(5);
+    StringBuffer buffer;
+    buffer.Push(5);
 
-  EXPECT_EQ(5u, buffer.GetSize());
+    EXPECT_EQ(5u, buffer.GetSize());
 }
 
 TEST(StringBuffer, Pop) {
-  StringBuffer buffer;
-  buffer.Put('A');
-  buffer.Put('B');
-  buffer.Put('C');
-  buffer.Put('D');
-  buffer.Put('E');
-  buffer.Pop(3);
-
-  EXPECT_EQ(2u, buffer.GetSize());
-  EXPECT_STREQ("AB", buffer.GetString());
+    StringBuffer buffer;
+    buffer.Put('A');
+    buffer.Put('B');
+    buffer.Put('C');
+    buffer.Put('D');
+    buffer.Put('E');
+    buffer.Pop(3);
+
+    EXPECT_EQ(2u, buffer.GetSize());
+    EXPECT_STREQ("AB", buffer.GetString());
 }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
 
 #include <type_traits>
 
 TEST(StringBuffer, Traits) {
-  static_assert( std::is_constructible<StringBuffer>::value, "");
-  static_assert( std::is_default_constructible<StringBuffer>::value, "");
-  static_assert(!std::is_copy_constructible<StringBuffer>::value, "");
-  static_assert( std::is_move_constructible<StringBuffer>::value, "");
-
-  static_assert(!std::is_nothrow_constructible<StringBuffer>::value, "");
-  static_assert(!std::is_nothrow_default_constructible<StringBuffer>::value, "");
-  static_assert(!std::is_nothrow_copy_constructible<StringBuffer>::value, "");
-  static_assert(!std::is_nothrow_move_constructible<StringBuffer>::value, "");
-
-  static_assert( std::is_assignable<StringBuffer,StringBuffer>::value, "");
-  static_assert(!std::is_copy_assignable<StringBuffer>::value, "");
-  static_assert( std::is_move_assignable<StringBuffer>::value, "");
-
-  static_assert(!std::is_nothrow_assignable<StringBuffer,StringBuffer>::value, "");
-  static_assert(!std::is_nothrow_copy_assignable<StringBuffer>::value, "");
-  static_assert(!std::is_nothrow_move_assignable<StringBuffer>::value, "");
-
-  static_assert( std::is_destructible<StringBuffer>::value, "");
-  static_assert( std::is_nothrow_destructible<StringBuffer>::value, "");
+    static_assert( std::is_constructible<StringBuffer>::value, "");
+    static_assert( std::is_default_constructible<StringBuffer>::value, "");
+#ifndef _MSC_VER
+    static_assert(!std::is_copy_constructible<StringBuffer>::value, "");
+#endif
+    static_assert( std::is_move_constructible<StringBuffer>::value, "");
+
+    static_assert(!std::is_nothrow_constructible<StringBuffer>::value, "");
+    static_assert(!std::is_nothrow_default_constructible<StringBuffer>::value, "");
+    static_assert(!std::is_nothrow_copy_constructible<StringBuffer>::value, "");
+    static_assert(!std::is_nothrow_move_constructible<StringBuffer>::value, "");
+
+    static_assert( std::is_assignable<StringBuffer,StringBuffer>::value, "");
+#ifndef _MSC_VER
+    static_assert(!std::is_copy_assignable<StringBuffer>::value, "");
+#endif
+    static_assert( std::is_move_assignable<StringBuffer>::value, "");
+
+    static_assert(!std::is_nothrow_assignable<StringBuffer,StringBuffer>::value, "");
+    static_assert(!std::is_nothrow_copy_assignable<StringBuffer>::value, "");
+    static_assert(!std::is_nothrow_move_assignable<StringBuffer>::value, "");
+
+    static_assert( std::is_destructible<StringBuffer>::value, "");
+#ifndef _MSC_VER
+    static_assert(std::is_nothrow_destructible<StringBuffer>::value, "");
+#endif
 }
 
 TEST(StringBuffer, MoveConstructor) {
-  StringBuffer x;
-  x.Put('A');
-  x.Put('B');
-  x.Put('C');
-  x.Put('D');
-
-  EXPECT_EQ(4u, x.GetSize());
-  EXPECT_STREQ("ABCD", x.GetString());
-
-  // StringBuffer y(x); // does not compile (!is_copy_constructible)
-  StringBuffer y(std::move(x));
-  EXPECT_EQ(0u, x.GetSize());
-  EXPECT_EQ(4u, y.GetSize());
-  EXPECT_STREQ("ABCD", y.GetString());
-
-  // StringBuffer z = y; // does not compile (!is_copy_assignable)
-  StringBuffer z = std::move(y);
-  EXPECT_EQ(0u, y.GetSize());
-  EXPECT_EQ(4u, z.GetSize());
-  EXPECT_STREQ("ABCD", z.GetString());
+    StringBuffer x;
+    x.Put('A');
+    x.Put('B');
+    x.Put('C');
+    x.Put('D');
+
+    EXPECT_EQ(4u, x.GetSize());
+    EXPECT_STREQ("ABCD", x.GetString());
+
+    // StringBuffer y(x); // does not compile (!is_copy_constructible)
+    StringBuffer y(std::move(x));
+    EXPECT_EQ(0u, x.GetSize());
+    EXPECT_EQ(4u, y.GetSize());
+    EXPECT_STREQ("ABCD", y.GetString());
+
+    // StringBuffer z = y; // does not compile (!is_copy_assignable)
+    StringBuffer z = std::move(y);
+    EXPECT_EQ(0u, y.GetSize());
+    EXPECT_EQ(4u, z.GetSize());
+    EXPECT_STREQ("ABCD", z.GetString());
 }
 
 TEST(StringBuffer, MoveAssignment) {
-  StringBuffer x;
-  x.Put('A');
-  x.Put('B');
-  x.Put('C');
-  x.Put('D');
-
-  EXPECT_EQ(4u, x.GetSize());
-  EXPECT_STREQ("ABCD", x.GetString());
-
-  StringBuffer y;
-  // y = x; // does not compile (!is_copy_assignable)
-  y = std::move(x);
-  EXPECT_EQ(0u, x.GetSize());
-  EXPECT_EQ(4u, y.GetSize());
-  EXPECT_STREQ("ABCD", y.GetString());
+    StringBuffer x;
+    x.Put('A');
+    x.Put('B');
+    x.Put('C');
+    x.Put('D');
+
+    EXPECT_EQ(4u, x.GetSize());
+    EXPECT_STREQ("ABCD", x.GetString());
+
+    StringBuffer y;
+    // y = x; // does not compile (!is_copy_assignable)
+    y = std::move(x);
+    EXPECT_EQ(0u, x.GetSize());
+    EXPECT_EQ(4u, y.GetSize());
+    EXPECT_STREQ("ABCD", y.GetString());
 }
 
 #endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS