From f2b40ba40004bfb70d90e9787ad8c9ab6d85646b Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Wed, 29 Dec 2021 19:50:38 +0100 Subject: [PATCH] [libc++][format] Fix precision parser conformance. @CaseyCarter reported that the tests for the std-format-spec rejects leading zeroes for precision, which the Standard does not require. The Standard allows them. Only for precision, not for the width or an arg-id. Fixes the precision parser and adds some test for the arg-id since they were missing. Reviewed By: ldionne, #libc Differential Revision: https://reviews.llvm.org/D116381 --- libcxx/include/__format/parser_std_format_spec.h | 11 ----------- .../format.string.std/std_format_spec_string.pass.cpp | 6 ------ .../std/utilities/format/format.functions/format_tests.h | 13 ++++++++++--- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/libcxx/include/__format/parser_std_format_spec.h b/libcxx/include/__format/parser_std_format_spec.h index 9b713b8..5ab6b42 100644 --- a/libcxx/include/__format/parser_std_format_spec.h +++ b/libcxx/include/__format/parser_std_format_spec.h @@ -363,17 +363,6 @@ protected: if (__begin == __end) __throw_format_error("End of input while parsing format-spec precision"); - if (*__begin == _CharT('0')) { - ++__begin; - if (__begin != __end && *__begin >= '0' && *__begin <= '9') - __throw_format_error( - "A format-spec precision field shouldn't have a leading zero"); - - __precision = 0; - __precision_as_arg = 0; - return __begin; - } - if (*__begin == _CharT('{')) { __format::__parse_number_result __arg_id = __parse_arg_id(++__begin, __end, __parse_ctx); diff --git a/libcxx/test/libcxx/utilities/format/format.string/format.string.std/std_format_spec_string.pass.cpp b/libcxx/test/libcxx/utilities/format/format.string/format.string.std/std_format_spec_string.pass.cpp index b3bcecf..e7bccbb 100644 --- a/libcxx/test/libcxx/utilities/format/format.string/format.string.std/std_format_spec_string.pass.cpp +++ b/libcxx/test/libcxx/utilities/format/format.string/format.string.std/std_format_spec_string.pass.cpp @@ -206,12 +206,6 @@ constexpr void test() { test({.precision = 1, .precision_as_arg = true}, 4, CSTR(".{1}}")); test_exception>( - "A format-spec precision field shouldn't have a leading zero", - CSTR(".00")); - test_exception>( - "A format-spec precision field shouldn't have a leading zero", - CSTR(".01")); - test_exception>( "The format-spec precision field doesn't contain a value or arg-id", CSTR(".a")); test_exception>( diff --git a/libcxx/test/std/utilities/format/format.functions/format_tests.h b/libcxx/test/std/utilities/format/format.functions/format_tests.h index ca73dbb..1d19719 100644 --- a/libcxx/test/std/utilities/format/format.functions/format_tests.h +++ b/libcxx/test/std/utilities/format/format.functions/format_tests.h @@ -175,11 +175,12 @@ void format_test_string(T world, T universe, TestFunction check, check_exception( "Using automatic argument numbering in manual argument numbering mode", STR("hello {0:{}}"), world, 1); + // Arg-id may not have leading zeros. + check_exception( + "A format-spec arg-id should terminate at a '}'", + STR("hello {0:{01}}"), world, 1); // *** precision *** - check_exception("A format-spec precision field shouldn't have a leading zero", - STR("hello {:.01}"), world); - #if _LIBCPP_VERSION // This limit isn't specified in the Standard. static_assert(std::__format::__number_max == 2'147'483'647, @@ -194,6 +195,8 @@ void format_test_string(T world, T universe, TestFunction check, // Precision 0 allowed, but not useful for string arguments. check(STR("hello "), STR("hello {:.{}}"), world, 0); + // Precision may have leading zeros. Secondly tests the value is still base 10. + check(STR("hello 0123456789"), STR("hello {:.000010}"), STR("0123456789abcdef")); check_exception( "A format-spec arg-id replacement shouldn't have a negative value", STR("hello {:.{}}"), world, -1); @@ -210,6 +213,10 @@ void format_test_string(T world, T universe, TestFunction check, check_exception( "Using automatic argument numbering in manual argument numbering mode", STR("hello {0:.{}}"), world, 1); + // Arg-id may not have leading zeros. + check_exception( + "A format-spec arg-id should terminate at a '}'", + STR("hello {0:.{01}}"), world, 1); // *** locale-specific form *** check_exception("The format-spec should consume the input or end with a '}'", -- 2.7.4