Skip to content

Commit 6b37d8b

Browse files
gchateletgchatelet
authored
[libc][NFC] Shorten type names in tests (llvm#75358)
1 parent f3dcc23 commit 6b37d8b

File tree

10 files changed

+52
-58
lines changed

10 files changed

+52
-58
lines changed

‎libc/test/src/math/FDimTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ class FDimTestTemplate : public LIBC_NAMESPACE::testing::Test {
7474
private:
7575
// constexpr does not work on FPBits yet, so we cannot have these constants as
7676
// static.
77-
const T nan = T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1));
78-
const T inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::inf());
79-
const T neg_inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf());
80-
const T zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::zero());
81-
const T neg_zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero());
77+
const T nan = T(FPBits::build_quiet_nan(1));
78+
const T inf = T(FPBits::inf());
79+
const T neg_inf = T(FPBits::neg_inf());
80+
const T zero = T(FPBits::zero());
81+
const T neg_zero = T(FPBits::neg_zero());
8282
};

‎libc/test/src/math/FmaTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class FmaTestTemplate : public LIBC_NAMESPACE::testing::Test {
2323
using Func = T (*)(T, T, T);
2424
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
2525
using UIntType = typename FPBits::UIntType;
26-
const T nan = T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1));
27-
const T inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::inf());
28-
const T neg_inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf());
29-
const T zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::zero());
30-
const T neg_zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero());
26+
const T nan = T(FPBits::build_quiet_nan(1));
27+
const T inf = T(FPBits::inf());
28+
const T neg_inf = T(FPBits::neg_inf());
29+
const T zero = T(FPBits::zero());
30+
const T neg_zero = T(FPBits::neg_zero());
3131

3232
UIntType get_random_bit_pattern() {
3333
UIntType bits{0};

‎libc/test/src/math/ILogbTest.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,12 @@ class LlvmLibcILogbTest : public LIBC_NAMESPACE::testing::Test {
2424

2525
template <typename T>
2626
void test_special_numbers(typename ILogbFunc<T>::Func func) {
27-
EXPECT_EQ(FP_ILOGB0, func(T(LIBC_NAMESPACE::fputil::FPBits<T>::zero())));
28-
EXPECT_EQ(FP_ILOGB0,
29-
func(T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero())));
30-
31-
EXPECT_EQ(FP_ILOGBNAN,
32-
func(T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1))));
33-
34-
EXPECT_EQ(INT_MAX, func(T(LIBC_NAMESPACE::fputil::FPBits<T>::inf())));
35-
EXPECT_EQ(INT_MAX, func(T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf())));
27+
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
28+
EXPECT_EQ(FP_ILOGB0, func(T(FPBits::zero())));
29+
EXPECT_EQ(FP_ILOGB0, func(T(FPBits::neg_zero())));
30+
EXPECT_EQ(FP_ILOGBNAN, func(T(FPBits::build_quiet_nan(1))));
31+
EXPECT_EQ(INT_MAX, func(T(FPBits::inf())));
32+
EXPECT_EQ(INT_MAX, func(T(FPBits::neg_inf())));
3633
}
3734

3835
template <typename T>

‎libc/test/src/math/LdExpTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ class LdExpTestTemplate : public LIBC_NAMESPACE::testing::Test {
2828
// A normalized mantissa to be used with tests.
2929
static constexpr UIntType MANTISSA = NormalFloat::ONE + 0x1234;
3030

31-
const T zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::zero());
32-
const T neg_zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero());
33-
const T inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::inf());
34-
const T neg_inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf());
35-
const T nan = T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1));
31+
const T zero = T(FPBits::zero());
32+
const T neg_zero = T(FPBits::neg_zero());
33+
const T inf = T(FPBits::inf());
34+
const T neg_inf = T(FPBits::neg_inf());
35+
const T nan = T(FPBits::build_quiet_nan(1));
3636

3737
public:
3838
typedef T (*LdExpFunc)(T, int);

‎libc/test/src/math/RemQuoTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class RemQuoTestTemplate : public LIBC_NAMESPACE::testing::Test {
2323
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
2424
using UIntType = typename FPBits::UIntType;
2525

26-
const T zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::zero());
27-
const T neg_zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero());
28-
const T inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::inf());
29-
const T neg_inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf());
30-
const T nan = T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1));
26+
const T zero = T(FPBits::zero());
27+
const T neg_zero = T(FPBits::neg_zero());
28+
const T inf = T(FPBits::inf());
29+
const T neg_inf = T(FPBits::neg_inf());
30+
const T nan = T(FPBits::build_quiet_nan(1));
3131

3232
public:
3333
typedef T (*RemQuoFunc)(T, T, int *);

