Allow precompilation to happen on meta-schemas (#537)

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

Author: jviotti

src/compiler/compile.cc

@@ -225,13 +225,6 @@ auto compile(const sourcemeta::core::JSON &schema,
                       .precompile_static_references_maximum_schemas),
           sorted_precompile_references.end());
     }
-
-    // We do not apply this pre-compilation optimisation on meta-schemas
-    if (sourcemeta::core::schema_official_resolver(base).has_value() ||
-        (uses_dynamic_scopes && schema.is_object() &&
-         schema.defines("$vocabulary"))) {
-      sorted_precompile_references.clear();
-    }
   }
 
   assert(sorted_precompile_references.size() <=

src/compiler/include/sourcemeta/blaze/compiler.h

@@ -85,19 +85,19 @@ enum class Mode : std::uint8_t {
 /// Advanced knobs that you can tweak for higher control and optimisations
 struct Tweaks {
   /// Attempt to precompile static references to speed up compilation
-  const bool precompile_static_references{true};
+  bool precompile_static_references{true};
   /// Consider static references that are not circular when precompiling static
   /// references
-  const bool precompile_static_references_non_circular{false};
+  bool precompile_static_references_non_circular{false};
   /// The maximum amount of static references to precompile
-  const std::size_t precompile_static_references_maximum_schemas{10};
+  std::size_t precompile_static_references_maximum_schemas{10};
   /// The minimum amount of references to a destination before considering it
   /// for precompilation
-  const std::size_t precompile_static_references_minimum_reference_count{10};
+  std::size_t precompile_static_references_minimum_reference_count{10};
   /// Always unroll `properties` in a logical AND operation
-  const bool properties_always_unroll{false};
+  bool properties_always_unroll{false};
   /// Attempt to re-order `properties` subschemas to evaluate cheaper ones first
-  const bool properties_reorder{true};
+  bool properties_reorder{true};
 };
 
 /// @ingroup compiler

test/evaluator/evaluator_draft4_test.cc

@@ -14,7 +14,7 @@ TEST(Evaluator_draft4, metaschema_1) {
   EXPECT_TRUE(metaschema.has_value());
 
   const sourcemeta::core::JSON instance{sourcemeta::core::parse_json("{}")};
-  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), instance, 3);
+  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), instance, 4);
 }
 
 TEST(Evaluator_draft4, metaschema_2) {
@@ -31,22 +31,22 @@ TEST(Evaluator_draft4, metaschema_2) {
     }
   })JSON")};
 
-  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), instance, 16);
+  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), instance, 17);
 }
 
 TEST(Evaluator_draft4, metaschema_hyper_self) {
   const auto metaschema{sourcemeta::core::schema_official_resolver(
       "http://json-schema.org/draft-04/hyper-schema#")};
   EXPECT_TRUE(metaschema.has_value());
-  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), metaschema.value(), 741);
+  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), metaschema.value(), 787);
 }
 
 TEST(Evaluator_draft4, metaschema_hyper_self_exhaustive) {
   const auto metaschema{sourcemeta::core::schema_official_resolver(
       "http://json-schema.org/draft-04/hyper-schema#")};
   EXPECT_TRUE(metaschema.has_value());
   EVALUATE_WITH_TRACE_EXHAUSTIVE_SUCCESS(metaschema.value(), metaschema.value(),
-                                         957);
+                                         959);
 }
 
 TEST(Evaluator_draft4, unknown_keyword) {

test/evaluator/evaluator_draft6_test.cc

@@ -14,22 +14,22 @@ TEST(Evaluator_draft6, metaschema) {
   EXPECT_TRUE(metaschema.has_value());
 
   const sourcemeta::core::JSON instance{sourcemeta::core::parse_json("{}")};
-  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), instance, 2);
+  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), instance, 3);
 }
 
 TEST(Evaluator_draft6, metaschema_hyper_self) {
   const auto metaschema{sourcemeta::core::schema_official_resolver(
       "http://json-schema.org/draft-06/hyper-schema#")};
   EXPECT_TRUE(metaschema.has_value());
-  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), metaschema.value(), 842);
+  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), metaschema.value(), 894);
 }
 
 TEST(Evaluator_draft6, metaschema_hyper_self_exhaustive) {
   const auto metaschema{sourcemeta::core::schema_official_resolver(
       "http://json-schema.org/draft-06/hyper-schema#")};
   EXPECT_TRUE(metaschema.has_value());
   EVALUATE_WITH_TRACE_EXHAUSTIVE_SUCCESS(metaschema.value(), metaschema.value(),
-                                         1103);
+                                         1105);
 }
 
 TEST(Evaluator_draft6, unknown_keyword) {

test/evaluator/evaluator_draft7_test.cc

@@ -14,22 +14,22 @@ TEST(Evaluator_draft7, metaschema) {
   EXPECT_TRUE(metaschema.has_value());
 
   const sourcemeta::core::JSON instance{sourcemeta::core::parse_json("{}")};
-  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), instance, 2);
+  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), instance, 3);
 }
 
 TEST(Evaluator_draft7, metaschema_hyper_self) {
   const auto metaschema{sourcemeta::core::schema_official_resolver(
       "http://json-schema.org/draft-07/hyper-schema#")};
   EXPECT_TRUE(metaschema.has_value());
-  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), metaschema.value(), 441);
+  EVALUATE_WITH_TRACE_FAST_SUCCESS(metaschema.value(), metaschema.value(), 476);
 }
 
 TEST(Evaluator_draft7, metaschema_hyper_self_exhaustive) {
   const auto metaschema{sourcemeta::core::schema_official_resolver(
       "http://json-schema.org/draft-07/hyper-schema#")};
   EXPECT_TRUE(metaschema.has_value());
   EVALUATE_WITH_TRACE_EXHAUSTIVE_SUCCESS(metaschema.value(), metaschema.value(),
-                                         566);
+                                         568);
 }
 
 TEST(Evaluator_draft7, if_1) {