From 914ff44510505f209d8e85a01e31f4c5fb1b6a5b Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 20 Feb 2020 12:34:37 -0800 Subject: Export of internal Abseil changes -- bffb14058bb46137d42c7a113a36b6b582997cda by Xiaoyi Zhang : Add ABSL_MUST_USE_RESULT to Status. PiperOrigin-RevId: 296272498 -- b426fdd3b3f687d7a8aeb644925923bbab503778 by CJ Johnson : Optimizes absl::InlinedVector::clear() by not deallocating the data, if allocated. This allows allocations to be reused. This matches the behavior of std::vector::clear() PiperOrigin-RevId: 296197235 -- 8cb9fbfe20e749816065c1a042e84f72dac9bfc0 by CJ Johnson : Optimizes absl::InlinedVector::clear() by not deallocating the data, if allocated. This allows allocations to be reused. This matches the behavior of std::vector::clear() PiperOrigin-RevId: 296058092 -- 2558d3369a482879919155b6f46317ccafe0ca13 by Matthew Brown : Internal cleanup PiperOrigin-RevId: 296025806 -- cf7ee57228534021c15ed7421df92acf6c27c9c7 by Gennadiy Rozental : Make FlagOps enum class. We also add comments to all the functions used to invoke flag ops. PiperOrigin-RevId: 295975809 -- 74bbdbd12fbc54e9c4ebcb3005e727becf0e509d by Xiaoyi Zhang : Release `absl::Status`. PiperOrigin-RevId: 295777662 -- 3dbc622b4e2227863525da2f7de7ecbeb3ede21f by Xiaoyi Zhang : Internal change. PiperOrigin-RevId: 295733658 -- 48d74aa0ab01d611da6012b377f038d8b26c712e by Abseil Team : Fix typo in container/CMakeLists.txt for container_common PiperOrigin-RevId: 295491438 GitOrigin-RevId: bffb14058bb46137d42c7a113a36b6b582997cda Change-Id: Ia966857b07fa7412cd6489ac37b5fa26640e4141 --- absl/strings/internal/str_format/extension.h | 33 +++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) (limited to 'absl/strings/internal/str_format/extension.h') diff --git a/absl/strings/internal/str_format/extension.h b/absl/strings/internal/str_format/extension.h index 1a863c2..16f6c0a 100644 --- a/absl/strings/internal/str_format/extension.h +++ b/absl/strings/internal/str_format/extension.h @@ -260,9 +260,21 @@ inline std::ostream& operator<<(std::ostream& os, FormatConversionChar v) { return os << c; } +struct FormatConversionSpecImplFriend; + class ConversionSpec { public: + // Deprecated (use has_x_flag() instead). Flags flags() const { return flags_; } + + // Width and precison are not specified, no flags are set. + bool is_basic() const { return flags_.basic; } + bool has_left_flag() const { return flags_.left; } + bool has_show_pos_flag() const { return flags_.show_pos; } + bool has_sign_col_flag() const { return flags_.sign_col; } + bool has_alt_flag() const { return flags_.alt; } + bool has_zero_flag() const { return flags_.zero; } + FormatConversionChar conv() const { // Keep this field first in the struct . It generates better code when // accessing it when ConversionSpec is passed by value in registers. @@ -277,19 +289,28 @@ class ConversionSpec { // negative value. int precision() const { return precision_; } - void set_flags(Flags f) { flags_ = f; } - void set_conv(FormatConversionChar c) { conv_ = c; } - void set_width(int w) { width_ = w; } - void set_precision(int p) { precision_ = p; } - void set_left(bool b) { flags_.left = b; } - private: + friend struct str_format_internal::FormatConversionSpecImplFriend; FormatConversionChar conv_ = FormatConversionChar::kNone; Flags flags_; int width_; int precision_; }; +struct FormatConversionSpecImplFriend final { + static void SetFlags(Flags f, ConversionSpec* conv) { conv->flags_ = f; } + static void SetConversionChar(FormatConversionChar c, ConversionSpec* conv) { + conv->conv_ = c; + } + static void SetWidth(int w, ConversionSpec* conv) { conv->width_ = w; } + static void SetPrecision(int p, ConversionSpec* conv) { + conv->precision_ = p; + } + static std::string FlagsToString(const ConversionSpec& spec) { + return spec.flags_.ToString(); + } +}; + constexpr uint64_t FormatConversionCharToConvValue(char conv) { return #define CONV_SET_CASE(c) \ -- cgit v1.2.3