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 · 4fe9f85 · 4fe9f85
1 parent b817610
commit 4fe9f85
Showing 1 changed file with 38 additions and 12 deletions.
diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h
@@ -20,6 +20,7 @@
 
 FMT_BEGIN_NAMESPACE
 
+FMT_EXPORT
 enum class range_format { disabled, map, set, sequence, string, debug_string };
 
 namespace detail {
@@ -384,6 +385,13 @@ struct is_formattable_delayed
 #endif
 }  // namespace detail
 
+FMT_EXPORT
+template <typename T, typename Char, typename Enable = void>
+struct range_format_kind
+    : conditional_t<
+          is_range<T, Char>::value, detail::range_format_kind_<T>,
+          std::integral_constant<range_format, range_format::disabled>> {};
+
 template <typename...> struct conjunction : std::true_type {};
 template <typename P> struct conjunction<P> : P {};
 template <typename P1, typename... Pn>
@@ -445,7 +453,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)) {
@@ -503,12 +519,6 @@ struct range_formatter<
   }
 };
 
-template <typename T, typename Char, typename Enable = void>
-struct range_format_kind
-    : conditional_t<
-          is_range<T, Char>::value, detail::range_format_kind_<T>,
-          std::integral_constant<range_format, range_format::disabled>> {};
-
 template <typename R, typename Char>
 struct formatter<
     R, Char,
@@ -528,11 +538,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>