Skip to content

Commit ed9e435

Browse files
committed
Use value_checkString() to check if string is int
1 parent 4ae88a2 commit ed9e435

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/scratch/value_functions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ extern "C"
270270
return v->doubleValue == intpart;
271271
}
272272
case ValueType::String:
273-
return v->stringValue->find('.') == std::string::npos;
273+
return value_checkString(*v->stringValue) == 1;
274274
}
275275

276276
return false;

test/scratch_classes/value_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ TEST(ValueTest, StdStringConstructor)
227227
ASSERT_FALSE(v.isNaN());
228228
ASSERT_FALSE(v.isNumber());
229229
ASSERT_FALSE(v.isValidNumber());
230-
ASSERT_TRUE(v.isInt());
230+
ASSERT_FALSE(v.isInt());
231231
ASSERT_FALSE(v.isBool());
232232
ASSERT_TRUE(v.isString());
233233
}
@@ -270,7 +270,7 @@ TEST(ValueTest, StdStringConstructor)
270270
ASSERT_FALSE(v.isNaN());
271271
ASSERT_FALSE(v.isNumber());
272272
ASSERT_FALSE(v.isValidNumber());
273-
ASSERT_TRUE(v.isInt());
273+
ASSERT_FALSE(v.isInt());
274274
ASSERT_FALSE(v.isBool());
275275
ASSERT_TRUE(v.isString());
276276
}
@@ -353,7 +353,7 @@ TEST(ValueTest, CStringConstructor)
353353
ASSERT_FALSE(v.isNaN());
354354
ASSERT_FALSE(v.isNumber());
355355
ASSERT_FALSE(v.isValidNumber());
356-
ASSERT_TRUE(v.isInt());
356+
ASSERT_FALSE(v.isInt());
357357
ASSERT_FALSE(v.isBool());
358358
ASSERT_TRUE(v.isString());
359359
}

0 commit comments

Comments
 (0)