Extend number validation Decimal tests (#554)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

DEPENDENCIES

@@ -1,3 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core 00b48b7f00ca3b6684363077cde7722e6053eaa8
+core https://github.com/sourcemeta/core 10f0f36b678790354d3f67c73c686dfbd0e40231
 jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite Test-JSON-Schema-Acceptance-1.033

src/evaluator/evaluator_describe.cc

@@ -29,6 +29,13 @@ auto to_string(const sourcemeta::core::JSON::Type type) -> std::string {
   }
 }
 
+auto value_type_name(const sourcemeta::core::JSON &value) -> std::string {
+  if (value.type() == sourcemeta::core::JSON::Type::Decimal) {
+    return value.to_decimal().is_integer() ? "integer" : "number";
+  }
+  return to_string(value.type());
+}
+
 auto escape_string(const std::string &input) -> std::string {
   std::ostringstream result;
   result << '"';
@@ -1693,32 +1700,32 @@ auto describe(const bool valid, const Instruction &step,
   if (step.type == sourcemeta::blaze::InstructionIndex::AssertionGreaterEqual) {
     std::ostringstream message;
     const auto &value{instruction_value<ValueJSON>(step)};
-    message << "The " << to_string(target.type()) << " value ";
+    message << "The " << value_type_name(target) << " value ";
     stringify(target, message);
     message << " was expected to be greater than or equal to the "
-            << to_string(value.type()) << " ";
+            << value_type_name(value) << " ";
     stringify(value, message);
     return message.str();
   }
 
   if (step.type == sourcemeta::blaze::InstructionIndex::AssertionLessEqual) {
     std::ostringstream message;
     const auto &value{instruction_value<ValueJSON>(step)};
-    message << "The " << to_string(target.type()) << " value ";
+    message << "The " << value_type_name(target) << " value ";
     stringify(target, message);
     message << " was expected to be less than or equal to the "
-            << to_string(value.type()) << " ";
+            << value_type_name(value) << " ";
     stringify(value, message);
     return message.str();
   }
 
   if (step.type == sourcemeta::blaze::InstructionIndex::AssertionGreater) {
     std::ostringstream message;
     const auto &value{instruction_value<ValueJSON>(step)};
-    message << "The " << to_string(target.type()) << " value ";
+    message << "The " << value_type_name(target) << " value ";
     stringify(target, message);
-    message << " was expected to be greater than the "
-            << to_string(value.type()) << " ";
+    message << " was expected to be greater than the " << value_type_name(value)
+            << " ";
     stringify(value, message);
     if (!valid && value == target) {
       message << ", but they were equal";
@@ -1730,9 +1737,9 @@ auto describe(const bool valid, const Instruction &step,
   if (step.type == sourcemeta::blaze::InstructionIndex::AssertionLess) {
     std::ostringstream message;
     const auto &value{instruction_value<ValueJSON>(step)};
-    message << "The " << to_string(target.type()) << " value ";
+    message << "The " << value_type_name(target) << " value ";
     stringify(target, message);
-    message << " was expected to be less than the " << to_string(value.type())
+    message << " was expected to be less than the " << value_type_name(value)
             << " ";
     stringify(value, message);
     if (!valid && value == target) {
@@ -1786,10 +1793,10 @@ auto describe(const bool valid, const Instruction &step,
   if (step.type == sourcemeta::blaze::InstructionIndex::AssertionDivisible) {
     std::ostringstream message;
     const auto &value{instruction_value<ValueJSON>(step)};
-    message << "The " << to_string(target.type()) << " value ";
+    message << "The " << value_type_name(target) << " value ";
     stringify(target, message);
-    message << " was expected to be divisible by the "
-            << to_string(value.type()) << " ";
+    message << " was expected to be divisible by the " << value_type_name(value)
+            << " ";
     stringify(value, message);
     return message.str();
   }