Skip to content

Commit 9c5dac3

Browse files
lemirelemire
committed
Build with pedantic flags under GNU GCC.
1 parent 7eae925 commit 9c5dac3

7 files changed

Lines changed: 25 additions & 22 deletions

File tree

‎include/fast_float/decimal_to_binary.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ adjusted_mantissa compute_float(int64_t q, uint64_t w) noexcept {
108108

109109
answer.mantissa = product.high >> (upperbit + 64 - binary::mantissa_explicit_bits() - 3);
110110

111-
answer.power2 = power(int(q)) + upperbit - lz - binary::minimum_exponent();
111+
answer.power2 = int(power(int(q)) + upperbit - lz - binary::minimum_exponent());
112112
if (answer.power2 <= 0) { // we have a subnormal?
113113
// Here have that answer.power2 <= 0 so -answer.power2 >= 0
114114
if(-answer.power2 + 1 >= 64) { // if we have more than 64 bits below the minimum exponent, you have a zero for sure.

‎tests/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
function(fast_float_add_cpp_test TEST_NAME)
33
add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
44
add_test(${TEST_NAME} ${TEST_NAME})
5+
if(NOT WIN32)
6+
target_compile_options(${TEST_NAME} PUBLIC -Werror -Wall -Wextra -Weffc++)
7+
target_compile_options(${TEST_NAME} PUBLIC -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wconversion -Wno-sign-conversion)
8+
endif()
59
target_link_libraries(${TEST_NAME} PUBLIC fast_float)
610
endfunction(fast_float_add_cpp_test)
711
fast_float_add_cpp_test(short_random_string)

‎tests/basictest.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ bool test_scientific_only() {
192192
return false;
193193
}
194194
input = "3.14e10";
195-
result;
196195
answer = fast_float::from_chars(input.data(), input.data()+input.size(), result, fast_float::chars_format::scientific);
197196
if(answer.ec != std::errc()) {
198197
std::cerr << "It is scientific!\n";
@@ -450,15 +449,15 @@ int main() {
450449
Assert(basic_test_32bit("0.0015924838953651488",0x1.a175cap-10f));
451450
Assert(basic_test_32bit("0.0008602388261351734",0.0008602388261351734f));
452451
Assert(basic_test_32bit("0.00036393293703440577",0x1.7d9c82p-12f));
453-
Assert(basic_test_32bit("0.00013746770127909258",0.00013746770127909258));
452+
Assert(basic_test_32bit("0.00013746770127909258",0.00013746770127909258f));
454453
Assert(basic_test_32bit("16407.9462890625", 16407.9462890625f));
455454
Assert(basic_test_32bit("1.1754947011469036e-38", 0x1.000006p-126f));
456455
Assert(basic_test_32bit("7.0064923216240854e-46", 0x1p-149f));
457456
Assert(basic_test_32bit("8388614.5", 8388614.5f));
458457
Assert(basic_test_32bit("0e9999999999999999999999999999", 0));
459458
Assert(basic_test_32bit("1234456789012345678901234567890e9999999999999999999999999999", std::numeric_limits<float>::infinity()));
460459
Assert(basic_test_32bit("4.7019774032891500318749461488889827112746622270883500860350068251e-38",4.7019774032891500318749461488889827112746622270883500860350068251e-38f));
461-
Assert(basic_test_32bit("3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679", 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679));
460+
Assert(basic_test_32bit("3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679", 3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679f));
462461
Assert(basic_test_32bit("2.3509887016445750159374730744444913556373311135441750430175034126e-38", 2.3509887016445750159374730744444913556373311135441750430175034126e-38f));
463462
Assert(basic_test_32bit("+1", 1));
464463
Assert(basic_test_32bit("2e3000", std::numeric_limits<float>::infinity()));
@@ -472,9 +471,9 @@ int main() {
472471
Assert(basic_test_32bit("3.4028234665e38", 0x1.fffffep+127f));
473472
Assert(basic_test_32bit("3.4028234666e38", 0x1.fffffep+127f));
474473
Assert(basic_test_32bit("0.000000000000000000000000000000000000011754943508222875079687365372222456778186655567720875215087517062784172594547271728515625", 0.000000000000000000000000000000000000011754943508222875079687365372222456778186655567720875215087517062784172594547271728515625));
475-
Assert(basic_test_32bit("0.00000000000000000000000000000000000000000000140129846432481707092372958328991613128026194187651577175706828388979108268586060148663818836212158203125", 0.00000000000000000000000000000000000000000000140129846432481707092372958328991613128026194187651577175706828388979108268586060148663818836212158203125));
476-
Assert(basic_test_32bit("0.00000000000000000000000000000000000002350988561514728583455765982071533026645717985517980855365926236850006129930346077117064851336181163787841796875", 0.00000000000000000000000000000000000002350988561514728583455765982071533026645717985517980855365926236850006129930346077117064851336181163787841796875));
477-
Assert(basic_test_32bit("0.00000000000000000000000000000000000001175494210692441075487029444849287348827052428745893333857174530571588870475618904265502351336181163787841796875", 0.00000000000000000000000000000000000001175494210692441075487029444849287348827052428745893333857174530571588870475618904265502351336181163787841796875));
474+
Assert(basic_test_32bit("0.00000000000000000000000000000000000000000000140129846432481707092372958328991613128026194187651577175706828388979108268586060148663818836212158203125", 0.00000000000000000000000000000000000000000000140129846432481707092372958328991613128026194187651577175706828388979108268586060148663818836212158203125f));
475+
Assert(basic_test_32bit("0.00000000000000000000000000000000000002350988561514728583455765982071533026645717985517980855365926236850006129930346077117064851336181163787841796875", 0.00000000000000000000000000000000000002350988561514728583455765982071533026645717985517980855365926236850006129930346077117064851336181163787841796875f));
476+
Assert(basic_test_32bit("0.00000000000000000000000000000000000001175494210692441075487029444849287348827052428745893333857174530571588870475618904265502351336181163787841796875", 0.00000000000000000000000000000000000001175494210692441075487029444849287348827052428745893333857174530571588870475618904265502351336181163787841796875f));
478477
std::cout << std::endl;
479478

480479
Assert(powers_of_ten());

‎tests/exhaustive32.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void allvalues() {
1919
std::cout << ".";
2020
std::cout.flush();
2121
}
22-
uint32_t word = w;
22+
uint32_t word = uint32_t(w);
2323
memcpy(&v, &word, sizeof(v));
2424

2525
{

‎tests/exhaustive32_midpoint.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void allvalues() {
5353
std::cout << ".";
5454
std::cout.flush();
5555
}
56-
uint32_t word = w;
56+
uint32_t word = uint32_t(w);
5757
memcpy(&v, &word, sizeof(v));
5858
if(std::isfinite(v)) {
5959
float nextf = std::nextafterf(v, INFINITY);
@@ -64,7 +64,7 @@ void allvalues() {
6464
double v2{nextf};
6565
assert(float(v2) == nextf);
6666
double midv{v1 + (v2 - v1) / 2};
67-
float expected_midv(midv);
67+
float expected_midv = float(midv);
6868

6969
const char *string_end = to_string(midv, buffer);
7070
float str_answer;

‎tests/random_string.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ double cygwin_strtod_l(const char* start, char** end) {
2424
class RandomEngine {
2525
public:
2626
RandomEngine() = delete;
27-
RandomEngine(int new_seed) { wyhash64_x_ = new_seed; };
27+
RandomEngine(int new_seed) : wyhash64_x_(new_seed) {};
2828
uint64_t next() {
2929
// Adapted from https://github.com/wangyi-fudan/wyhash/blob/master/wyhash.h
3030
// Inspired from
@@ -47,7 +47,7 @@ class RandomEngine {
4747
/* if (min == max) {
4848
return min;
4949
}*/
50-
int s = max - min + 1;
50+
uint64_t s = uint64_t(max - min + 1);
5151
uint64_t x = next();
5252
fast_float::value128 m = fast_float::full_multiplication(x, s);
5353
uint64_t l = m.low;
@@ -59,7 +59,7 @@ class RandomEngine {
5959
l = m.low;
6060
}
6161
}
62-
return (m.high) + min;
62+
return int(m.high + min);
6363
}
6464
int next_digit() { return next_ranged_int(0, 9); }
6565

@@ -78,8 +78,8 @@ size_t build_random_string(RandomEngine &rand, char *buffer) {
7878
number_of_digits = rand.next_ranged_int(1, 2000);
7979
}
8080
int location_of_decimal_separator = rand.next_ranged_int(1, number_of_digits);
81-
for (size_t i = 0; i < number_of_digits; i++) {
82-
if (i == location_of_decimal_separator) {
81+
for (size_t i = 0; i < size_t(number_of_digits); i++) {
82+
if (i == size_t(location_of_decimal_separator)) {
8383
buffer[pos++] = '.';
8484
}
8585
buffer[pos++] = char(rand.next_digit() + '0');
@@ -98,7 +98,7 @@ size_t build_random_string(RandomEngine &rand, char *buffer) {
9898
}
9999
}
100100
number_of_digits = rand.next_ranged_int(1, 3);
101-
for (size_t i = 0; i < number_of_digits; i++) {
101+
for (size_t i = 0; i < size_t(number_of_digits); i++) {
102102
buffer[pos++] = char(rand.next_digit() + '0');
103103
}
104104
}

‎tests/short_random_string.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ double cygwin_strtod_l(const char* start, char** end) {
2424
class RandomEngine {
2525
public:
2626
RandomEngine() = delete;
27-
RandomEngine(int new_seed) { wyhash64_x_ = new_seed; };
27+
RandomEngine(int new_seed) : wyhash64_x_(new_seed) { };
2828
uint64_t next() {
2929
// Adapted from https://github.com/wangyi-fudan/wyhash/blob/master/wyhash.h
3030
// Inspired from
@@ -47,7 +47,7 @@ class RandomEngine {
4747
/* if (min == max) {
4848
return min;
4949
}*/
50-
int s = max - min + 1;
50+
uint64_t s = uint64_t(max - min + 1);
5151
uint64_t x = next();
5252
fast_float::value128 m = fast_float::full_multiplication(x, s);
5353
uint64_t l = m.low;
@@ -59,7 +59,7 @@ class RandomEngine {
5959
l = m.low;
6060
}
6161
}
62-
return (m.high) + min;
62+
return int(m.high + min);
6363
}
6464
int next_digit() { return next_ranged_int(0, 9); }
6565

@@ -74,8 +74,8 @@ size_t build_random_string(RandomEngine &rand, char *buffer) {
7474
}
7575
int number_of_digits = rand.next_ranged_int(1, 19);
7676
int location_of_decimal_separator = rand.next_ranged_int(1, number_of_digits);
77-
for (size_t i = 0; i < number_of_digits; i++) {
78-
if (i == location_of_decimal_separator) {
77+
for (size_t i = 0; i < size_t(number_of_digits); i++) {
78+
if (i == size_t(location_of_decimal_separator)) {
7979
buffer[pos++] = '.';
8080
}
8181
buffer[pos++] = char(rand.next_digit() + '0');
@@ -94,7 +94,7 @@ size_t build_random_string(RandomEngine &rand, char *buffer) {
9494
}
9595
}
9696
number_of_digits = rand.next_ranged_int(1, 3);
97-
for (size_t i = 0; i < number_of_digits; i++) {
97+
for (size_t i = 0; i < size_t(number_of_digits); i++) {
9898
buffer[pos++] = char(rand.next_digit() + '0');
9999
}
100100
}

0 commit comments

Comments
 (0)