Added support for printing single values without escaping the strings

Bumped version to 4.06.1
smlee-hdactech · Aug 15, 2013 · 11f6ab3 · 11f6ab3
1 parent cf7d228
commit 11f6ab3
Show file tree

Hide file tree

Showing 30 changed files with 48 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -197,7 +197,9 @@ enum Output_options
     pretty_print = 0x01, 
     raw_utf8 = 0x02, 
     remove_trailing_zeros = 0x04,
-    single_line_arrays = 0x08  
+    single_line_arrays = 0x08,
+    always_escape_nonascii = 0x10,
+    no_quote_strings = 0x20
 };
 ```
 
@@ -225,6 +227,9 @@ on single lines unless they contain composite elements, i.e. objects or arrays.
 }
 ```
 
+The ```always_escape_nonascii``` option escapes all unicode wide characters, i.e. outputed as "\uXXXX" even if they
+are printable under the current locale, ascii printable chars are not escaped.
+
 You can apply more than one option by using the OR operator, i.e.:
 ```cpp
 write( addr_obj, os, pretty_print | raw_utf8 );

diff --git a/json_demo/json_demo.cpp b/json_demo/json_demo.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 // This demo shows you how to read and write JSON objects and arrays.

diff --git a/json_headers_only_demo/json_headers_only_demo.cpp b/json_headers_only_demo/json_headers_only_demo.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 // This demo shows you how to read and write JSON objects and arrays 

diff --git a/json_map_demo/json_map_demo.cpp b/json_map_demo/json_map_demo.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 // This demo shows you how to read and write JSON objects and arrays.
@@ -131,4 +131,4 @@ int main()
 
 	return 0;
 }
-;
+;
diff --git a/json_spirit/json_spirit.h b/json_spirit/json_spirit.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_spirit/json_spirit_error_position.h b/json_spirit/json_spirit_error_position.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_spirit/json_spirit_reader.cpp b/json_spirit/json_spirit_reader.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_reader.h"

diff --git a/json_spirit/json_spirit_reader.h b/json_spirit/json_spirit_reader.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_spirit/json_spirit_reader_template.h b/json_spirit/json_spirit_reader_template.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_spirit/json_spirit_stream_reader.h b/json_spirit/json_spirit_stream_reader.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_spirit/json_spirit_utils.h b/json_spirit/json_spirit_utils.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_spirit/json_spirit_value.cpp b/json_spirit/json_spirit_value.cpp
@@ -3,7 +3,7 @@
    This source code can be used for any purpose as long as
    this comment is retained. */
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_value.h"
diff --git a/json_spirit/json_spirit_value.h b/json_spirit/json_spirit_value.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_spirit/json_spirit_writer.cpp b/json_spirit/json_spirit_writer.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_writer.h"

diff --git a/json_spirit/json_spirit_writer.h b/json_spirit/json_spirit_writer.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_spirit/json_spirit_writer_options.h b/json_spirit/json_spirit_writer_options.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
@@ -28,6 +28,8 @@ namespace json_spirit
                          always_escape_nonascii = 0x10,
                                                 // all unicode wide characters are escaped, i.e. outputed as "\uXXXX", even if they are
                                                 // printable under the current locale, ascii printable chars are not escaped
+                         no_quote_strings = 0x20,
+                                                // Don't place quotes around strings (useful for writing single values to a stream)
                        };
 }
 

diff --git a/json_spirit/json_spirit_writer_template.h b/json_spirit/json_spirit_writer_template.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
@@ -177,6 +177,7 @@ namespace json_spirit
         ,   esc_nonascii_( ( options & always_escape_nonascii ) != 0 )
         ,   remove_trailing_zeros_( ( options & remove_trailing_zeros ) != 0 )
         ,   single_line_arrays_( ( options & single_line_arrays ) != 0 )
+        ,   no_quote_strings_( ( options & no_quote_strings) != 0 )
         ,   ios_saver_( os )
         {
             output( value );
@@ -225,7 +226,13 @@ namespace json_spirit
 
         void output( const String_type& s )
         {
-            os_ << '"' << add_esc_chars( s, raw_utf8_, esc_nonascii_ ) << '"';
+            if(!no_quote_strings_) {
+              os_ << '"';
+            }
+            os_ << add_esc_chars( s, raw_utf8_, esc_nonascii_ );
+            if(!no_quote_strings_) {
+              os_ << '"';
+            }
         }
 
         void output( bool b )
@@ -352,6 +359,7 @@ namespace json_spirit
         bool esc_nonascii_;
         bool remove_trailing_zeros_;
         bool single_line_arrays_;
+        bool no_quote_strings_;
         boost::io::basic_ios_all_saver< Char_type > ios_saver_;  // so that ostream state is reset after control is returned to the caller
     };
 

diff --git a/json_test/json_spirit_reader_test.cpp b/json_test/json_spirit_reader_test.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_reader_test.h"

diff --git a/json_test/json_spirit_reader_test.h b/json_test/json_spirit_reader_test.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_test/json_spirit_stream_reader_test.cpp b/json_test/json_spirit_stream_reader_test.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_stream_reader_test.h"

diff --git a/json_test/json_spirit_stream_reader_test.h b/json_test/json_spirit_stream_reader_test.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_test/json_spirit_utils_test.cpp b/json_test/json_spirit_utils_test.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_utils_test.h"

diff --git a/json_test/json_spirit_utils_test.h b/json_test/json_spirit_utils_test.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_test/json_spirit_value_test.cpp b/json_test/json_spirit_value_test.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_value_test.h"

diff --git a/json_test/json_spirit_value_test.h b/json_test/json_spirit_value_test.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_test/json_spirit_writer_test.cpp b/json_test/json_spirit_writer_test.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_writer_test.h"

diff --git a/json_test/json_spirit_writer_test.h b/json_test/json_spirit_writer_test.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)

diff --git a/json_test/json_test.cpp b/json_test/json_test.cpp
@@ -1,7 +1,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #include "json_spirit_value_test.h"

diff --git a/json_test/utils_test.cpp b/json_test/utils_test.cpp
@@ -1,7 +1,8 @@
 //          Copyright John W. Wilkinson 2011
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.06
+// json spirit version 4.06.1
+// upstream json spirit version 4.06
 
 #include "utils_test.h"
 

diff --git a/json_test/utils_test.h b/json_test/utils_test.h
@@ -4,7 +4,7 @@
 //          Copyright John W. Wilkinson 2007 - 2013
 // Distributed under the MIT License, see accompanying file LICENSE.txt
 
-// json spirit version 4.07
+// json spirit version 4.06.1
 // upstream json spirit version 4.06
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1020)