From 502675e527ff00fae010d2f8bda90d00870a57a7 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 21 Mar 2018 15:12:29 -0700 Subject: [PATCH] ircd::json: Minor cleanup of function static grammar type decls. --- ircd/json.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ircd/json.cc b/ircd/json.cc index e073018d6..2ce8602b7 100644 --- a/ircd/json.cc +++ b/ircd/json.cc @@ -938,7 +938,7 @@ ircd::json::vector::const_iterator & ircd::json::vector::const_iterator::operator++() try { - static const qi::rule parse_next + static const parser::rule parse_next { raw[parser.object(0)] | qi::eoi ,"next vector element or end" @@ -958,7 +958,7 @@ ircd::json::vector::const_iterator ircd::json::vector::begin() const try { - static const qi::rule parse_begin + static const parser::rule parse_begin { raw[parser.object(0)] ,"object vector element" @@ -1152,13 +1152,13 @@ try parser.ws }; - static const qi::rule member + static const parser::rule member { parser.name >> -ws >> parser.name_sep >> -ws >> raw[parser.value(0)] ,"next object member" }; - static const qi::rule parse_next + static const parser::rule parse_next { (parser.object_end | (parser.value_sep >> -ws >> member)) >> -ws ,"next object member or end" @@ -1189,13 +1189,13 @@ const try parser.ws }; - static const qi::rule object_member + static const parser::rule object_member { parser.name >> -ws >> parser.name_sep >> -ws >> raw[parser.value(0)] ,"object member" }; - static const qi::rule parse_begin + static const parser::rule parse_begin { -ws >> parser.object_begin >> -ws >> (parser.object_end | object_member) >> -ws ,"object begin and member or end" @@ -1336,13 +1336,13 @@ try parser.ws }; - static const qi::rule value + static const parser::rule value { raw[parser.value(0)] ,"array element" }; - static const qi::rule parse_next + static const parser::rule parse_next { (parser.array_end | (parser.value_sep >> -ws >> value)) >> -ws ,"next array element or end" @@ -1372,13 +1372,13 @@ const try parser.ws }; - static const qi::rule value + static const parser::rule value { raw[parser.value(0)] ,"array element" }; - static const qi::rule parse_begin + static const parser::rule parse_begin { -ws >> parser.array_begin >> -ws >> (parser.array_end | value) >> -ws ,"array begin and element or end"