Rename to parser (API Change):

* message_parser is renamed to parser
This commit is contained in:
Vinnie Falco
2017-07-20 08:12:18 -07:00
parent 88600beab0
commit 00667f3cf2
14 changed files with 67 additions and 49 deletions
+4 -4
View File
@@ -22,8 +22,8 @@ header_parser(Arg0&& arg0, ArgN&&... argn)
template<bool isRequest, class Body, class Fields>
template<class Arg1, class... ArgN, class>
message_parser<isRequest, Body, Fields>::
message_parser(Arg1&& arg1, ArgN&&... argn)
parser<isRequest, Body, Fields>::
parser(Arg1&& arg1, ArgN&&... argn)
: m_(std::forward<Arg1>(arg1),
std::forward<ArgN>(argn)...)
{
@@ -31,8 +31,8 @@ message_parser(Arg1&& arg1, ArgN&&... argn)
template<bool isRequest, class Body, class Fields>
template<class... Args>
message_parser<isRequest, Body, Fields>::
message_parser(header_parser<
parser<isRequest, Body, Fields>::
parser(header_parser<
isRequest, Fields>&& parser, Args&&... args)
: base_type(std::move(static_cast<basic_parser<
isRequest, header_parser<isRequest, Fields>>&>(parser)))
+2 -2
View File
@@ -309,7 +309,7 @@ template<class Stream, class DynamicBuffer,
class read_msg_op
{
using parser_type =
message_parser<isRequest, Body, Fields>;
parser<isRequest, Body, Fields>;
using message_type =
message<isRequest, Body, Fields>;
@@ -739,7 +739,7 @@ read(
"Body requirements not met");
static_assert(is_body_writer<Body>::value,
"BodyWriter requirements not met");
message_parser<isRequest, Body, Fields> p;
parser<isRequest, Body, Fields> p;
p.eager(true);
read(stream, buffer, p.base(), ec);
if(ec)
+18 -18
View File
@@ -20,7 +20,7 @@
namespace beast {
namespace http {
/** A parser for producing HTTP/1 headers.
/** An HTTP/1 parser for producing a header.
This class uses the basic HTTP/1 wire format parser to convert
a series of octets into a @ref header.
@@ -199,7 +199,7 @@ private:
}
};
/** A parser for producing HTTP/1 messages.
/** An HTTP/1 parser for producing a message.
This class uses the basic HTTP/1 wire format parser to convert
a series of octets into a @ref message.
@@ -214,9 +214,9 @@ private:
@note A new instance of the parser is required for each message.
*/
template<bool isRequest, class Body, class Fields = fields>
class message_parser
class parser
: public basic_parser<isRequest,
message_parser<isRequest, Body, Fields>>
parser<isRequest, Body, Fields>>
{
static_assert(is_body<Body>::value,
"Body requirements not met");
@@ -225,7 +225,7 @@ class message_parser
"BodyWriter requirements not met");
using base_type = basic_parser<isRequest,
message_parser<isRequest, Body, Fields>>;
parser<isRequest, Body, Fields>>;
using writer_type = typename Body::writer;
@@ -237,20 +237,20 @@ public:
using value_type = message<isRequest, Body, Fields>;
/// Constructor (default)
message_parser() = default;
parser() = default;
/// Copy constructor (disallowed)
message_parser(message_parser const&) = delete;
parser(parser const&) = delete;
/// Copy assignment (disallowed)
message_parser& operator=(message_parser const&) = delete;
parser& operator=(parser const&) = delete;
/** Move constructor.
After the move, the only valid operation
on the moved-from object is destruction.
*/
message_parser(message_parser&& other);
parser(parser&& other);
/** Constructor
@@ -259,7 +259,7 @@ public:
@note This function participates in overload
resolution only if the first argument is not a
@ref http::header_parser or @ref message_parser.
@ref http::header_parser or @ref parser.
*/
#if BEAST_DOXYGEN
template<class... Args>
@@ -272,10 +272,10 @@ public:
std::decay<Arg1>::type,
header_parser<isRequest, Fields>>::value &&
! std::is_same<typename
std::decay<Arg1>::type, message_parser>::value
std::decay<Arg1>::type, parser>::value
>::type>
explicit
message_parser(Arg1&& arg1, ArgN&&... argn);
parser(Arg1&& arg1, ArgN&&... argn);
#endif
/** Construct a message parser from a @ref header_parser.
@@ -285,7 +285,7 @@ public:
*/
template<class... Args>
explicit
message_parser(header_parser<
parser(header_parser<
isRequest, Fields>&& parser, Args&&... args);
/** Returns the parsed message.
@@ -330,7 +330,7 @@ public:
private:
friend class basic_parser<
isRequest, message_parser>;
isRequest, parser>;
void
on_request(
@@ -398,13 +398,13 @@ private:
}
};
/// A parser for producing HTTP/1 messages
/// An HTTP/1 parser for producing a request message.
template<class Body, class Fields = fields>
using request_parser = message_parser<true, Body, Fields>;
using request_parser = parser<true, Body, Fields>;
/// A parser for producing HTTP/1 messages
/// An HTTP/1 parser for producing a response message.
template<class Body, class Fields = fields>
using response_parser = message_parser<false, Body, Fields>;
using response_parser = parser<false, Body, Fields>;
} // http
} // beast