‎libc/test/src/math/smoke/FDimTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ class FDimTestTemplate : public LIBC_NAMESPACE::testing::Test {
7474
private:
7575
// constexpr does not work on FPBits yet, so we cannot have these constants as
7676
// static.
77-
const T nan = T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1));
78-
const T inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::inf());
79-
const T neg_inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf());
80-
const T zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::zero());
81-
const T neg_zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero());
77+
const T nan = T(FPBits::build_quiet_nan(1));
78+
const T inf = T(FPBits::inf());
79+
const T neg_inf = T(FPBits::neg_inf());
80+
const T zero = T(FPBits::zero());
81+
const T neg_zero = T(FPBits::neg_zero());
8282
};

‎libc/test/src/math/smoke/FmaTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ class FmaTestTemplate : public LIBC_NAMESPACE::testing::Test {
1919
using Func = T (*)(T, T, T);
2020
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
2121
using UIntType = typename FPBits::UIntType;
22-
const T nan = T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1));
23-
const T inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::inf());
24-
const T neg_inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf());
25-
const T zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::zero());
26-
const T neg_zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero());
22+
const T nan = T(FPBits::build_quiet_nan(1));
23+
const T inf = T(FPBits::inf());
24+
const T neg_inf = T(FPBits::neg_inf());
25+
const T zero = T(FPBits::zero());
26+
const T neg_zero = T(FPBits::neg_zero());
2727

2828
public:
2929
void test_special_numbers(Func func) {

‎libc/test/src/math/smoke/ILogbTest.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,12 @@ class LlvmLibcILogbTest : public LIBC_NAMESPACE::testing::Test {
2424

2525
template <typename T>
2626
void test_special_numbers(typename ILogbFunc<T>::Func func) {
27-
EXPECT_EQ(FP_ILOGB0, func(T(LIBC_NAMESPACE::fputil::FPBits<T>::zero())));
28-
EXPECT_EQ(FP_ILOGB0,
29-
func(T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero())));
30-
31-
EXPECT_EQ(FP_ILOGBNAN,
32-
func(T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1))));
33-
34-
EXPECT_EQ(INT_MAX, func(T(LIBC_NAMESPACE::fputil::FPBits<T>::inf())));
35-
EXPECT_EQ(INT_MAX, func(T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf())));
27+
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
28+
EXPECT_EQ(FP_ILOGB0, func(T(FPBits::zero())));
29+
EXPECT_EQ(FP_ILOGB0, func(T(FPBits::neg_zero())));
30+
EXPECT_EQ(FP_ILOGBNAN, func(T(FPBits::build_quiet_nan(1))));
31+
EXPECT_EQ(INT_MAX, func(T(FPBits::inf())));
32+
EXPECT_EQ(INT_MAX, func(T(FPBits::neg_inf())));
3633
}
3734

3835
template <typename T>

‎libc/test/src/math/smoke/LdExpTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ class LdExpTestTemplate : public LIBC_NAMESPACE::testing::Test {
2828
// A normalized mantissa to be used with tests.
2929
static constexpr UIntType MANTISSA = NormalFloat::ONE + 0x1234;
3030

31-
const T zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::zero());
32-
const T neg_zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero());
33-
const T inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::inf());
34-
const T neg_inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf());
35-
const T nan = T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1));
31+
const T zero = T(FPBits::zero());
32+
const T neg_zero = T(FPBits::neg_zero());
33+
const T inf = T(FPBits::inf());
34+
const T neg_inf = T(FPBits::neg_inf());
35+
const T nan = T(FPBits::build_quiet_nan(1));
3636

3737
public:
3838
typedef T (*LdExpFunc)(T, int);

‎libc/test/src/math/smoke/RemQuoTest.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class RemQuoTestTemplate : public LIBC_NAMESPACE::testing::Test {
2020
using FPBits = LIBC_NAMESPACE::fputil::FPBits<T>;
2121
using UIntType = typename FPBits::UIntType;
2222

23-
const T zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::zero());
24-
const T neg_zero = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_zero());
25-
const T inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::inf());
26-
const T neg_inf = T(LIBC_NAMESPACE::fputil::FPBits<T>::neg_inf());
27-
const T nan = T(LIBC_NAMESPACE::fputil::FPBits<T>::build_quiet_nan(1));
23+
const T zero = T(FPBits::zero());
24+
const T neg_zero = T(FPBits::neg_zero());
25+
const T inf = T(FPBits::inf());
26+
const T neg_inf = T(FPBits::neg_inf());
27+
const T nan = T(FPBits::build_quiet_nan(1));
2828

2929
public:
3030
typedef T (*RemQuoFunc)(T, T, int *);

0 commit comments

Comments
 (0)