Fix conversion warnings in DecFloat

+ constexpr

Author: mrotteveel

src/common/DecFloat.cpp

@@ -61,7 +61,7 @@ struct Dec2fb
 	ISC_STATUS fbDoubleError;
 };
 
-Dec2fb dec2fb[] = {
+constexpr Dec2fb dec2fb[] = {
 	{ DEC_IEEE_754_Division_by_zero, isc_decfloat_divide_by_zero, isc_exception_float_divide_by_zero },
 	{ DEC_IEEE_754_Inexact, isc_decfloat_inexact_result, isc_exception_float_inexact_result },
 	{ DEC_IEEE_754_Invalid_operation, isc_decfloat_invalid_operation, isc_exception_float_invalid_operand },
@@ -103,7 +103,7 @@ class DecimalContext : public decContext
 
 		decContextZeroStatus(this);
 
-		for (Dec2fb* e = dec2fb; e->decError; ++e)
+		for (const Dec2fb* e = dec2fb; e->decError; ++e)
 		{
 			// Arg::Gds(isc_arith_except) as first vector element ?
 			if (e->decError & unmaskedExceptions)
@@ -162,9 +162,9 @@ unsigned digits(const unsigned pMax, unsigned char* const coeff, int& exp)
 }
 
 // offsets down from MAX_SLONG
-const ULONG OFF_inf = 3;
-const ULONG OFF_snan = 2;
-const ULONG OFF_nan = 1;
+constexpr ULONG OFF_inf = 3;
+constexpr ULONG OFF_snan = 2;
+constexpr ULONG OFF_nan = 1;
 
 void make(ULONG* key,
 	const unsigned pMax, const int bias, const unsigned decSize,
@@ -426,10 +426,11 @@ void Decimal64::toString(DecimalStatus decSt, unsigned length, char* to) const
 		memset(s, 0, sizeof(s));
 		decDoubleToString(&dec, s);
 
-		if (strlen(s) > length)
+		const FB_SIZE_T sLen = fb_strlen(s);
+		if (sLen > length)
 			decContextSetStatus(&context, DEC_Invalid_operation);
 		else
-			length = strlen(s);
+			length = sLen;
 
 		memcpy(to, s, length + 1);
 	}
@@ -718,10 +719,11 @@ void Decimal128::toString(DecimalStatus decSt, unsigned length, char* to) const
 		memset(s, 0, sizeof(s));
 		decQuadToString(&dec, s);
 
-		if (strlen(s) > length)
+		const FB_SIZE_T sLen = fb_strlen(s);
+		if (sLen > length)
 			decContextSetStatus(&context, DEC_Invalid_operation);
 		else
-			length = strlen(s);
+			length = sLen;
 
 		memcpy(to, s, length + 1);
 	}

src/common/DecFloat.h

@@ -66,7 +66,7 @@ struct DecFloatConstant
 //#define FB_DECLOAT_CONST(x) { STRINGIZE(x), x }
 #define FB_DECLOAT_CONST(x) { #x, x }
 
-const DecFloatConstant FB_DEC_RoundModes[] = {
+inline constexpr DecFloatConstant FB_DEC_RoundModes[] = {
 	FB_DECLOAT_CONST(DEC_ROUND_CEILING),
 	FB_DECLOAT_CONST(DEC_ROUND_UP),
 	FB_DECLOAT_CONST(DEC_ROUND_HALF_UP),
@@ -80,9 +80,9 @@ const DecFloatConstant FB_DEC_RoundModes[] = {
 
 //DEC_ROUND_
 //0123456789
-const unsigned FB_DEC_RMODE_OFFSET = 10;
+inline constexpr unsigned FB_DEC_RMODE_OFFSET = 10;
 
-const DecFloatConstant FB_DEC_IeeeTraps[] = {
+inline constexpr DecFloatConstant FB_DEC_IeeeTraps[] = {
 	FB_DECLOAT_CONST(DEC_IEEE_754_Division_by_zero),
 	FB_DECLOAT_CONST(DEC_IEEE_754_Inexact),
 	FB_DECLOAT_CONST(DEC_IEEE_754_Invalid_operation),
@@ -93,18 +93,18 @@ const DecFloatConstant FB_DEC_IeeeTraps[] = {
 
 //DEC_IEEE_754_
 //0123456789012
-const unsigned FB_DEC_TRAPS_OFFSET = 13;
+inline constexpr unsigned FB_DEC_TRAPS_OFFSET = 13;
 
 #undef FB_DECLOAT_CONST
 
-static const USHORT FB_DEC_Errors =
+static inline constexpr USHORT FB_DEC_Errors =
 	DEC_IEEE_754_Division_by_zero |
 	DEC_IEEE_754_Invalid_operation |
 	DEC_IEEE_754_Overflow;
 
 struct DecimalStatus
 {
-	DecimalStatus(USHORT exc)
+	DecimalStatus(USHORT exc) noexcept
 		: decExtFlag(exc),
 		  roundingMode(DEC_ROUND_HALF_UP)
 	{}
@@ -127,18 +127,18 @@ struct NumericBinding
 		NUM_INT64
 	};
 
-	NumericBinding()
+	NumericBinding() noexcept
 		: bind(NUM_NATIVE),
 		  numScale(0)
 	{}
 
-	NumericBinding(Bind aBind, SCHAR aNumScale = 0)
+	NumericBinding(Bind aBind, SCHAR aNumScale = 0) noexcept
 		: bind(aBind),
 		  numScale(aNumScale)
 	{}
 
 	static const NumericBinding DEFAULT;
-	static const SCHAR MAX_SCALE = 18;
+	static inline constexpr SCHAR MAX_SCALE = 18;
 
 	Bind bind;
 	SCHAR numScale;
@@ -175,7 +175,7 @@ class Decimal64
 	bool isNan() const;
 	int sign() const;
 
-	static ULONG getKeyLength()
+	static constexpr ULONG getKeyLength() noexcept
 	{
 		return sizeof(Decimal64) + sizeof(ULONG);
 	}
@@ -251,15 +251,15 @@ class Decimal128
 	bool isNan() const;
 	int sign() const;
 
-	static ULONG getKeyLength()
+	static constexpr ULONG getKeyLength() noexcept
 	{
 		return sizeof(Decimal128) + sizeof(ULONG);
 	}
 
 	void makeKey(ULONG* key) const;
 	void grabKey(ULONG* key);
 
-	static ULONG getIndexKeyLength()
+	static constexpr ULONG getIndexKeyLength() noexcept
 	{
 		return 17;
 	}
@@ -313,8 +313,8 @@ class CDecimal128 : public Decimal128
 static_assert(sizeof(Decimal64) % sizeof(ULONG) == 0, "Decimal64 size mismatch");
 static_assert(sizeof(Decimal128) % sizeof(ULONG) == 0, "Decimal128 size mismatch");
 
-static const size_t MAX_DEC_LONGS = MAX(sizeof(Decimal64), sizeof(Decimal128)) >> SHIFTLONG;
-static const size_t MAX_DEC_KEY_LONGS = MAX_DEC_LONGS + 1; // key is one longword bigger
+static inline constexpr size_t MAX_DEC_LONGS = MAX(sizeof(Decimal64), sizeof(Decimal128)) >> SHIFTLONG;
+static inline constexpr size_t MAX_DEC_KEY_LONGS = MAX_DEC_LONGS + 1; // key is one longword bigger
 
 } // namespace Firebird