From aad546baa58d5ddc9be15ffa26559a573d6628ac Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@fb.com>
Date: Sun, 1 Jan 2023 16:14:17 -0800
Subject: [PATCH] Simplify presentation type parsing

---
 include/fmt/core.h   | 15 +++++----------
 include/fmt/printf.h |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/include/fmt/core.h b/include/fmt/core.h
index cb55f4fc..517d9996 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -2375,7 +2375,7 @@ FMT_CONSTEXPR auto parse_precision(const Char* begin, const Char* end,
   return parse_dynamic_spec(begin, end, value, ref, ctx);
 }
 
-FMT_CONSTEXPR inline auto do_parse_presentation_type(char c, type t)
+FMT_CONSTEXPR inline auto parse_presentation_type(char c, type t)
     -> presentation_type {
   using pt = presentation_type;
   constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
@@ -2421,14 +2421,6 @@ FMT_CONSTEXPR inline auto do_parse_presentation_type(char c, type t)
   }
 }
 
-FMT_CONSTEXPR inline auto parse_presentation_type(char c, type t)
-    -> presentation_type {
-  auto pt = do_parse_presentation_type(c, t);
-  if (pt == presentation_type::none)
-    throw_format_error("invalid format specifier");
-  return pt;
-}
-
 enum class state { start, align, sign, hash, zero, width, precision, locale };
 
 // Parses standard format specifiers.
@@ -2522,7 +2514,10 @@ FMT_CONSTEXPR FMT_INLINE auto parse_format_specs(
       return begin;
     default: {
       if (is_ascii_letter(c) || c == '?') {
-        specs.type = parse_presentation_type(c, arg_type);
+        auto type = parse_presentation_type(c, arg_type);
+        if (type == presentation_type::none)
+          throw_format_error("invalid format specifier");
+        specs.type = type;
         return begin + 1;
       }
       if (*begin == '}') return begin;
diff --git a/include/fmt/printf.h b/include/fmt/printf.h
index dda93305..37709272 100644
--- a/include/fmt/printf.h
+++ b/include/fmt/printf.h
@@ -504,7 +504,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     }
     specs.type = parse_presentation_type(type, arg.type());
     if (specs.type == presentation_type::none)
-      throw_format_error("invalid type specifier");
+      throw_format_error("invalid format specifier");
 
     start = it;