Remove unused code from FX_Number. The uint32_t ctor and GetUnsigned() are only used by unit tests. Delete them. Though |m_UnsignedValue| and |m_bSigned| remains because they are used internally in the class. Change-Id: I1718de79f78dc043c18b8dd6ceefdf12fb229447 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/63531 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcrt/fx_number.cpp b/core/fxcrt/fx_number.cpp index fa3ef0b..0a565be 100644 --- a/core/fxcrt/fx_number.cpp +++ b/core/fxcrt/fx_number.cpp
@@ -14,9 +14,6 @@ FX_Number::FX_Number() : m_bInteger(true), m_bSigned(false), m_UnsignedValue(0) {} -FX_Number::FX_Number(uint32_t value) - : m_bInteger(true), m_bSigned(false), m_UnsignedValue(value) {} - FX_Number::FX_Number(int32_t value) : m_bInteger(true), m_bSigned(true), m_SignedValue(value) {} @@ -87,10 +84,6 @@ } } -uint32_t FX_Number::GetUnsigned() const { - return m_bInteger ? m_UnsignedValue : static_cast<uint32_t>(m_FloatValue); -} - int32_t FX_Number::GetSigned() const { return m_bInteger ? m_SignedValue : static_cast<int32_t>(m_FloatValue); }
diff --git a/core/fxcrt/fx_number.h b/core/fxcrt/fx_number.h index c03839e..bfb575e 100644 --- a/core/fxcrt/fx_number.h +++ b/core/fxcrt/fx_number.h
@@ -14,7 +14,7 @@ class FX_Number { public: FX_Number(); - explicit FX_Number(uint32_t value); + explicit FX_Number(uint32_t value) = delete; explicit FX_Number(int32_t value); explicit FX_Number(float value); explicit FX_Number(ByteStringView str); @@ -22,7 +22,6 @@ bool IsInteger() const { return m_bInteger; } bool IsSigned() const { return m_bSigned; } - uint32_t GetUnsigned() const; // Underflow possible. int32_t GetSigned() const; // Underflow/Overflow possible. float GetFloat() const;
diff --git a/core/fxcrt/fx_number_unittest.cpp b/core/fxcrt/fx_number_unittest.cpp index 83702da..a31dc55 100644 --- a/core/fxcrt/fx_number_unittest.cpp +++ b/core/fxcrt/fx_number_unittest.cpp
@@ -11,33 +11,14 @@ FX_Number number; EXPECT_TRUE(number.IsInteger()); EXPECT_FALSE(number.IsSigned()); - EXPECT_EQ(0u, number.GetUnsigned()); EXPECT_EQ(0, number.GetSigned()); EXPECT_FLOAT_EQ(0.0f, number.GetFloat()); } -TEST(fxnumber, FromUnsigned) { - FX_Number number(42u); - EXPECT_TRUE(number.IsInteger()); - EXPECT_FALSE(number.IsSigned()); - EXPECT_EQ(42u, number.GetUnsigned()); - EXPECT_EQ(42, number.GetSigned()); - EXPECT_FLOAT_EQ(42.0f, number.GetFloat()); - - // Show that assignment works. - FX_Number number2 = number; - EXPECT_TRUE(number2.IsInteger()); - EXPECT_FALSE(number2.IsSigned()); - EXPECT_EQ(42u, number2.GetUnsigned()); - EXPECT_EQ(42, number2.GetSigned()); - EXPECT_FLOAT_EQ(42.0F, number2.GetFloat()); -} - TEST(fxnumber, FromSigned) { FX_Number number(-128); EXPECT_TRUE(number.IsInteger()); EXPECT_TRUE(number.IsSigned()); - EXPECT_EQ(4294967168u, number.GetUnsigned()); EXPECT_EQ(-128, number.GetSigned()); EXPECT_FLOAT_EQ(-128.0f, number.GetFloat()); @@ -45,7 +26,6 @@ FX_Number number2 = number; EXPECT_TRUE(number2.IsInteger()); EXPECT_TRUE(number2.IsSigned()); - EXPECT_EQ(4294967168u, number2.GetUnsigned()); EXPECT_EQ(-128, number2.GetSigned()); EXPECT_FLOAT_EQ(-128.0f, number2.GetFloat()); } @@ -54,7 +34,6 @@ FX_Number number(-100.001f); EXPECT_FALSE(number.IsInteger()); EXPECT_TRUE(number.IsSigned()); - EXPECT_EQ(4294967196u, number.GetUnsigned()); EXPECT_EQ(-100, number.GetSigned()); EXPECT_FLOAT_EQ(-100.001f, number.GetFloat()); @@ -62,7 +41,6 @@ FX_Number number2 = number; EXPECT_FALSE(number2.IsInteger()); EXPECT_TRUE(number2.IsSigned()); - EXPECT_EQ(4294967196u, number2.GetUnsigned()); EXPECT_EQ(-100, number2.GetSigned()); EXPECT_FLOAT_EQ(-100.001f, number2.GetFloat()); } @@ -72,32 +50,27 @@ FX_Number number(""); EXPECT_TRUE(number.IsInteger()); EXPECT_FALSE(number.IsSigned()); - EXPECT_EQ(0u, number.GetUnsigned()); } { FX_Number number("0"); EXPECT_TRUE(number.IsInteger()); EXPECT_FALSE(number.IsSigned()); - EXPECT_EQ(0u, number.GetUnsigned()); } { FX_Number number("10"); EXPECT_TRUE(number.IsInteger()); EXPECT_FALSE(number.IsSigned()); - EXPECT_EQ(10u, number.GetUnsigned()); } { FX_Number number("4294967295"); EXPECT_TRUE(number.IsInteger()); EXPECT_FALSE(number.IsSigned()); - EXPECT_EQ(std::numeric_limits<uint32_t>::max(), number.GetUnsigned()); } { // Value overflows. FX_Number number("4223423494965252"); EXPECT_TRUE(number.IsInteger()); EXPECT_FALSE(number.IsSigned()); - EXPECT_EQ(0u, number.GetUnsigned()); } { // No explicit sign will allow the number to go negative if we retrieve @@ -148,13 +121,11 @@ { // Value underflows. FX_Number number("-2147483649"); - EXPECT_EQ(0u, number.GetUnsigned()); EXPECT_EQ(0, number.GetSigned()); } { // Value overflows. FX_Number number("+2147483648"); - EXPECT_EQ(0u, number.GetUnsigned()); EXPECT_EQ(0, number.GetSigned()); } }