Add proper Draft 3 type trace tests (#782)

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

Author: jviotti

CMakeLists.txt

@@ -104,6 +104,7 @@ if(PROJECT_IS_TOP_LEVEL)
     add_custom_target(blaze_format_trace_json
       COMMAND "${Python3_EXECUTABLE}"
         "${PROJECT_SOURCE_DIR}/contrib/format_trace_json.py"
+        "${PROJECT_SOURCE_DIR}/test/evaluator/evaluator_draft3.json"
         "${PROJECT_SOURCE_DIR}/test/evaluator/evaluator_draft4.json"
         "${PROJECT_SOURCE_DIR}/test/evaluator/evaluator_draft6.json"
         "${PROJECT_SOURCE_DIR}/test/evaluator/evaluator_draft7.json"

src/compiler/default_compiler_draft3.h

@@ -389,6 +389,28 @@ auto properties_as_loop(const Context &context,
        }));
 }
 
+auto draft3_any_type_instructions(const Context &context,
+                                  const SchemaContext &schema_context,
+                                  const DynamicContext &dynamic_context)
+    -> Instructions {
+  if (context.mode != Mode::Exhaustive) {
+    return {};
+  }
+
+  using sourcemeta::core::JSON;
+  ValueTypes types{};
+  types.set(std::to_underlying(JSON::Type::Null));
+  types.set(std::to_underlying(JSON::Type::Boolean));
+  types.set(std::to_underlying(JSON::Type::Object));
+  types.set(std::to_underlying(JSON::Type::Array));
+  types.set(std::to_underlying(JSON::Type::Integer));
+  types.set(std::to_underlying(JSON::Type::Real));
+  types.set(std::to_underlying(JSON::Type::Decimal));
+  types.set(std::to_underlying(JSON::Type::String));
+  return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrictAny,
+               context, schema_context, dynamic_context, types)};
+}
+
 auto draft3_set_type_bits(const std::string &name, ValueTypes &types) -> bool {
   using sourcemeta::core::JSON;
   if (name == "null") {
@@ -1857,21 +1879,29 @@ auto compiler_draft3_validation_type(const Context &context,
 
   if (is_draft3) {
     if (value.is_string() && value.to_string() == "any") {
-      return {};
+      return draft3_any_type_instructions(context, schema_context,
+                                          dynamic_context);
     }
 
     if (value.is_array()) {
       bool has_object{false};
       for (const auto &element : value.as_array()) {
         if (element.is_string() && element.to_string() == "any") {
-          return {};
+          return draft3_any_type_instructions(context, schema_context,
+                                              dynamic_context);
         }
         if (element.is_object()) {
           has_object = true;
         }
       }
 
       if (has_object) {
+        if (context.mode == Mode::FastValidation && value.size() == 1) {
+          return compile(
+              context, schema_context, dynamic_context,
+              {static_cast<sourcemeta::core::Pointer::Token::Index>(0)});
+        }
+
         Instructions disjunctors;
         for (std::uint64_t index = 0; index < value.size(); index++) {
           const auto &element{value.at(index)};
@@ -2167,7 +2197,11 @@ auto compiler_draft3_validation_type(const Context &context,
       }
     }
 
-    assert(types.any());
+    if (!types.any()) {
+      return {make(sourcemeta::blaze::InstructionIndex::AssertionFail, context,
+                   schema_context, dynamic_context, ValueNone{})};
+    }
+
     return {make(sourcemeta::blaze::InstructionIndex::AssertionTypeStrictAny,
                  context, schema_context, dynamic_context, types)};
   }

test/evaluator/CMakeLists.txt

@@ -4,6 +4,7 @@ sourcemeta_googletest(NAMESPACE sourcemeta PROJECT blaze NAME evaluator
     evaluator_utils.h
     evaluator_2019_09_test.cc
     evaluator_2020_12_test.cc
+    evaluator_draft3_test.cc
     evaluator_draft4_test.cc
     evaluator_draft6_test.cc
     evaluator_draft7_test.cc