Added range_format::string formatter

Either the basic_string_view<Char> range constructor or a user-defined conversion operator will be used.
fmtlib · May 27, 2024 · 9a7743a · 9a7743a
1 parent b817610
commit 9a7743a
Showing 1 changed file with 38 additions and 13 deletions.
diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h
@@ -170,11 +170,12 @@ template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
   static auto all_true(...) -> std::false_type;
 
   template <size_t... Is>
-  static auto check(index_sequence<Is...>) -> decltype(all_true(
-      index_sequence<Is...>{},
-      integer_sequence<bool,
-                       (is_formattable<typename std::tuple_element<Is, T>::type,
-                                       C>::value)...>{}));
+  static auto check(index_sequence<Is...>)
+      -> decltype(all_true(
+          index_sequence<Is...>{},
+          integer_sequence<
+              bool, (is_formattable<typename std::tuple_element<Is, T>::type,
+                                    C>::value)...>{}));
 
  public:
   static constexpr const bool value =
@@ -334,8 +335,8 @@ struct formatter<Tuple, Char,
   }
 
   template <typename FormatContext>
-  auto format(const Tuple& value, FormatContext& ctx) const
-      -> decltype(ctx.out()) {
+  auto format(const Tuple& value,
+              FormatContext& ctx) const -> decltype(ctx.out()) {
     ctx.advance_to(detail::copy<Char>(opening_bracket_, ctx.out()));
     detail::for_each2(
         formatters_, value,
@@ -445,7 +446,15 @@ struct range_formatter<
   FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
     auto it = ctx.begin();
     auto end = ctx.end();
-    detail::maybe_set_debug_format(underlying_, true);
+    switch (range_format_kind<T, Char>::value) {
+    case range_format::debug_string:
+    case range_format::string:
+      break;
+    default:
+      detail::maybe_set_debug_format(underlying_, true);
+      break;
+    }
+
     if (it == end) return underlying_.parse(ctx);
 
     switch (detail::to_ascii(*it)) {
@@ -528,11 +537,27 @@ struct formatter<
 
  public:
   FMT_CONSTEXPR formatter() {
-    if (detail::const_check(range_format_kind<R, Char>::value !=
-                            range_format::set))
-      return;
-    range_formatter_.set_brackets(detail::string_literal<Char, '{'>{},
-                                  detail::string_literal<Char, '}'>{});
+    switch (range_format_kind<R, Char>::value) {
+    case range_format::debug_string: {
+      range_formatter_.set_brackets(detail::string_literal<Char, '"'>{},
+                                    detail::string_literal<Char, '"'>{});
+      range_formatter_.set_separator({});
+      break;
+    }
+    case range_format::set: {
+      range_formatter_.set_brackets(detail::string_literal<Char, '{'>{},
+                                    detail::string_literal<Char, '}'>{});
+      break;
+    }
+    case range_format::string: {
+      range_formatter_.set_brackets({}, {});
+      range_formatter_.set_separator({});
+      break;
+    }
+    default: {
+      break;
+    }
+    }
   }
 
   template <typename ParseContext>