Incremental Changes to Boilerplate in Incremental Request Parser

deanberris · deanberris · commit adac71b4dd5c · 2010-11-05T14:10:00.000+08:00
This just fixes the internal logic used to drive the internal
implementation.
diff --git a/boost/network/protocol/http/server/request_parser.hpp b/boost/network/protocol/http/server/request_parser.hpp
@@ -37,27 +37,44 @@ namespace boost { namespace network { namespace http {
             , headers_done
         };
 
+        explicit request_parser(state_t start_state = method_start)
+        : internal_state(start_state)
+        {}
+
+        void reset(state_t start_state = method_start) {
+            internal_state = method_start;
+        }
+
+        state_t state() const { return internal_state; }
+
         template <class Range>
-        fusion::tuple<logic::tribool, Range>
-        parse_until(state_t state, Range const & range) {
+        fusion::tuple<logic::tribool, iterator_range<typename Range::const_iterator> >
+        parse_until(state_t stop_state, Range & range) {
             logic::tribool parsed_ok;
             typedef typename range_iterator<Range>::type iterator;
             iterator start = boost::begin(range)
                     , end  = boost::end(range)
                     , current_iterator = start;
-
-            while (!boost::empty(range) || state != internal_state) {
+            iterator_range<iterator> local_range = 
+                boost::make_iterator_range(start, end);
+            while (
+                !boost::empty(local_range)
+                && stop_state != internal_state
+                && parsed_ok == logic::indeterminate
+            ) {
                 switch(internal_state) {
                     default:
                         parsed_ok = false;
-                        return fusion::make_tuple(
-                            parsed_ok, 
-                            boost::make_iterator_range(
-                                start, current_iterator
-                                )
-                            );
                 };
+                local_range = boost::make_iterator_range(
+                    ++current_iterator, end);
             }
+            return fusion::make_tuple(
+                parsed_ok, 
+                boost::make_iterator_range(
+                    start, current_iterator
+                )
+                );
         }
 
     private:
diff --git a/libs/network/test/http_incremental_request_parser.cpp b/libs/network/test/http_incremental_request_parser.cpp
@@ -33,4 +33,17 @@ BOOST_AUTO_TEST_CASE(incremental_parser_constructor) {
     request_parser<tags::default_string> p; // default constructible
 }
 
-
+BOOST_AUTO_TEST_CASE(incremental_parser_parse_http_method) {
+    request_parser<tags::default_string> p;
+    logic::tribool parsed_ok = false;
+    typedef request_parser<tags::default_string> request_parser_type;
+    typedef boost::iterator_range<std::string::const_iterator> range_type;
+    range_type result_range;
+    
+    std::string valid_http_method = "GET";
+    fusion::tie(parsed_ok, result_range) = p.parse_until(
+        request_parser_type::method_done
+        , valid_http_method);
+    BOOST_CHECK_EQUAL(parsed_ok, true);
+    BOOST_CHECK(!boost::empty(result_range));
+}
