Merge pull request #5142 from RaiKoHoff/Dev_Master

Fix Tinyexpr: integer values always shown in abs() format
This commit is contained in:
Pairi Daiza 2024-03-07 06:04:27 +01:00 committed by GitHub
commit 9b6b32f8e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -683,10 +683,9 @@ static inline void ResetFileObservationData(const bool bResetEvt) {
void TinyExprToStringA(LPSTR pszDest, size_t cchDest, const double dExprEval)
{
double idbl = 0.0;
double const fracpart = fabs(modf(dExprEval, &idbl));
double const intpart = fabs(idbl);
if ((fracpart < TE_ZERO) && (intpart < 1.0E+21)) {
double intpart = 0.0;
double const fracpart = modf(dExprEval, &intpart);
if ((fabs(fracpart) < TE_ZERO) && (fabs(intpart) < 1.0E+21)) {
StringCchPrintfA(pszDest, cchDest, "%.21G", intpart); // integer full number display
}
else {
@ -697,10 +696,9 @@ void TinyExprToStringA(LPSTR pszDest, size_t cchDest, const double dExprEval)
void TinyExprToString(LPWSTR pszDest, size_t cchDest, const double dExprEval)
{
double idbl = 0.0;
double const fracpart = fabs(modf(dExprEval, &idbl));
double const intpart = fabs(idbl);
if ((fracpart < TE_ZERO) && (intpart < 1.0E+21)) {
double intpart = 0.0;
double const fracpart = modf(dExprEval, &intpart);
if ((fabs(fracpart) < TE_ZERO) && (fabs(intpart) < 1.0E+21)) {
StringCchPrintf(pszDest, cchDest, L"%.21G", intpart); // integer full number display
}
else {