Port to Debian 10

The port was complicated by changes to boost::spirit which I was unable to pinpoint.

json5_parser_reader_template.h: new_identifier() now trims trailing whitespace no
    longer trimmed by boost::spirit parser.

json5_parser_reader_test.cpp:
    test_reading(): reformatted and added test case.
    check_reading_arrays(): added "unget()" to accommodate change to boost::spirit.

json5_parser_value_test.cpp: tweaked to accommodate change to boost::assign::list_of().

json_demo.cpp, json_map_demo.cpp, json_headers_only_demo.cpp: Added "sleep()" call
   intended to prevent unreproducible "read" failures.
Added print statements to test source files.

wscript: Replaced "-Ofast" with "-O3".

Author: judith-ipac

json5_parser/json5_parser_reader.h

@@ -64,6 +64,6 @@ void read_or_throw(std::wistream& is, wmValue& value);
 void read_or_throw(std::wstring::const_iterator& begin,
                    std::wstring::const_iterator end, wmValue& value);
 #endif
-}
+}  // namespace json5_parser
 
 #endif

json5_parser/json5_parser_reader_template.h

@@ -10,6 +10,9 @@
 #pragma once
 #endif
 
+#include <boost/algorithm/string.hpp>
+#include <string>
+
 #include "json5_parser_error_position.h"
 #include "json5_parser_value.h"
 
