This is an archive of the discontinued LLVM Phabricator instance.

Differential D119260

[libc++] Enables put_long_double test for glibc.
ClosedPublic

Authored by Mordante on Feb 8 2022, 9:44 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGece0f70664af: [libc++] Enables put_long_double test for glibc.
Summary

Glibc adds a +-sign for NaN-values when showpos fmtflags are set.

[tab:ios.fmtflags]
showpos generates a + sign in non-negative generated numeric output

Since NaNs aren't negative this behaviour seems correct. Enable the test
for glibc and add ifdefs to make sure the existing tests still pass.

This was noticed while working on D118971.

Diff Detail

Event Timeline

Mordante requested review of this revision.Feb 8 2022, 9:44 AM
Mordante created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 8 2022, 9:44 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B148288: Diff 406880.Feb 8 2022, 11:59 AM
ldionne accepted this revision.Feb 8 2022, 2:22 PM
ldionne added a subscriber: ldionne.

These C library-specific tests are a bit annoying, but definitely better than disabling them. Thanks for fixing!

This revision is now accepted and ready to land.Feb 8 2022, 2:22 PM
Mordante added a comment.Feb 9 2022, 8:13 AM

Agreed. I think the test would be possible to write more compact. However I'm not volunteering.

Closed by commit rGece0f70664af: [libc++] Enables put_long_double test for glibc. (authored by Mordante). · Explain WhyFeb 9 2022, 8:13 AM
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rGece0f70664af: [libc++] Enables put_long_double test for glibc..
mstorsjo added a subscriber: mstorsjo.Feb 10 2022, 1:03 AM

Sigh, I had a different patch for this, lying around waiting for attention and review, in D118238, which IMO solved the issue more elegantly (and MUCH fewer ifdefs to maintain, if another platform, say Windows, also would happen to have the same form for the NAN printouts).

Mordante added a comment.Feb 10 2022, 9:49 AM

@mstorsjo Sorry I missed that review and I discovered this issue during an unrelated cleanup.

Revision Contents

PathSize
libcxx/
test/
std/
localization/
locale.categories/
category.numeric/
locale.nm.put/
facet.num.put.members/
131 lines

Diff 407167

libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// <locale> // <locale>
// class num_put<charT, OutputIterator> // class num_put<charT, OutputIterator>
// iter_type put(iter_type s, ios_base& iob, char_type fill, long double v) const; // iter_type put(iter_type s, ios_base& iob, char_type fill, long double v) const;
// TODO GLIBC uses a different string for positive and negative NAN numbers.
// XFAIL: target={{.*}}-linux-gnu{{.*}}
// XFAIL: LIBCXX-WINDOWS-FIXME // XFAIL: LIBCXX-WINDOWS-FIXME
// XFAIL: LIBCXX-AIX-FIXME // XFAIL: LIBCXX-AIX-FIXME
#include <locale> #include <locale>
#include <ios> #include <ios>
#include <cassert> #include <cassert>
#include <streambuf> #include <streambuf>
#include <cmath> #include <cmath>
▲ Show 20 Lines • Show All 10,853 Lines • ▼ Show 20 Lines const my_facet f(1);
noshowpoint(ios); noshowpoint(ios);
{ {
ios.imbue(lc); ios.imbue(lc);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+nan");
#else
assert(ex == "nan"); assert(ex == "nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+nan*********************");
#else
assert(ex == "nan**********************"); assert(ex == "nan**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "*********************+nan");
#else
assert(ex == "**********************nan"); assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+*********************nan");
#else
assert(ex == "**********************nan"); assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
ios.imbue(lg); ios.imbue(lg);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+nan");
#else
assert(ex == "nan"); assert(ex == "nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+nan*********************");
#else
assert(ex == "nan**********************"); assert(ex == "nan**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "*********************+nan");
#else
assert(ex == "**********************nan"); assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+*********************nan");
#else
assert(ex == "**********************nan"); assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
} }
showpoint(ios); showpoint(ios);
{ {
ios.imbue(lc); ios.imbue(lc);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+nan");
#else
assert(ex == "nan"); assert(ex == "nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+nan*********************");
#else
assert(ex == "nan**********************"); assert(ex == "nan**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "*********************+nan");
#else
assert(ex == "**********************nan"); assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+*********************nan");
#else
assert(ex == "**********************nan"); assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
ios.imbue(lg); ios.imbue(lg);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+nan");
#else
assert(ex == "nan"); assert(ex == "nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+nan*********************");
#else
assert(ex == "nan**********************"); assert(ex == "nan**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "*********************+nan");
#else
assert(ex == "**********************nan"); assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+*********************nan");
#else
assert(ex == "**********************nan"); assert(ex == "**********************nan");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
} }
} }
} }
uppercase(ios); uppercase(ios);
{ {
▲ Show 20 Lines • Show All 147 Lines • ▼ Show 20 Lines#endif
noshowpoint(ios); noshowpoint(ios);
{ {
ios.imbue(lc); ios.imbue(lc);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+NAN");
#else
assert(ex == "NAN"); assert(ex == "NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+NAN*********************");
#else
assert(ex == "NAN**********************"); assert(ex == "NAN**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "*********************+NAN");
#else
assert(ex == "**********************NAN"); assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+*********************NAN");
#else
assert(ex == "**********************NAN"); assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
ios.imbue(lg); ios.imbue(lg);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+NAN");
#else
assert(ex == "NAN"); assert(ex == "NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+NAN*********************");
#else
assert(ex == "NAN**********************"); assert(ex == "NAN**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "*********************+NAN");
#else
assert(ex == "**********************NAN"); assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+*********************NAN");
#else
assert(ex == "**********************NAN"); assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
} }
showpoint(ios); showpoint(ios);
{ {
ios.imbue(lc); ios.imbue(lc);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+NAN");
#else
assert(ex == "NAN"); assert(ex == "NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+NAN*********************");
#else
assert(ex == "NAN**********************"); assert(ex == "NAN**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "*********************+NAN");
#else
assert(ex == "**********************NAN"); assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+*********************NAN");
#else
assert(ex == "**********************NAN"); assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
ios.imbue(lg); ios.imbue(lg);
{ {
ios.width(0); ios.width(0);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+NAN");
#else
assert(ex == "NAN"); assert(ex == "NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
left(ios); left(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+NAN*********************");
#else
assert(ex == "NAN**********************"); assert(ex == "NAN**********************");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
right(ios); right(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "*********************+NAN");
#else
assert(ex == "**********************NAN"); assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
ios.width(25); ios.width(25);
internal(ios); internal(ios);
{ {
cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v); cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base()); std::string ex(str, iter.base());
#if defined(TEST_HAS_GLIBC)
assert(ex == "+*********************NAN");
#else
assert(ex == "**********************NAN"); assert(ex == "**********************NAN");
#endif
assert(ios.width() == 0); assert(ios.width() == 0);
} }
} }
} }
} }
} }
} }
ios.precision(1); ios.precision(1);
▲ Show 20 Lines • Show All 14,922 Lines • Show Last 20 Lines