maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Mark de Wever 2021-12-29 19:50:38 +01:00
parent c05db63887
commit f2b40ba400
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcxx/include/__format/parser_std_format_spec.h
View File

@ -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);

6
libcxx/test/libcxx/utilities/format/format.string/format.string.std/std_format_spec_string.pass.cpp
View File

@ -205,12 +205,6 @@ constexpr void test() {
test({.precision = 0, .precision_as_arg = true}, 4, CSTR(".{0}}"));
test({.precision = 1, .precision_as_arg = true}, 4, CSTR(".{1}}"));
test_exception<Parser<CharT>>(
"A format-spec precision field shouldn't have a leading zero",
CSTR(".00"));
test_exception<Parser<CharT>>(
"A format-spec precision field shouldn't have a leading zero",
CSTR(".01"));
test_exception<Parser<CharT>>(
"The format-spec precision field doesn't contain a value or arg-id",
CSTR(".a"));

13
libcxx/test/std/utilities/format/format.functions/format_tests.h
View File

@ -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 '}'",