Ticket #9495: boost_property_tree.patch

boost/property_tree/json_parser.hpp

@@ -46 +46 @@
     }
 
     /**
+     * Read JSON from a the given begin and end iterator and translate it to 
+     * a property tree.
+     * @note Clears existing contents of property tree.  In case of error the
+     *       property tree unmodified.
+     * @note Items of JSON arrays are translated into ptree keys with empty
+     *       names. Members of objects are translated into named keys.
+     * @note JSON data can be a string, a numeric value, or one of literals
+     *       "null", "true" and "false". During parse, any of the above is
+     *       copied verbatim into ptree data string.
+     * @throw json_parser_error In case of error deserializing the property
+     *                          tree.
+     * @param begin Iterator from which to start reading the property tree.
+     * @param end Iterator until which to read the property tree.
+     * @param[out] pt The property tree to populate.
+     */
+    template<typename Iterator, class Ptree>
+    void read_json(Iterator begin,
+                   Iterator end,
+                   Ptree &pt)
+    {
+        read_json_internal(begin, end, pt, std::string());
+    }
+
+    /**
      * Read JSON from a the given file and translate it to a property tree.
      * @note Clears existing contents of property tree.  In case of error the
      *       property tree unmodified.

boost/property_tree/detail/json_parser_read.hpp

@@ -29 +29 @@
     ///////////////////////////////////////////////////////////////////////
     // Json parser context
         
-    template<class Ptree>
+    template<typename It, class Ptree>
     struct context
     {
 
         typedef typename Ptree::key_type::value_type Ch;
         typedef std::basic_string<Ch> Str;
-        typedef typename std::vector<Ch>::iterator It;
         
         Str string;
         Str name;
@@ -156 +155 @@
     ///////////////////////////////////////////////////////////////////////
     // Json grammar
 
-    template<class Ptree>
+    template<typename Iterator, class Ptree>
     struct json_grammar :
-        public boost::spirit::classic::grammar<json_grammar<Ptree> >
+        public boost::spirit::classic::grammar<json_grammar<Iterator, Ptree> >
     {
         
-        typedef context<Ptree> Context;
+        typedef context<Iterator, Ptree> Context;
         typedef typename Ptree::key_type::value_type Ch;
 
         mutable Context c;
@@ -296 +295 @@
                             const std::string &filename)
     {
 
-        using namespace boost::spirit::classic;
         typedef typename Ptree::key_type::value_type Ch;
-        typedef typename std::vector<Ch>::iterator It;
 
         // Load data into vector
         std::vector<Ch> v(std::istreambuf_iterator<Ch>(stream.rdbuf()),
                           std::istreambuf_iterator<Ch>());
         if (!stream.good())
             BOOST_PROPERTY_TREE_THROW(json_parser_error("read error", filename, 0));
+
+        read_json_internal(v.begin(), v.end(), pt, filename);
+    }
         
+    template<typename Iterator, class Ptree>
+    void read_json_internal(Iterator begin,
+                            Iterator end,
+                            Ptree &pt,
+                            const std::string &filename)
+    {
+
+        using namespace boost::spirit::classic;
+        typedef typename Ptree::key_type::value_type Ch;
+
         // Prepare grammar
-        json_grammar<Ptree> g;
+        json_grammar<Iterator, Ptree> g;
 
         // Parse
         try
         {
-            parse_info<It> pi = parse(v.begin(), v.end(), g, 
+            parse_info<Iterator> pi = parse(begin, end, g, 
                                       space_p | comment_p("//") | comment_p("/*", "*/"));
             if (!pi.hit || !pi.full)
-                BOOST_PROPERTY_TREE_THROW((parser_error<std::string, It>(v.begin(), "syntax error")));
+                BOOST_PROPERTY_TREE_THROW((parser_error<std::string, Iterator>(begin, "syntax error")));
         }
-        catch (parser_error<std::string, It> &e)
+        catch (parser_error<std::string, Iterator> &e)
         {
-            BOOST_PROPERTY_TREE_THROW(json_parser_error(e.descriptor, filename, count_lines<It, Ch>(v.begin(), e.where)));
+            BOOST_PROPERTY_TREE_THROW(json_parser_error(e.descriptor, filename, count_lines<Iterator, Ch>(begin, e.where)));
         }
 
         // Swap grammar context root and pt