Remove the exhaustive step boolean flag

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Oct 11, 2024 · ff3997f · ff3997f
1 parent 5afe305
commit ff3997f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 541 deletions.
diff --git a/src/evaluator/include/sourcemeta/jsontoolkit/evaluator_template.h b/src/evaluator/include/sourcemeta/jsontoolkit/evaluator_template.h
@@ -181,9 +181,6 @@ enum class SchemaCompilerTemplateIndex : std::uint8_t {
 };
 #endif
 
-// TODO: Do we really need "dynamic", "report", and "exhaustive" on
-// non-applicators?
-
 #define DEFINE_STEP_WITH_VALUE(category, name, type)                           \
   struct SchemaCompiler##category##name {                                      \
     const Pointer relative_schema_location;                                    \
@@ -192,7 +189,6 @@ enum class SchemaCompilerTemplateIndex : std::uint8_t {
     const std::string schema_resource;                                         \
     const bool dynamic;                                                        \
     const bool report;                                                         \
-    const bool exhaustive;                                                     \
     const type value;                                                          \
   };
 
@@ -204,7 +200,6 @@ enum class SchemaCompilerTemplateIndex : std::uint8_t {
     const std::string schema_resource;                                         \
     const bool dynamic;                                                        \
     const bool report;                                                         \
-    const bool exhaustive;                                                     \
     const type value;                                                          \
     const SchemaCompilerTemplate children;                                     \
   };

diff --git a/src/jsonschema/compile_helpers.h b/src/jsonschema/compile_helpers.h
@@ -28,7 +28,6 @@ auto make(const bool report, const SchemaCompilerContext &context,
       schema_context.base.recompose(),
       context.uses_dynamic_scopes,
       report,
-      context.mode != SchemaCompilerMode::FastValidation,
       value};
 }
 
@@ -50,7 +49,6 @@ auto make(const bool report, const SchemaCompilerContext &context,
       schema_context.base.recompose(),
       context.uses_dynamic_scopes,
       report,
-      context.mode != SchemaCompilerMode::FastValidation,
       std::move(value),
       std::move(children)};
 }
@@ -71,7 +69,6 @@ auto unroll(const SchemaCompilerDynamicContext &dynamic_context,
           std::get<Type>(step).schema_resource,
           std::get<Type>(step).dynamic,
           std::get<Type>(step).report,
-          std::get<Type>(step).exhaustive,
           std::get<Type>(step).value};
 }
 

diff --git a/src/jsonschema/default_compiler_draft4.h b/src/jsonschema/default_compiler_draft4.h
@@ -524,8 +524,7 @@ auto compiler_draft4_applicator_properties_conditional_annotation(
           dynamic_context.base_instance_location.concat(
               type_step.relative_instance_location),
           type_step.keyword_location, type_step.schema_resource,
-          type_step.dynamic, type_step.report, type_step.exhaustive,
-          type_step.value});
+          type_step.dynamic, type_step.report, type_step.value});
     } else if (context.mode == SchemaCompilerMode::FastValidation &&
                substeps.size() == 1 &&
                std::holds_alternative<SchemaCompilerAssertionType>(
@@ -537,8 +536,7 @@ auto compiler_draft4_applicator_properties_conditional_annotation(
           dynamic_context.base_instance_location.concat(
               type_step.relative_instance_location),
           type_step.keyword_location, type_step.schema_resource,
-          type_step.dynamic, type_step.report, type_step.exhaustive,
-          type_step.value});
+          type_step.dynamic, type_step.report, type_step.value});
     } else if (context.mode == SchemaCompilerMode::FastValidation &&
                substeps.size() == 1 &&
                std::holds_alternative<

diff --git a/test/evaluator/CMakeLists.txt b/test/evaluator/CMakeLists.txt
@@ -5,7 +5,6 @@ add_executable(sourcemeta_jsontoolkit_evaluator_unit
   evaluator_draft4_test.cc
   evaluator_draft6_test.cc
   evaluator_draft7_test.cc
-  evaluator_evaluate_test.cc
   evaluator_test.cc)
 noa_add_default_options(PRIVATE sourcemeta_jsontoolkit_evaluator_unit)
 target_link_libraries(sourcemeta_jsontoolkit_evaluator_unit