Initial support for using Boost.String_algorithms predicates.

Dean Michael Berris · Dean Michael Berris · commit 2738ad04df3d · 2010-09-13T16:46:50.000+08:00
diff --git a/boost/network/protocol/http/parser/incremental.hpp b/boost/network/protocol/http/parser/incremental.hpp
@@ -11,6 +11,7 @@
 #include <boost/fusion/tuple.hpp>
 #include <boost/network/traits/string.hpp>
 #include <boost/logic/tribool.hpp>
+#include <boost/algorithm/string/classification.hpp>
 #include <utility>
 
 namespace boost { namespace network { namespace http {
@@ -28,7 +29,9 @@ namespace boost { namespace network { namespace http {
             http_version_major,
             http_version_dot,
             http_version_minor,
-            http_version_done
+            http_version_done,
+            http_status_digit,
+            http_status_done
         };
 
         typedef typename string<Tag>::type::const_iterator iterator_type;
@@ -141,6 +144,26 @@ namespace boost { namespace network { namespace http {
                             parsed_ok = false;
                         }
                         break;
+                    case http_version_done:
+                        // FIXME find a better way to use is_digit
+                        if (algorithm::is_digit()(*current)) {
+                            state_ = http_status_digit;
+                            ++current;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        break;
+                    case http_status_digit:
+                        // FIXME find a better way to use is_digit
+                        if (algorithm::is_digit()(*current)) {
+                            ++current;
+                        } else if (*current == ' ') {
+                            state_ = http_status_done;
+                            ++current;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        break;
                     default:
                         parsed_ok = false;
                     }
diff --git a/libs/network/test/http_incremental_parser.cpp b/libs/network/test/http_incremental_parser.cpp
@@ -116,6 +116,15 @@ BOOST_AUTO_TEST_CASE(incremental_parser_parse_status) {
         response_parser_type::http_status_done,
         valid_status);
     BOOST_CHECK_EQUAL(parsed_ok, true);
+    std::string parsed = std::string(boost::begin(result_range), boost::end(result_range));
+    std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
+
+    p.reset(response_parser_type::http_version_done);
+    std::string invalid_status = "200x ";
+    fusion::tie(parsed_ok, result_range) = p.parse_until(
+        response_parser_type::http_status_done,
+        invalid_status);
+    BOOST_CHECK_EQUAL(parsed_ok, false);
     parsed = std::string(boost::begin(result_range), boost::end(result_range));
     std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 }
