Make use of new JSON Toolkit regex optimisations (#225)

Signed-off-by: Juan Cruz Viotti <[email protected]>

DEPENDENCIES

@@ -1,6 +1,6 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa caad2e1ceedf9fd1a18686a6a6d1e2b9757ead75
-jsontoolkit https://github.com/sourcemeta/jsontoolkit c8c1f6bb8530b0fe0aa83bdfccb8ccb8db5e54ea
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 796cda46a7c43312e36920f523e15f15de4ba2f4
 googletest https://github.com/google/googletest a7f443b80b105f940225332ed3c31f2790092f47
 googlebenchmark https://github.com/google/benchmark 378fe693a1ef51500db21b11ff05a8018c5f0e55
 jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite c2badb1298a8698f86dadf1aea7b44b3a894e5ac

src/compiler/compile_helpers.h

@@ -123,6 +123,7 @@ inline auto walk_subschemas(const Context &context,
       context.resolver, entry.dialect};
 }
 
+// TODO: Get rid of this given the new JSON Toolkit regex optimisations
 inline auto pattern_as_prefix(const std::string &pattern)
     -> std::optional<std::string> {
   static const std::regex starts_with_regex{R"(^\^([a-zA-Z0-9-_/]+)$)"};

src/compiler/default_compiler_draft4.h

@@ -17,7 +17,7 @@ static auto parse_regex(const std::string &pattern,
                         const sourcemeta::jsontoolkit::URI &base,
                         const sourcemeta::jsontoolkit::Pointer &schema_location)
     -> sourcemeta::jsontoolkit::Regex {
-  const auto result{sourcemeta::jsontoolkit::compile(pattern)};
+  const auto result{sourcemeta::jsontoolkit::to_regex(pattern)};
   if (!result.has_value()) {
     std::ostringstream message;
     message << "Invalid regular expression: " << pattern;

src/evaluator/dispatch.inc.h

@@ -183,7 +183,7 @@ switch (static_cast<InstructionIndex>(instruction.index())) {
 
   case IS_INSTRUCTION(AssertionRegex): {
     EVALUATE_BEGIN_IF_STRING(assertion, AssertionRegex);
-    result = validate(assertion.value.first, target);
+    result = matches(assertion.value.first, target);
     EVALUATE_END(assertion, AssertionRegex);
   }
 
@@ -846,7 +846,7 @@ switch (static_cast<InstructionIndex>(instruction.index())) {
       if (std::any_of(std::get<2>(loop.value).cbegin(),
                       std::get<2>(loop.value).cend(),
                       [&entry](const auto &pattern) {
-                        return validate(pattern.first, entry.first);
+                        return matches(pattern.first, entry.first);
                       })) {
         continue;
       }
@@ -985,7 +985,7 @@ switch (static_cast<InstructionIndex>(instruction.index())) {
     assert(!loop.children.empty());
     result = true;
     for (const auto &entry : target.as_object()) {
-      if (!validate(loop.value.first, entry.first)) {
+      if (!matches(loop.value.first, entry.first)) {
         continue;
       }
 
@@ -1016,7 +1016,7 @@ switch (static_cast<InstructionIndex>(instruction.index())) {
                               target.is_object());
     result = true;
     for (const auto &entry : target.as_object()) {
-      if (!validate(loop.value.first, entry.first)) {
+      if (!matches(loop.value.first, entry.first)) {
         result = false;
         break;
       }
@@ -1103,7 +1103,7 @@ switch (static_cast<InstructionIndex>(instruction.index())) {
       if (std::any_of(std::get<2>(loop.value).cbegin(),
                       std::get<2>(loop.value).cend(),
                       [&entry](const auto &pattern) {
-                        return validate(pattern.first, entry.first);
+                        return matches(pattern.first, entry.first);
                       })) {
         continue;
       }

test/compiler/compiler_json_test.cc

@@ -369,7 +369,7 @@ TEST(Compiler_json, regex_basic) {
 
   const Instructions steps{AssertionRegex{
       Pointer{}, Pointer{}, "#", 0,
-      ValueRegex{sourcemeta::jsontoolkit::compile("^a").value(), "^a"}}};
+      ValueRegex{sourcemeta::jsontoolkit::to_regex("^a").value(), "^a"}}};
 
   const JSON result{to_json({steps, {}})};
   const JSON expected{parse(R"EOF([