From cd5ca284e1b0a4e1bd3d1bb62888c880cbdffcfe Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Sun, 2 Jun 2024 15:37:04 +0300 Subject: [PATCH] Change IsDouble method: return true if value has integer type --- DesktopEditor/doctrenderer/json/json_values.cpp | 2 +- DesktopEditor/doctrenderer/test/json/main.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DesktopEditor/doctrenderer/json/json_values.cpp b/DesktopEditor/doctrenderer/json/json_values.cpp index 049ef75531..3b745cbbb8 100644 --- a/DesktopEditor/doctrenderer/json/json_values.cpp +++ b/DesktopEditor/doctrenderer/json/json_values.cpp @@ -65,7 +65,7 @@ namespace NSJSON bool CPrimitive::isDouble() const { - return m_type == ptDouble; + return m_type == ptDouble || m_type == ptInteger; } bool CPrimitive::isStringA() const diff --git a/DesktopEditor/doctrenderer/test/json/main.cpp b/DesktopEditor/doctrenderer/test/json/main.cpp index 021e7341d9..be3ada4908 100644 --- a/DesktopEditor/doctrenderer/test/json/main.cpp +++ b/DesktopEditor/doctrenderer/test/json/main.cpp @@ -247,7 +247,8 @@ TEST_F(CJSONTest, bool_) TEST_F(CJSONTest, int_) { CValue val = 42; - EXPECT_FALSE(val.IsDouble()); + EXPECT_TRUE(val.IsDouble()); + EXPECT_TRUE(val.IsInt()); JSSmart jsVal = CJSContext::createInt(42); EXPECT_TRUE(compare(val, jsVal)); val = 100;