feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

refactor: fmt algorithms were overconstrained with forward_iterator

Browse Source
This commit is contained in:
Mateusz Pusz
2021-10-15 17:44:49 +02:00
parent 5bd7852ae5
commit d853a2937a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core-fmt/include/units/bits/fmt.h
View File

@@ -174,7 +174,7 @@ template<class Handler, typename FormatContext>
// Parses the range [begin, end) as an unsigned integer. This function assumes
// that the range is non-empty and the first character is a digit.
template<std::forward_iterator It, std::sentinel_for<It> S>
template<std::input_iterator It, std::sentinel_for<It> S>
[[nodiscard]] constexpr It parse_nonnegative_int(It begin, S end, size_t& value)
{
gsl_Expects(begin != end && '0' <= *begin && *begin <= '9');
@@ -196,7 +196,7 @@ template<std::forward_iterator It, std::sentinel_for<It> S>
return begin;
}
template<std::forward_iterator It, std::sentinel_for<It> S>
template<std::input_iterator It, std::sentinel_for<It> S>
[[nodiscard]] constexpr It parse_nonnegative_int(It begin, S end, int& value)
{
size_t val_unsigned = 0;
@@ -206,7 +206,7 @@ template<std::forward_iterator It, std::sentinel_for<It> S>
return begin;
}
template<std::forward_iterator It, std::sentinel_for<It> S, typename IDHandler>
template<std::input_iterator It, std::sentinel_for<It> S, typename IDHandler>
[[nodiscard]] constexpr It do_parse_arg_id(It begin, S end, IDHandler&& handler)
{
gsl_Expects(begin != end);
@@ -226,7 +226,7 @@ template<std::forward_iterator It, std::sentinel_for<It> S, typename IDHandler>
throw STD_FMT::format_error("invalid format string");
}
template<std::forward_iterator It, std::sentinel_for<It> S, typename IDHandler>
template<std::input_iterator It, std::sentinel_for<It> S, typename IDHandler>
[[nodiscard]] constexpr It parse_arg_id(It begin, S end, IDHandler&& handler)
{
auto c = *begin;
@@ -235,7 +235,7 @@ template<std::forward_iterator It, std::sentinel_for<It> S, typename IDHandler>
return begin;
}
template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
template<std::input_iterator It, std::sentinel_for<It> S, typename Handler>
[[nodiscard]] constexpr It parse_sign(It begin, S end, Handler&& handler)
{
gsl_Expects(begin != end);
@@ -258,7 +258,7 @@ template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
return begin;
}
template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
template<std::input_iterator It, std::sentinel_for<It> S, typename Handler>
[[nodiscard]] constexpr It parse_width(It begin, S end, Handler&& handler)
{
struct width_adapter {
@@ -284,7 +284,7 @@ template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
return begin;
}
template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
template<std::input_iterator It, std::sentinel_for<It> S, typename Handler>
[[nodiscard]] constexpr It parse_precision(It begin, S end, Handler&& handler)
{
struct precision_adapter {
@@ -312,7 +312,7 @@ template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
return begin;
}
template<std::forward_iterator It>
template<std::input_iterator It>
constexpr int code_point_length(It begin)
{
if constexpr (sizeof(std::iter_value_t<It>) != 1) return 1;
@@ -327,7 +327,7 @@ constexpr int code_point_length(It begin)
}
// Parses fill and alignment.
template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
template<std::input_iterator It, std::sentinel_for<It> S, typename Handler>
[[nodiscard]] constexpr It parse_align(It begin, S end, Handler&& handler)
{
gsl_Expects(begin != end);
@@ -368,7 +368,7 @@ template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
// Parses standard format specifiers and sends notifications about parsed
// components to handler.
template<std::forward_iterator It, std::sentinel_for<It> S, typename SpecHandler>
template<std::input_iterator It, std::sentinel_for<It> S, typename SpecHandler>
[[nodiscard]] constexpr It parse_format_specs(It begin, S end, SpecHandler&& handler)
{
if (begin + 1 < end && begin[1] == '}' && is_ascii_letter(*begin) && *begin != 'L') {

8
src/core-fmt/include/units/format.h
View File

@@ -108,7 +108,7 @@ struct quantity_format_specs {
};
// Parse a `units-rep-modifier`
template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
template<std::input_iterator It, std::sentinel_for<It> S, typename Handler>
constexpr const It parse_units_rep(It begin, S end, Handler&& handler, bool treat_as_floating_point)
{
// parse sign
@@ -143,7 +143,7 @@ constexpr const It parse_units_rep(It begin, S end, Handler&& handler, bool trea
}
// parse units-specs
template<std::forward_iterator It, std::sentinel_for<It> S, typename Handler>
template<std::input_iterator It, std::sentinel_for<It> S, typename Handler>
constexpr It parse_units_format(It begin, S end, Handler&& handler)
{
auto ptr = begin;
@@ -276,13 +276,13 @@ struct quantity_formatter {
out(o), val(std::move(q).number()), specs(fspecs), loc(std::move(lc))
{}
template<std::forward_iterator It, std::sentinel_for<It> S>
template<std::input_iterator It, std::sentinel_for<It> S>
void on_text(It begin, S end)
{
std::copy(begin, end, out);
}
template<std::forward_iterator It, std::sentinel_for<It> S>
template<std::input_iterator It, std::sentinel_for<It> S>
void on_quantity_value([[maybe_unused]] It, [[maybe_unused]] S)
{
out = format_units_quantity_value<CharT>(out, val, specs.rep, loc);