Reintroduce missing code for parsing query maps

deanberris · deanberris · commit 7b88a41e5eeb · 2015-11-01T01:39:00.000+11:00
diff --git a/boost/network/uri/accessors.hpp b/boost/network/uri/accessors.hpp
@@ -22,7 +22,13 @@ struct key_value_sequence : spirit::qi::grammar<uri::const_iterator, Map()> {
   typedef typename Map::mapped_type mapped_type;
   typedef std::pair<key_type, mapped_type> pair_type;
 
-  key_value_sequence() : key_value_sequence::base_type(query) {};
+  key_value_sequence() : key_value_sequence::base_type(query) {
+    query = pair >> *((spirit::qi::lit(';') | '&') >> pair);
+    pair = key >> -('=' >> value);
+    key =
+        spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("-+.~a-zA-Z_0-9/%");
+    value = *spirit::qi::char_("-+.~a-zA-Z_0-9/%");
+  };
 
   spirit::qi::rule<uri::const_iterator, Map()> query;
   spirit::qi::rule<uri::const_iterator, pair_type()> pair;
diff --git a/boost/network/uri/uri.hpp b/boost/network/uri/uri.hpp
@@ -46,7 +46,7 @@ class BOOST_URI_DECL uri {
   //    parse();
   //}
 
-  uri(const string_type &uri) : uri_(uri), is_valid_(false) { parse(); }
+  uri(const string_type &str) : uri_(str), is_valid_(false) { parse(); }
 
   template <class FwdIter>
   uri(const FwdIter &first, const FwdIter &last)
@@ -109,8 +109,9 @@ class BOOST_URI_DECL uri {
   }
 
 // hackfix by Simon Haegler, Esri R&D Zurich
-// this workaround is needed to avoid running into the "incompatible string iterator" assertion
-// triggered by the default-constructed string iterators employed by cpp-netlib (see uri.ipp qi::rule declarations)
+// this workaround is needed to avoid running into the "incompatible string
+// iterator" assertion triggered by the default-constructed string iterators
+// employed by cpp-netlib (see uri.ipp qi::rule declarations)
 #if defined(_MSC_VER) && defined(_DEBUG)
 #	define CATCH_EMPTY_ITERATOR_RANGE if (range.begin()._Getcont() == 0 || range.end()._Getcont() == 0) { return string_type(); }
 #else
@@ -120,7 +121,7 @@ class BOOST_URI_DECL uri {
   string_type scheme() const {
     const_range_type range = scheme_range();
     CATCH_EMPTY_ITERATOR_RANGE
-	return range ? string_type(boost::begin(range), boost::end(range))
+    return range ? string_type(boost::begin(range), boost::end(range))
                  : string_type();
   }
 
@@ -166,6 +167,10 @@ class BOOST_URI_DECL uri {
                  : string_type();
   }
 
+#ifdef CATCH_EMPTY_ITERATOR_RANGE
+#undef CATCH_EMPTY_ITERATOR_RANGE
+#endif
+
   string_type string() const { return uri_; }
 
   bool is_valid() const { return is_valid_; }
