diff options
| author | Abseil Team <absl-team@google.com> | 2020-05-06T21·06-0700 |
|---|---|---|
| committer | vslashg <gfalcon@google.com> | 2020-05-06T21·14-0400 |
| commit | bd317cae3bc2630d1b12c5f1d77036e937d1d725 (patch) | |
| tree | 8a125c0d0d0fe107ee6e52a770b0b986aa15ff83 /absl/strings/internal/str_format | |
| parent | b115744656b16bd35014f22293b87f2edcffde74 (diff) | |
Export of internal Abseil changes
-- 0b3113ff8d252be11c35d8a77cdb23cc03e993d2 by Benjamin Barenblat <bbaren@google.com>: Correct Apache license headers These files have always been licensed under the Apache license (per the repository LICENSE), but they lacked headers to locally indicate that fact. Add the appropriate headers. PiperOrigin-RevId: 310223650 -- 4f92b0819781279c02b48bcfce4c10d547e35a49 by Greg Falcon <gfalcon@google.com>: Internal change PiperOrigin-RevId: 310223203 -- 378cab69ce3290d20b48d839daa988c3e63ed031 by Matthew Brown <matthewbr@google.com>: Internal Change PiperOrigin-RevId: 310180198 -- 93a1851be0f3726f7435cef56afaa1b8664f40e7 by Gennadiy Rozental <rogeeff@google.com>: Internal change PiperOrigin-RevId: 310003669 -- fbee3221cb1f8717fdf34e1cc0ea248a7719227a by Gennadiy Rozental <rogeeff@google.com>: Make 4 argument version of ParseFrom interface private in CommandLineFlag. Instroduce 2 argument version of this interface. PiperOrigin-RevId: 309995363 GitOrigin-RevId: 0b3113ff8d252be11c35d8a77cdb23cc03e993d2 Change-Id: Ibfdf948d3d081f5630ce7ebff992ab85c75cecba
Diffstat (limited to 'absl/strings/internal/str_format')
| -rw-r--r-- | absl/strings/internal/str_format/extension.h | 8 | ||||
| -rw-r--r-- | absl/strings/internal/str_format/parser.cc | 4 | ||||
| -rw-r--r-- | absl/strings/internal/str_format/parser_test.cc | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/absl/strings/internal/str_format/extension.h b/absl/strings/internal/str_format/extension.h index 33903df0be39..ce78a02aefbb 100644 --- a/absl/strings/internal/str_format/extension.h +++ b/absl/strings/internal/str_format/extension.h @@ -143,7 +143,7 @@ struct Flags { // clang-format off #define ABSL_INTERNAL_CONVERSION_CHARS_EXPAND_(X_VAL, X_SEP) \ /* text */ \ - X_VAL(c) X_SEP X_VAL(C) X_SEP X_VAL(s) X_SEP X_VAL(S) X_SEP \ + X_VAL(c) X_SEP X_VAL(s) X_SEP \ /* ints */ \ X_VAL(d) X_SEP X_VAL(i) X_SEP X_VAL(o) X_SEP \ X_VAL(u) X_SEP X_VAL(x) X_SEP X_VAL(X) X_SEP \ @@ -170,7 +170,7 @@ struct FormatConversionCharInternal { private: // clang-format off enum class Enum : uint8_t { - c, C, s, S, // text + c, s, // text d, i, o, u, x, X, // int f, F, e, E, g, G, a, A, // float n, p, // misc @@ -444,7 +444,7 @@ class FormatConversionSpec { // clang-format off enum class FormatConversionChar : uint8_t { - c, C, s, S, // text + c, s, // text d, i, o, u, x, X, // int f, F, e, E, g, G, a, A, // float n, p // misc @@ -454,9 +454,7 @@ enum class FormatConversionChar : uint8_t { enum class FormatConversionCharSet : uint64_t { // text c = str_format_internal::FormatConversionCharToConvInt('c'), - C = str_format_internal::FormatConversionCharToConvInt('C'), s = str_format_internal::FormatConversionCharToConvInt('s'), - S = str_format_internal::FormatConversionCharToConvInt('S'), // integer d = str_format_internal::FormatConversionCharToConvInt('d'), i = str_format_internal::FormatConversionCharToConvInt('i'), diff --git a/absl/strings/internal/str_format/parser.cc b/absl/strings/internal/str_format/parser.cc index 61132739b875..cc55dfa9c74e 100644 --- a/absl/strings/internal/str_format/parser.cc +++ b/absl/strings/internal/str_format/parser.cc @@ -29,9 +29,9 @@ ABSL_CONST_INIT const ConvTag kTags[256] = { {}, {}, {}, {}, {}, {}, {}, {}, // 28-2f {}, {}, {}, {}, {}, {}, {}, {}, // 30-37 {}, {}, {}, {}, {}, {}, {}, {}, // 38-3f - {}, CC::A, {}, CC::C, {}, CC::E, CC::F, CC::G, // @ABCDEFG + {}, CC::A, {}, {}, {}, CC::E, CC::F, CC::G, // @ABCDEFG {}, {}, {}, {}, LM::L, {}, {}, {}, // HIJKLMNO - {}, {}, {}, CC::S, {}, {}, {}, {}, // PQRSTUVW + {}, {}, {}, {}, {}, {}, {}, {}, // PQRSTUVW CC::X, {}, {}, {}, {}, {}, {}, {}, // XYZ[\]^_ {}, CC::a, {}, CC::c, CC::d, CC::e, CC::f, CC::g, // `abcdefg LM::h, CC::i, LM::j, {}, LM::l, {}, CC::n, CC::o, // hijklmno diff --git a/absl/strings/internal/str_format/parser_test.cc b/absl/strings/internal/str_format/parser_test.cc index dae2d20f593e..5aced987200d 100644 --- a/absl/strings/internal/str_format/parser_test.cc +++ b/absl/strings/internal/str_format/parser_test.cc @@ -47,7 +47,7 @@ TEST(ConversionCharTest, Names) { // clang-format off const Expectation kExpect[] = { #define X(c) {FormatConversionCharInternal::c, #c[0]} - X(c), X(C), X(s), X(S), // text + X(c), X(s), // text X(d), X(i), X(o), X(u), X(x), X(X), // int X(f), X(F), X(e), X(E), X(g), X(G), X(a), X(A), // float X(n), X(p), // misc |