@@ -248,7 +251,7 @@ class Semantic_actions {
 
         String_type result;
         result.append(begin, end);
-        name_ = result;
+        name_ = boost::algorithm::trim_right_copy(result);
     }
 
     void new_str(Iter_type begin, Iter_type end) {
@@ -359,15 +362,15 @@ void throw_error(Iter_type, const std::string& reason) {
     throw reason;
 }
 
-// the spirit grammer
+// the spirit grammar
 //
 template <class Value_type, class Iter_type>
-class Json_grammer
-        : public spirit_namespace::grammar<Json_grammer<Value_type, Iter_type> > {
+class Json_grammar
+        : public spirit_namespace::grammar<Json_grammar<Value_type, Iter_type> > {
 public:
     typedef Semantic_actions<Value_type, Iter_type> Semantic_actions_t;
 
-    Json_grammer(Semantic_actions_t& semantic_actions) : actions_(semantic_actions) {}
+    Json_grammar(Semantic_actions_t& semantic_actions) : actions_(semantic_actions) {}
 
     static void throw_not_value(Iter_type begin, Iter_type) {
         throw_error(begin, "not a value");
@@ -400,7 +403,7 @@ class Json_grammer
     template <typename ScannerT>
     class definition {
     public:
-        definition(const Json_grammer& self) {
+        definition(const Json_grammar& self) {
             using namespace spirit_namespace;
 
             typedef typename Value_type::String_type::value_type Char_type;
@@ -445,7 +448,7 @@ class Json_grammer
             Uint64_action new_uint64(
                     boost::bind(&Semantic_actions_t::new_uint64, &self.actions_, _1));
 
-            // actual grammer
+            // actual grammar
 
             json_ = value_ | eps_p[&throw_not_value];
 
@@ -472,12 +475,12 @@ class Json_grammer
             double_quoted_string_ =
                     lexeme_d  // this causes white space and what would appear to be
                               // comments inside a string to be retained
-                                      [confix_p('"', *lex_escape_ch_p, '"')];
+                            [confix_p('"', *lex_escape_ch_p, '"')];
 
             single_quoted_string_ =
                     lexeme_d  // this causes white space and what would appear to be
                               // comments inside a string to be retained
-                                      [confix_p('\'', *lex_escape_ch_p, '\'')];
+                            [confix_p('\'', *lex_escape_ch_p, '\'')];
 
             identifier_ = (alpha_p | ch_p('_') | ch_p('$')) >>
                           *(alnum_p | ch_p('_') | ch_p('$'));
@@ -494,7 +497,7 @@ class Json_grammer
     };
 
 private:
-    Json_grammer& operator=(const Json_grammer&);  // to prevent "assignment operator
+    Json_grammar& operator=(const Json_grammar&);  // to prevent "assignment operator
                                                    // could not be generated" warning
 
     Semantic_actions_t& actions_;
@@ -543,7 +546,7 @@ Iter_type read_range_or_throw(Iter_type begin, Iter_type end, Value_type& value)
     Semantic_actions<Value_type, Iter_type> semantic_actions(value);
 
     const spirit_namespace::parse_info<Iter_type> info = spirit_namespace::parse(
-            begin, end, Json_grammer<Value_type, Iter_type>(semantic_actions),
+            begin, end, Json_grammar<Value_type, Iter_type>(semantic_actions),
             spirit_namespace::space_p | spirit_namespace::comment_p("//") |
                     spirit_namespace::comment_p("/*", "*/"));
 

json5_parser/json5_parser_value.h

@@ -46,7 +46,7 @@ struct Null {};
 template <class Config>  // Config determines whether the value uses std::string or
                          // std::wstring and whether JSON Objects are represented as
                          // vectors or maps
-                         class Value_impl {
+class Value_impl {
 public:
     typedef Config Config_type;
     typedef typename Config::String_type String_type;

json5_parser/json5_parser_writer.h

@@ -73,6 +73,6 @@ void write_formatted(const wmValue& value, std::wostream& os,
 std::wstring write_formatted(const wmValue& value,
                              unsigned int precision_of_doubles = 0);
 #endif
-}
+}  // namespace json5_parser
 
 #endif

json_demo/json_demo.cpp

@@ -7,7 +7,10 @@
 // In this demo objects are stored as a vector of name/value pairs.
 
 #include <cassert>
+#include <chrono>
 #include <fstream>
+#include <thread>
+
 #include "json5_parser.h"
 
 #ifndef JSON_SPIRIT_VALUE_ENABLED
@@ -113,6 +116,9 @@ int main() {
 
     write_addrs(file_name, addrs);
 
+    std::chrono::seconds dura(1);
+    std::this_thread::sleep_for(dura);
+
     vector<Address> new_addrs = read_addrs(file_name);
 
     assert(new_addrs.size() == 5);
@@ -121,5 +127,6 @@ int main() {
         assert(new_addrs[i] == addrs[i]);
     }
 
+    std::cout << "json_demo tests all passed" << std::endl;
     return 0;
 }

json_headers_only_demo/json_headers_only_demo.cpp

@@ -8,7 +8,10 @@
 // In this demo objects are stored as a vector of name/value pairs.
 
 #include <cassert>
+#include <chrono>
 #include <fstream>
+#include <thread>
+
 #include "json5_parser_reader_template.h"
 #include "json5_parser_writer_template.h"
 
@@ -116,6 +119,9 @@ int main() {
 
     write_addrs(file_name, addrs);
 
+    std::chrono::seconds dura(1);
+    std::this_thread::sleep_for(dura);
+
     vector<Address> new_addrs = read_addrs(file_name);
 
     assert(new_addrs.size() == 5);
@@ -124,5 +130,6 @@ int main() {
         assert(new_addrs[i] == addrs[i]);
     }
 
+    std::cout << "json_headers_only_demo tests all passed" << std::endl;
     return 0;
 }

json_map_demo/json_map_demo.cpp

@@ -7,7 +7,10 @@
 // In this demo objects are stored as a map of names to values.
 
 #include <cassert>
+#include <chrono>
 #include <fstream>
+#include <thread>
+
 #include "json5_parser.h"
 
 #ifndef JSON_SPIRIT_MVALUE_ENABLED
@@ -103,10 +106,13 @@ int main() {
                               {45, "North Road", "Paignton", "Devon", "England"},
                               {78, "Upper Street", "Ware", "Hertfordshire", "England"}};
 
-    const char* file_name("demo.txt");
+    const char* file_name("map_demo.txt");
 
     write_addrs(file_name, addrs);
 
+    std::chrono::seconds dura(1);
+    std::this_thread::sleep_for(dura);
+
     vector<Address> new_addrs = read_addrs(file_name);
 
     assert(new_addrs.size() == 5);
@@ -115,5 +121,6 @@ int main() {
         assert(new_addrs[i] == addrs[i]);
     }
 
+    std::cout << "json_map_demo tests all passed" << std::endl;
     return 0;
-};
+};

json_test/json5_parser_reader_test.cpp

@@ -203,36 +203,52 @@ struct Test_runner {
             check_eq(value.get_obj(), obj);
         }
 
-        Object_type obj;
-        Value_type value;
+        {
+            Object_type obj;
+            Value_type value;
 
-        read_cstr(
-                "{\n"
-                "    \"name 1\" : \"value 1\"\n"
-                "}",
-                value);
+            read_cstr(
+                    "{\n"
+                    "    \"name 1\" : \"value 1\"\n"
+                    "}",
+                    value);
 
-        add_c_str(obj, "name 1", "value 1");
+            add_c_str(obj, "name 1", "value 1");
 
-        check_eq(value.get_obj(), obj);
+            check_eq(value.get_obj(), obj);
 
-        read_cstr("{\"name 1\":\"value 1\",\"name 2\":\"value 2\"}", value);
+            read_cstr("{\"name 1\":\"value 1\",\"name 2\":\"value 2\"}", value);
 
-        add_c_str(obj, "name 2", "value 2");
+            add_c_str(obj, "name 2", "value 2");
 
-        check_eq(value.get_obj(), obj);
+            check_eq(value.get_obj(), obj);
 
-        read_cstr(
-                "{\n"
-                "    \"name 1\" : \"value 1\",\n"
-                "    \"name 2\" : \"value 2\",\n"
-                "    \"name 3\" : \"value 3\"\n"
-                "}",
-                value);
+            read_cstr(
+                    "{\n"
+                    "    \"name 1\" : \"value 1\",\n"
+                    "    \"name 2\" : \"value 2\",\n"
+                    "    \"name 3\" : \"value 3\"\n"
+                    "}",
+                    value);
+
+            add_c_str(obj, "name 3", "value 3");
+
+            check_eq(value.get_obj(), obj);
+        }
+
+        {
+            Object_type obj;
+            Value_type value;
 
-        add_c_str(obj, "name 3", "value 3");
+            read_cstr(
+                    "{\n"
+                    " name 1 : \"value 1\"\n"
+                    "}",
+                    value);
 
-        check_eq(value.get_obj(), obj);
+            add_c_str(obj, "name 1", "value 1");
+            check_eq(value.get_obj(), obj);
+        }
 
         check_reading(
                 "{\n"
@@ -715,8 +731,11 @@ struct Test_runner {
         Istringstream_type is(str);
 
         check_reading_array(is, 0);
+        is.unget();
         check_reading_array(is, 1);
+        is.unget();
         check_reading_array(is, 2);
+        is.unget();
         check_reading_array(is, 3);
     }
 
@@ -729,12 +748,9 @@ struct Test_runner {
         check_value_sequence("     10 11 12", list_of(10)(11)(12), true);
         check_value_sequence("10 11 12", list_of(10)(11)(12), true);
 
-        //
-
+        // Note: check_reading_arrays() expects exactly this list of arrays.
         check_reading_arrays("[] [ 1 ] [ 1, 2 ] [ 1, 2, 3 ]");
-        //         check_reading_arrays( "[][1][1,2][1,2,3]" );  // fails due to
-        //         multi_pass iterator bug,
-        // use stream_reader class instead
+        check_reading_arrays("[][1][1,2][1,2,3]");
     }
 
     void test_uint64(const char* value_str, int expected_int, int64_t expected_int64,
@@ -801,16 +817,27 @@ struct Test_runner {
     }
 
     void run_tests() {
+        std::cout << "   before test_syntax()" << std::endl;
         test_syntax();
+        std::cout << "   before test_reading()" << std::endl;
         test_reading();
+        std::cout << "   before test_reading_reals()" << std::endl;
         test_reading_reals();
+        std::cout << "   before test_from_stream()" << std::endl;
         test_from_stream();
+        std::cout << "   before test_escape_chars()" << std::endl;
         test_escape_chars();
+        std::cout << "   before test_values()" << std::endl;
         test_values();
+        std::cout << "   before test_error_cases()" << std::endl;
         test_error_cases();
+        std::cout << "   before test_sequence_of_values()" << std::endl;
         test_sequence_of_values();
+        std::cout << "   before test_uint64()" << std::endl;
         test_uint64();
+        std::cout << "   before test_types()" << std::endl;
         test_types();
+        std::cout << "   before test_comments()" << std::endl;
         test_comments();
     }
 };
@@ -848,17 +875,25 @@ void test_extended_ascii() {
 
 void json5_parser::test_reader() {
 #ifdef JSON_SPIRIT_VALUE_ENABLED
+    std::cout << "   JSON_SPIRIT_VALUE_ENABLED" << std::endl;
     Test_runner<Config>().run_tests();
     test_extended_ascii();
 #endif
 #ifdef JSON_SPIRIT_MVALUE_ENABLED
+    std::cout << "   JSON_SPIRIT_MVALUE_ENABLED" << std::endl;
     Test_runner<mConfig>().run_tests();
 #endif
 #if defined(JSON_SPIRIT_WVALUE_ENABLED) && !defined(BOOST_NO_STD_WSTRING)
+    std::cout << "   defined(JSON_SPIRIT_WVALUE_ENABLED) && "
+                 "!defined(BOOST_NO_STD_WSTRING)"
+              << std::endl;
     Test_runner<wConfig>().run_tests();
     test_wide_esc_u();
 #endif
 #if defined(JSON_SPIRIT_WMVALUE_ENABLED) && !defined(BOOST_NO_STD_WSTRING)
+    std::cout << "   defined(JSON_SPIRIT_WMVALUE_ENABLED) && "
+                 "!defined(BOOST_NO_STD_WSTRING)"
+              << std::endl;
     Test_runner<wmConfig>().run_tests();
 #endif
 
@@ -880,7 +915,7 @@ void json5_parser::test_reader() {
 
     // cout << t.elapsed() << endl;
 
-//    const string so = write( value );
+    //    const string so = write( value );
 
     // Object obj;