Commit d7c893f3 authored by Dominik Charousset's avatar Dominik Charousset

Rename parse{ => _cli} to visibly document context

parent 69504271
...@@ -238,7 +238,7 @@ struct default_config_value_access { ...@@ -238,7 +238,7 @@ struct default_config_value_access {
return x; return x;
} }
static void parse(config_value::parse_state& ps, T& x) { static void parse_cli(config_value::parse_state& ps, T& x) {
detail::parse(ps, x); detail::parse(ps, x);
} }
}; };
...@@ -411,7 +411,7 @@ struct select_config_value_access<T, select_config_value_hint::is_integral> { ...@@ -411,7 +411,7 @@ struct select_config_value_access<T, select_config_value_hint::is_integral> {
return x; return x;
} }
static void parse(config_value::parse_state& ps, T& x) { static void parse_cli(config_value::parse_state& ps, T& x) {
detail::parse(ps, x); detail::parse(ps, x);
} }
}; };
...@@ -471,7 +471,7 @@ struct select_config_value_access<T, select_config_value_hint::is_list> { ...@@ -471,7 +471,7 @@ struct select_config_value_access<T, select_config_value_hint::is_list> {
return result; return result;
} }
static void parse(config_value::parse_state& ps, T& xs) { static void parse_cli(config_value::parse_state& ps, T& xs) {
config_value::dictionary result; config_value::dictionary result;
bool has_open_token = ps.consume('['); bool has_open_token = ps.consume('[');
do { do {
...@@ -481,7 +481,7 @@ struct select_config_value_access<T, select_config_value_hint::is_list> { ...@@ -481,7 +481,7 @@ struct select_config_value_access<T, select_config_value_hint::is_list> {
return; return;
} }
value_type tmp; value_type tmp;
value_trait::parse(ps, tmp); value_trait::parse_cli(ps, tmp);
if (ps.code > pec::trailing_character) if (ps.code > pec::trailing_character)
return; return;
xs.insert(xs.end(), std::move(tmp)); xs.insert(xs.end(), std::move(tmp));
...@@ -544,7 +544,7 @@ struct select_config_value_access<T, select_config_value_hint::is_map> { ...@@ -544,7 +544,7 @@ struct select_config_value_access<T, select_config_value_hint::is_map> {
return std::move(*result); return std::move(*result);
} }
static void parse(config_value::parse_state& ps, map_type& xs) { static void parse_cli(config_value::parse_state& ps, map_type& xs) {
detail::parse(ps, xs); detail::parse(ps, xs);
} }
...@@ -581,7 +581,7 @@ struct config_value_access<float> { ...@@ -581,7 +581,7 @@ struct config_value_access<float> {
return x; return x;
} }
static inline void parse(config_value::parse_state& ps, float& x) { static inline void parse_cli(config_value::parse_state& ps, float& x) {
detail::parse(ps, x); detail::parse(ps, x);
} }
}; };
...@@ -633,7 +633,7 @@ struct config_value_access<std::tuple<Ts...>> { ...@@ -633,7 +633,7 @@ struct config_value_access<std::tuple<Ts...>> {
return result; return result;
} }
static void parse(config_value::parse_state& ps, tuple_type& xs) { static void parse_cli(config_value::parse_state& ps, tuple_type& xs) {
rec_parse(ps, xs, detail::int_token<0>(), detail::type_list<Ts...>()); rec_parse(ps, xs, detail::int_token<0>(), detail::type_list<Ts...>());
} }
...@@ -712,7 +712,7 @@ private: ...@@ -712,7 +712,7 @@ private:
static void rec_parse(config_value::parse_state& ps, tuple_type& xs, static void rec_parse(config_value::parse_state& ps, tuple_type& xs,
detail::int_token<Pos>, detail::type_list<U, Us...>) { detail::int_token<Pos>, detail::type_list<U, Us...>) {
using trait = select_config_value_access_t<U>; using trait = select_config_value_access_t<U>;
trait::parse(std::get<Pos>(xs)); trait::parse_cli(std::get<Pos>(xs));
if (ps.code > pec::trailing_character) if (ps.code > pec::trailing_character)
return; return;
if (sizeof...(Us) > 0 && !ps.consume(',')) if (sizeof...(Us) > 0 && !ps.consume(','))
......
...@@ -59,7 +59,7 @@ expected<config_value> parse_impl(T* ptr, string_view str) { ...@@ -59,7 +59,7 @@ expected<config_value> parse_impl(T* ptr, string_view str) {
} }
using trait = select_config_value_access_t<T>; using trait = select_config_value_access_t<T>;
config_value::parse_state ps{str.begin(), str.end()}; config_value::parse_state ps{str.begin(), str.end()};
trait::parse(ps, *ptr); trait::parse_cli(ps, *ptr);
if (ps.code != pec::success) if (ps.code != pec::success)
return ps.make_error(ps.code); return ps.make_error(ps.code);
return config_value{trait::convert(*ptr)}; return config_value{trait::convert(*ptr)};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment