From db8d2b804448e64b19a4e7e731fcb6ed13d719bb Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sun, 5 Jul 2015 16:56:08 -0700 Subject: [PATCH] Non-decimal int formatters --- Sources/Plasma/CoreLib/plFormat.cpp | 6 +- Sources/Tests/CoreTests/test_plFormat.cpp | 194 ++++++++++++++++++++++ 2 files changed, 197 insertions(+), 3 deletions(-) diff --git a/Sources/Plasma/CoreLib/plFormat.cpp b/Sources/Plasma/CoreLib/plFormat.cpp index 1ab5c5a8..53312dcb 100644 --- a/Sources/Plasma/CoreLib/plFormat.cpp +++ b/Sources/Plasma/CoreLib/plFormat.cpp @@ -240,9 +240,9 @@ static void _formatNumeric(const plFormat_Private::FormatSpec &format, if (format_size == 0) format_size = 1; - hsAssert(format_size < 64, "Format length too long"); + hsAssert(format_size < 65, "Format length too long"); - char buffer[64]; + char buffer[65]; _IFormatNumeric_Impl<_IType>(buffer + format_size, value, radix, upperCase); _formatString(format, output, buffer, format_size, plFormat_Private::kAlignRight); } @@ -256,7 +256,7 @@ static void _formatDecimal(const plFormat_Private::FormatSpec &format, _UType abs = (value < 0) ? -(_UType)value : value; size_t format_size = 0; - _IType temp = abs; + _UType temp = abs; while (temp) { ++format_size; temp /= 10; diff --git a/Sources/Tests/CoreTests/test_plFormat.cpp b/Sources/Tests/CoreTests/test_plFormat.cpp index a15e8705..a71857a8 100644 --- a/Sources/Tests/CoreTests/test_plFormat.cpp +++ b/Sources/Tests/CoreTests/test_plFormat.cpp @@ -143,3 +143,197 @@ TEST(plFormat, Decimal) EXPECT_EQ(plString("xx18446744073709551615xx"), plFormat("xx{}xx", std::numeric_limits::max())); EXPECT_EQ(plString("xx+18446744073709551615xx"), plFormat("xx{+}xx", std::numeric_limits::max())); } + +TEST(plFormat, Hex) +{ + EXPECT_EQ(plString("xx4d2xx"), plFormat("xx{x}xx", 1234)); + EXPECT_EQ(plString("xx4d2xx"), plFormat("xx{x}xx", 1234)); + EXPECT_EQ(plString("xx4d2xx"), plFormat("xx{2x}xx", 1234)); + EXPECT_EQ(plString("xx4d2xx"), plFormat("xx{>2x}xx", 1234)); + EXPECT_EQ(plString("xx4d2xx"), plFormat("xx{<2x}xx", 1234)); + EXPECT_EQ(plString("xx 4d2xx"), plFormat("xx{6x}xx", 1234)); + EXPECT_EQ(plString("xx 4d2xx"), plFormat("xx{>6x}xx", 1234)); + EXPECT_EQ(plString("xx4d2 xx"), plFormat("xx{<6x}xx", 1234)); + + // Character types + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", '\0')); + EXPECT_EQ(plString("xx41xx"), plFormat("xx{x}xx", 'A')); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", L'\0')); + EXPECT_EQ(plString("xx41xx"), plFormat("xx{x}xx", L'A')); + EXPECT_EQ(plString("xx7fffxx"), plFormat("xx{x}xx", L'\u7fff')); + + // Numeric char types + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", (signed char)0)); + EXPECT_EQ(plString("xx7fxx"), plFormat("xx{x}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx80xx"), plFormat("xx{x}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", (unsigned char)0)); + EXPECT_EQ(plString("xxffxx"), plFormat("xx{x}xx", std::numeric_limits::max())); + + // 16-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", (short)0)); + EXPECT_EQ(plString("xx7fffxx"), plFormat("xx{x}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx8000xx"), plFormat("xx{x}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", (unsigned short)0)); + EXPECT_EQ(plString("xxffffxx"), plFormat("xx{x}xx", std::numeric_limits::max())); + + // 32-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", (int)0)); + EXPECT_EQ(plString("xx7fffffffxx"), plFormat("xx{x}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx80000000xx"), plFormat("xx{x}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", (unsigned int)0)); + EXPECT_EQ(plString("xxffffffffxx"), plFormat("xx{x}xx", std::numeric_limits::max())); + + // 64-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", (int64_t)0)); + EXPECT_EQ(plString("xx7fffffffffffffffxx"), plFormat("xx{x}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx8000000000000000xx"), plFormat("xx{x}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{x}xx", (uint64_t)0)); + EXPECT_EQ(plString("xxffffffffffffffffxx"), plFormat("xx{x}xx", std::numeric_limits::max())); +} + +TEST(plFormat, HexUpper) +{ + EXPECT_EQ(plString("xx4D2xx"), plFormat("xx{X}xx", 1234)); + EXPECT_EQ(plString("xx4D2xx"), plFormat("xx{X}xx", 1234)); + EXPECT_EQ(plString("xx4D2xx"), plFormat("xx{2X}xx", 1234)); + EXPECT_EQ(plString("xx4D2xx"), plFormat("xx{>2X}xx", 1234)); + EXPECT_EQ(plString("xx4D2xx"), plFormat("xx{<2X}xx", 1234)); + EXPECT_EQ(plString("xx 4D2xx"), plFormat("xx{6X}xx", 1234)); + EXPECT_EQ(plString("xx 4D2xx"), plFormat("xx{>6X}xx", 1234)); + EXPECT_EQ(plString("xx4D2 xx"), plFormat("xx{<6X}xx", 1234)); + + // Character types + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", '\0')); + EXPECT_EQ(plString("xx41xx"), plFormat("xx{X}xx", 'A')); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", L'\0')); + EXPECT_EQ(plString("xx41xx"), plFormat("xx{X}xx", L'A')); + EXPECT_EQ(plString("xx7FFFxx"), plFormat("xx{X}xx", L'\u7fff')); + + // Numeric char types + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", (signed char)0)); + EXPECT_EQ(plString("xx7Fxx"), plFormat("xx{X}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx80xx"), plFormat("xx{X}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", (unsigned char)0)); + EXPECT_EQ(plString("xxFFxx"), plFormat("xx{X}xx", std::numeric_limits::max())); + + // 16-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", (short)0)); + EXPECT_EQ(plString("xx7FFFxx"), plFormat("xx{X}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx8000xx"), plFormat("xx{X}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", (unsigned short)0)); + EXPECT_EQ(plString("xxFFFFxx"), plFormat("xx{X}xx", std::numeric_limits::max())); + + // 32-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", (int)0)); + EXPECT_EQ(plString("xx7FFFFFFFxx"), plFormat("xx{X}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx80000000xx"), plFormat("xx{X}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", (unsigned int)0)); + EXPECT_EQ(plString("xxFFFFFFFFxx"), plFormat("xx{X}xx", std::numeric_limits::max())); + + // 64-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", (int64_t)0)); + EXPECT_EQ(plString("xx7FFFFFFFFFFFFFFFxx"), plFormat("xx{X}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx8000000000000000xx"), plFormat("xx{X}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{X}xx", (uint64_t)0)); + EXPECT_EQ(plString("xxFFFFFFFFFFFFFFFFxx"), plFormat("xx{X}xx", std::numeric_limits::max())); +} + +TEST(plFormat, Octal) +{ + EXPECT_EQ(plString("xx2322xx"), plFormat("xx{o}xx", 1234)); + EXPECT_EQ(plString("xx2322xx"), plFormat("xx{o}xx", 1234)); + EXPECT_EQ(plString("xx2322xx"), plFormat("xx{2o}xx", 1234)); + EXPECT_EQ(plString("xx2322xx"), plFormat("xx{>2o}xx", 1234)); + EXPECT_EQ(plString("xx2322xx"), plFormat("xx{<2o}xx", 1234)); + EXPECT_EQ(plString("xx 2322xx"), plFormat("xx{6o}xx", 1234)); + EXPECT_EQ(plString("xx 2322xx"), plFormat("xx{>6o}xx", 1234)); + EXPECT_EQ(plString("xx2322 xx"), plFormat("xx{<6o}xx", 1234)); + + // Character types + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", '\0')); + EXPECT_EQ(plString("xx101xx"), plFormat("xx{o}xx", 'A')); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", L'\0')); + EXPECT_EQ(plString("xx101xx"), plFormat("xx{o}xx", L'A')); + EXPECT_EQ(plString("xx77777xx"), plFormat("xx{o}xx", L'\u7fff')); + + // Numeric char types + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", (signed char)0)); + EXPECT_EQ(plString("xx177xx"), plFormat("xx{o}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx200xx"), plFormat("xx{o}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", (unsigned char)0)); + EXPECT_EQ(plString("xx377xx"), plFormat("xx{o}xx", std::numeric_limits::max())); + + // 16-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", (short)0)); + EXPECT_EQ(plString("xx77777xx"), plFormat("xx{o}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx100000xx"), plFormat("xx{o}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", (unsigned short)0)); + EXPECT_EQ(plString("xx177777xx"), plFormat("xx{o}xx", std::numeric_limits::max())); + + // 32-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", (int)0)); + EXPECT_EQ(plString("xx17777777777xx"), plFormat("xx{o}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx20000000000xx"), plFormat("xx{o}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", (unsigned int)0)); + EXPECT_EQ(plString("xx37777777777xx"), plFormat("xx{o}xx", std::numeric_limits::max())); + + // 64-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", (int64_t)0)); + EXPECT_EQ(plString("xx777777777777777777777xx"), plFormat("xx{o}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx1000000000000000000000xx"), plFormat("xx{o}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{o}xx", (uint64_t)0)); + EXPECT_EQ(plString("xx1777777777777777777777xx"), plFormat("xx{o}xx", std::numeric_limits::max())); +} + +TEST(plFormat, Binary) +{ + EXPECT_EQ(plString("xx10011010010xx"), plFormat("xx{b}xx", 1234)); + EXPECT_EQ(plString("xx10011010010xx"), plFormat("xx{b}xx", 1234)); + EXPECT_EQ(plString("xx10011010010xx"), plFormat("xx{2b}xx", 1234)); + EXPECT_EQ(plString("xx10011010010xx"), plFormat("xx{>2b}xx", 1234)); + EXPECT_EQ(plString("xx10011010010xx"), plFormat("xx{<2b}xx", 1234)); + EXPECT_EQ(plString("xx 10011010010xx"), plFormat("xx{16b}xx", 1234)); + EXPECT_EQ(plString("xx 10011010010xx"), plFormat("xx{>16b}xx", 1234)); + EXPECT_EQ(plString("xx10011010010 xx"), plFormat("xx{<16b}xx", 1234)); + + // Character types + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", '\0')); + EXPECT_EQ(plString("xx1000001xx"), plFormat("xx{b}xx", 'A')); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", L'\0')); + EXPECT_EQ(plString("xx1000001xx"), plFormat("xx{b}xx", L'A')); + EXPECT_EQ(plString("xx111111111111111xx"), plFormat("xx{b}xx", L'\u7fff')); + + // Numeric char types + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", (signed char)0)); + EXPECT_EQ(plString("xx1111111xx"), plFormat("xx{b}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx10000000xx"), plFormat("xx{b}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", (unsigned char)0)); + EXPECT_EQ(plString("xx11111111xx"), plFormat("xx{b}xx", std::numeric_limits::max())); + + // 16-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", (short)0)); + EXPECT_EQ(plString("xx111111111111111xx"), plFormat("xx{b}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx1000000000000000xx"), plFormat("xx{b}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", (unsigned short)0)); + EXPECT_EQ(plString("xx1111111111111111xx"), plFormat("xx{b}xx", std::numeric_limits::max())); + + // 32-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", (int)0)); + EXPECT_EQ(plString("xx1111111111111111111111111111111xx"), + plFormat("xx{b}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx10000000000000000000000000000000xx"), + plFormat("xx{b}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", (unsigned int)0)); + EXPECT_EQ(plString("xx11111111111111111111111111111111xx"), + plFormat("xx{b}xx", std::numeric_limits::max())); + + // 64-bit ints + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", (int64_t)0)); + EXPECT_EQ(plString("xx111111111111111111111111111111111111111111111111111111111111111xx"), + plFormat("xx{b}xx", std::numeric_limits::max())); + EXPECT_EQ(plString("xx1000000000000000000000000000000000000000000000000000000000000000xx"), + plFormat("xx{b}xx", std::numeric_limits::min())); + EXPECT_EQ(plString("xx0xx"), plFormat("xx{b}xx", (uint64_t)0)); + EXPECT_EQ(plString("xx1111111111111111111111111111111111111111111111111111111111111111xx"), + plFormat("xx{b}xx", std::numeric_limits::max())); +}