[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master a87f01b0 03/11: Rename a function
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master a87f01b0 03/11: Rename a function |
|
Date: |
Fri, 29 Apr 2022 11:59:32 -0400 (EDT) |
branch: master
commit a87f01b0c7c8445a237e32e7a2951f0ed3107ed9
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Rename a function
Suggestion: view with "--word-diff-regex='\w'".
---
duff_fmt.hpp | 6 +-
duff_fmt_test.cpp | 164 +++++++++++++++++++++++++++---------------------------
2 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/duff_fmt.hpp b/duff_fmt.hpp
index 1a42eab8..7f5541ef 100644
--- a/duff_fmt.hpp
+++ b/duff_fmt.hpp
@@ -36,11 +36,11 @@
// Reference:
// http://groups.google.com/groups?selm=38C9B681.B8A036DF%40flash.net
-inline std::string ncnnnpnn(long double value)
+inline std::string duff_fmt(long double value)
{
if(value < 0.0L)
{
- return '-' + ncnnnpnn(-value);
+ return '-' + duff_fmt(-value);
}
std::stringstream stream;
@@ -53,7 +53,7 @@ inline std::string ncnnnpnn(long double value)
|| !(stream >> std::ws).eof()
)
{
- throw std::runtime_error("Stream error in ncnnnpnn.hpp .");
+ throw std::runtime_error("Stream error in duff_fmt.hpp .");
}
std::string::const_iterator sin_it(s_in.begin());
diff --git a/duff_fmt_test.cpp b/duff_fmt_test.cpp
index f8cfbc3f..ac22e25a 100644
--- a/duff_fmt_test.cpp
+++ b/duff_fmt_test.cpp
@@ -33,90 +33,90 @@
int test_main(int, char*[])
{
- LMI_TEST_EQUAL( "1,234,567,890.14", ncnnnpnn( 1234567890.14159));
- LMI_TEST_EQUAL( "234,567,890.14", ncnnnpnn( 234567890.14159));
- LMI_TEST_EQUAL( "34,567,890.14", ncnnnpnn( 34567890.14159));
- LMI_TEST_EQUAL( "4,567,890.14", ncnnnpnn( 4567890.14159));
- LMI_TEST_EQUAL( "567,890.14", ncnnnpnn( 567890.14159));
- LMI_TEST_EQUAL( "67,890.14", ncnnnpnn( 67890.14159));
- LMI_TEST_EQUAL( "7,890.14", ncnnnpnn( 7890.14159));
- LMI_TEST_EQUAL( "890.14", ncnnnpnn( 890.14159));
- LMI_TEST_EQUAL( "90.14", ncnnnpnn( 90.14159));
- LMI_TEST_EQUAL( "0.14", ncnnnpnn( 0.14159));
- LMI_TEST_EQUAL( "1,234,567,890.00", ncnnnpnn( 1234567890.0 ));
- LMI_TEST_EQUAL( "234,567,890.00", ncnnnpnn( 234567890.0 ));
- LMI_TEST_EQUAL( "34,567,890.00", ncnnnpnn( 34567890.0 ));
- LMI_TEST_EQUAL( "4,567,890.00", ncnnnpnn( 4567890.0 ));
- LMI_TEST_EQUAL( "567,890.00", ncnnnpnn( 567890.0 ));
- LMI_TEST_EQUAL( "67,890.00", ncnnnpnn( 67890.0 ));
- LMI_TEST_EQUAL( "7,890.00", ncnnnpnn( 7890.0 ));
- LMI_TEST_EQUAL( "890.00", ncnnnpnn( 890.0 ));
- LMI_TEST_EQUAL( "90.00", ncnnnpnn( 90.0 ));
- LMI_TEST_EQUAL( "1.00", ncnnnpnn( 1.0 ));
- LMI_TEST_EQUAL( "1,000,000,000.00", ncnnnpnn( 1000000000.0 ));
- LMI_TEST_EQUAL( "100,000,000.00", ncnnnpnn( 100000000.0 ));
- LMI_TEST_EQUAL( "10,000,000.00", ncnnnpnn( 10000000.0 ));
- LMI_TEST_EQUAL( "1,000,000.00", ncnnnpnn( 1000000.0 ));
- LMI_TEST_EQUAL( "100,000.00", ncnnnpnn( 100000.0 ));
- LMI_TEST_EQUAL( "10,000.00", ncnnnpnn( 10000.0 ));
- LMI_TEST_EQUAL( "1,000.00", ncnnnpnn( 1000.0 ));
- LMI_TEST_EQUAL( "100.00", ncnnnpnn( 100.0 ));
- LMI_TEST_EQUAL( "10.00", ncnnnpnn( 10.0 ));
- LMI_TEST_EQUAL( "1.00", ncnnnpnn( 1.0 ));
- LMI_TEST_EQUAL( "0.10", ncnnnpnn( 0.1 ));
- LMI_TEST_EQUAL( "0.01", ncnnnpnn( 0.01 ));
- LMI_TEST_EQUAL( "2,147,483,647.00", ncnnnpnn( 2147483647.0 ));
- LMI_TEST_EQUAL( "2,000.00", ncnnnpnn( 1999.999 ));
- LMI_TEST_EQUAL( "2,000.00", ncnnnpnn( 1999.99501));
- LMI_TEST_EQUAL( "1,999.99", ncnnnpnn( 1999.99499));
- LMI_TEST_EQUAL( "1,900.00", ncnnnpnn( 1899.999 ));
- LMI_TEST_EQUAL( "10,000,000.00", ncnnnpnn( 9999999.999 ));
+ LMI_TEST_EQUAL( "1,234,567,890.14", duff_fmt( 1234567890.14159));
+ LMI_TEST_EQUAL( "234,567,890.14", duff_fmt( 234567890.14159));
+ LMI_TEST_EQUAL( "34,567,890.14", duff_fmt( 34567890.14159));
+ LMI_TEST_EQUAL( "4,567,890.14", duff_fmt( 4567890.14159));
+ LMI_TEST_EQUAL( "567,890.14", duff_fmt( 567890.14159));
+ LMI_TEST_EQUAL( "67,890.14", duff_fmt( 67890.14159));
+ LMI_TEST_EQUAL( "7,890.14", duff_fmt( 7890.14159));
+ LMI_TEST_EQUAL( "890.14", duff_fmt( 890.14159));
+ LMI_TEST_EQUAL( "90.14", duff_fmt( 90.14159));
+ LMI_TEST_EQUAL( "0.14", duff_fmt( 0.14159));
+ LMI_TEST_EQUAL( "1,234,567,890.00", duff_fmt( 1234567890.0 ));
+ LMI_TEST_EQUAL( "234,567,890.00", duff_fmt( 234567890.0 ));
+ LMI_TEST_EQUAL( "34,567,890.00", duff_fmt( 34567890.0 ));
+ LMI_TEST_EQUAL( "4,567,890.00", duff_fmt( 4567890.0 ));
+ LMI_TEST_EQUAL( "567,890.00", duff_fmt( 567890.0 ));
+ LMI_TEST_EQUAL( "67,890.00", duff_fmt( 67890.0 ));
+ LMI_TEST_EQUAL( "7,890.00", duff_fmt( 7890.0 ));
+ LMI_TEST_EQUAL( "890.00", duff_fmt( 890.0 ));
+ LMI_TEST_EQUAL( "90.00", duff_fmt( 90.0 ));
+ LMI_TEST_EQUAL( "1.00", duff_fmt( 1.0 ));
+ LMI_TEST_EQUAL( "1,000,000,000.00", duff_fmt( 1000000000.0 ));
+ LMI_TEST_EQUAL( "100,000,000.00", duff_fmt( 100000000.0 ));
+ LMI_TEST_EQUAL( "10,000,000.00", duff_fmt( 10000000.0 ));
+ LMI_TEST_EQUAL( "1,000,000.00", duff_fmt( 1000000.0 ));
+ LMI_TEST_EQUAL( "100,000.00", duff_fmt( 100000.0 ));
+ LMI_TEST_EQUAL( "10,000.00", duff_fmt( 10000.0 ));
+ LMI_TEST_EQUAL( "1,000.00", duff_fmt( 1000.0 ));
+ LMI_TEST_EQUAL( "100.00", duff_fmt( 100.0 ));
+ LMI_TEST_EQUAL( "10.00", duff_fmt( 10.0 ));
+ LMI_TEST_EQUAL( "1.00", duff_fmt( 1.0 ));
+ LMI_TEST_EQUAL( "0.10", duff_fmt( 0.1 ));
+ LMI_TEST_EQUAL( "0.01", duff_fmt( 0.01 ));
+ LMI_TEST_EQUAL( "2,147,483,647.00", duff_fmt( 2147483647.0 ));
+ LMI_TEST_EQUAL( "2,000.00", duff_fmt( 1999.999 ));
+ LMI_TEST_EQUAL( "2,000.00", duff_fmt( 1999.99501));
+ LMI_TEST_EQUAL( "1,999.99", duff_fmt( 1999.99499));
+ LMI_TEST_EQUAL( "1,900.00", duff_fmt( 1899.999 ));
+ LMI_TEST_EQUAL( "10,000,000.00", duff_fmt( 9999999.999 ));
// Repeat with negatives.
- LMI_TEST_EQUAL("-1,234,567,890.14", ncnnnpnn(-1234567890.14159));
- LMI_TEST_EQUAL( "-234,567,890.14", ncnnnpnn( -234567890.14159));
- LMI_TEST_EQUAL( "-34,567,890.14", ncnnnpnn( -34567890.14159));
- LMI_TEST_EQUAL( "-4,567,890.14", ncnnnpnn( -4567890.14159));
- LMI_TEST_EQUAL( "-567,890.14", ncnnnpnn( -567890.14159));
- LMI_TEST_EQUAL( "-67,890.14", ncnnnpnn( -67890.14159));
- LMI_TEST_EQUAL( "-7,890.14", ncnnnpnn( -7890.14159));
- LMI_TEST_EQUAL( "-890.14", ncnnnpnn( -890.14159));
- LMI_TEST_EQUAL( "-90.14", ncnnnpnn( -90.14159));
- LMI_TEST_EQUAL( "-0.14", ncnnnpnn( -0.14159));
- LMI_TEST_EQUAL("-1,234,567,890.00", ncnnnpnn(-1234567890.0 ));
- LMI_TEST_EQUAL( "-234,567,890.00", ncnnnpnn( -234567890.0 ));
- LMI_TEST_EQUAL( "-34,567,890.00", ncnnnpnn( -34567890.0 ));
- LMI_TEST_EQUAL( "-4,567,890.00", ncnnnpnn( -4567890.0 ));
- LMI_TEST_EQUAL( "-567,890.00", ncnnnpnn( -567890.0 ));
- LMI_TEST_EQUAL( "-67,890.00", ncnnnpnn( -67890.0 ));
- LMI_TEST_EQUAL( "-7,890.00", ncnnnpnn( -7890.0 ));
- LMI_TEST_EQUAL( "-890.00", ncnnnpnn( -890.0 ));
- LMI_TEST_EQUAL( "-90.00", ncnnnpnn( -90.0 ));
- LMI_TEST_EQUAL( "-1.00", ncnnnpnn( -1.0 ));
- LMI_TEST_EQUAL("-1,000,000,000.00", ncnnnpnn(-1000000000.0 ));
- LMI_TEST_EQUAL( "-100,000,000.00", ncnnnpnn( -100000000.0 ));
- LMI_TEST_EQUAL( "-10,000,000.00", ncnnnpnn( -10000000.0 ));
- LMI_TEST_EQUAL( "-1,000,000.00", ncnnnpnn( -1000000.0 ));
- LMI_TEST_EQUAL( "-100,000.00", ncnnnpnn( -100000.0 ));
- LMI_TEST_EQUAL( "-10,000.00", ncnnnpnn( -10000.0 ));
- LMI_TEST_EQUAL( "-1,000.00", ncnnnpnn( -1000.0 ));
- LMI_TEST_EQUAL( "-100.00", ncnnnpnn( -100.0 ));
- LMI_TEST_EQUAL( "-10.00", ncnnnpnn( -10.0 ));
- LMI_TEST_EQUAL( "-1.00", ncnnnpnn( -1.0 ));
- LMI_TEST_EQUAL( "-0.10", ncnnnpnn( -0.1 ));
- LMI_TEST_EQUAL( "-0.01", ncnnnpnn( -0.01 ));
- LMI_TEST_EQUAL("-2,147,483,647.00", ncnnnpnn(-2147483647.0 ));
- LMI_TEST_EQUAL( "-2,000.00", ncnnnpnn( -1999.999 ));
- LMI_TEST_EQUAL( "-2,000.00", ncnnnpnn( -1999.999 ));
- LMI_TEST_EQUAL( "-2,000.00", ncnnnpnn( -1999.99501));
- LMI_TEST_EQUAL( "-1,999.99", ncnnnpnn( -1999.99499));
- LMI_TEST_EQUAL( "-1,900.00", ncnnnpnn( -1899.999 ));
- LMI_TEST_EQUAL( "-10,000,000.00", ncnnnpnn( -9999999.999 ));
+ LMI_TEST_EQUAL("-1,234,567,890.14", duff_fmt(-1234567890.14159));
+ LMI_TEST_EQUAL( "-234,567,890.14", duff_fmt( -234567890.14159));
+ LMI_TEST_EQUAL( "-34,567,890.14", duff_fmt( -34567890.14159));
+ LMI_TEST_EQUAL( "-4,567,890.14", duff_fmt( -4567890.14159));
+ LMI_TEST_EQUAL( "-567,890.14", duff_fmt( -567890.14159));
+ LMI_TEST_EQUAL( "-67,890.14", duff_fmt( -67890.14159));
+ LMI_TEST_EQUAL( "-7,890.14", duff_fmt( -7890.14159));
+ LMI_TEST_EQUAL( "-890.14", duff_fmt( -890.14159));
+ LMI_TEST_EQUAL( "-90.14", duff_fmt( -90.14159));
+ LMI_TEST_EQUAL( "-0.14", duff_fmt( -0.14159));
+ LMI_TEST_EQUAL("-1,234,567,890.00", duff_fmt(-1234567890.0 ));
+ LMI_TEST_EQUAL( "-234,567,890.00", duff_fmt( -234567890.0 ));
+ LMI_TEST_EQUAL( "-34,567,890.00", duff_fmt( -34567890.0 ));
+ LMI_TEST_EQUAL( "-4,567,890.00", duff_fmt( -4567890.0 ));
+ LMI_TEST_EQUAL( "-567,890.00", duff_fmt( -567890.0 ));
+ LMI_TEST_EQUAL( "-67,890.00", duff_fmt( -67890.0 ));
+ LMI_TEST_EQUAL( "-7,890.00", duff_fmt( -7890.0 ));
+ LMI_TEST_EQUAL( "-890.00", duff_fmt( -890.0 ));
+ LMI_TEST_EQUAL( "-90.00", duff_fmt( -90.0 ));
+ LMI_TEST_EQUAL( "-1.00", duff_fmt( -1.0 ));
+ LMI_TEST_EQUAL("-1,000,000,000.00", duff_fmt(-1000000000.0 ));
+ LMI_TEST_EQUAL( "-100,000,000.00", duff_fmt( -100000000.0 ));
+ LMI_TEST_EQUAL( "-10,000,000.00", duff_fmt( -10000000.0 ));
+ LMI_TEST_EQUAL( "-1,000,000.00", duff_fmt( -1000000.0 ));
+ LMI_TEST_EQUAL( "-100,000.00", duff_fmt( -100000.0 ));
+ LMI_TEST_EQUAL( "-10,000.00", duff_fmt( -10000.0 ));
+ LMI_TEST_EQUAL( "-1,000.00", duff_fmt( -1000.0 ));
+ LMI_TEST_EQUAL( "-100.00", duff_fmt( -100.0 ));
+ LMI_TEST_EQUAL( "-10.00", duff_fmt( -10.0 ));
+ LMI_TEST_EQUAL( "-1.00", duff_fmt( -1.0 ));
+ LMI_TEST_EQUAL( "-0.10", duff_fmt( -0.1 ));
+ LMI_TEST_EQUAL( "-0.01", duff_fmt( -0.01 ));
+ LMI_TEST_EQUAL("-2,147,483,647.00", duff_fmt(-2147483647.0 ));
+ LMI_TEST_EQUAL( "-2,000.00", duff_fmt( -1999.999 ));
+ LMI_TEST_EQUAL( "-2,000.00", duff_fmt( -1999.999 ));
+ LMI_TEST_EQUAL( "-2,000.00", duff_fmt( -1999.99501));
+ LMI_TEST_EQUAL( "-1,999.99", duff_fmt( -1999.99499));
+ LMI_TEST_EQUAL( "-1,900.00", duff_fmt( -1899.999 ));
+ LMI_TEST_EQUAL( "-10,000,000.00", duff_fmt( -9999999.999 ));
// Implementation-defined value [2.13.3/1].
LMI_TEST
- ( "1,999.99" == ncnnnpnn( 1999.995 )
- || "2,000.00" == ncnnnpnn( 1999.995 )
+ ( "1,999.99" == duff_fmt( 1999.995 )
+ || "2,000.00" == duff_fmt( 1999.995 )
);
// Infinities and NaNs. Apparently the C89/90 standard referenced
@@ -134,12 +134,12 @@ int test_main(int, char*[])
#endif // defined __BORLANDC__
long double volatile d = 0.0;
- ncnnnpnn( 1.0 / d );
- ncnnnpnn(-1.0 / d );
+ duff_fmt( 1.0 / d );
+ duff_fmt(-1.0 / d );
if(std::numeric_limits<long double>::has_quiet_NaN)
{
- ncnnnpnn(std::numeric_limits<long double>::quiet_NaN());
+ duff_fmt(std::numeric_limits<long double>::quiet_NaN());
}
return 0;
- [lmi-commits] [lmi] master updated (a2c3a37c -> 92d90368), Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master 17f6042e 01/11: Test nonstandard "'" printf flag, Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master 5e493f40 02/11: Rename ncnnnpnn, Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master a87f01b0 03/11: Rename a function,
Greg Chicares <=
- [lmi-commits] [lmi] master 51c6865b 04/11: Use non-long double for duff_fmt(), Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master e8d7f191 05/11: Use low-level functions for low-level work, Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master 2202d220 09/11: Reimplement ledger_format() in terms of duff_fmt(), Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master d46e3440 07/11: Modernize duff_fmt(), Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master d838ad1f 06/11: Make number of decimals a duff_fmt() argument, Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master e8d4b982 08/11: Measure ledger_format() speed, Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master 92d90368 11/11: Designate release candidate 20220429T1437Z, Greg Chicares, 2022/04/29
- [lmi-commits] [lmi] master 542c0473 10/11: Augment unit test, Greg Chicares, 2022/04/29