Upgrade Core to 3a031c0e140bfbd562e5b169fcbe250d0ae9d660 (#477)

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

Author: jviotti

DEPENDENCIES

@@ -1,3 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
-core https://github.com/sourcemeta/core 64cd14e9dc99f76ca686adcdc75b8a5f97808694
+core https://github.com/sourcemeta/core 3a031c0e140bfbd562e5b169fcbe250d0ae9d660
 jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite 48461fc3568972801b40eaccc428a31bce338f6e

cmake/FindCore.cmake

@@ -5,7 +5,14 @@ if(NOT Core_FOUND)
     set(SOURCEMETA_CORE_INSTALL OFF CACHE BOOL "disable installation")
   endif()
 
-  set(SOURCEMETA_CORE_YAML OFF CACHE BOOL "disable YAML support")
+  set(SOURCEMETA_CORE_TIME OFF CACHE BOOL "disable")
+  set(SOURCEMETA_CORE_UUID OFF CACHE BOOL "disable")
+  set(SOURCEMETA_CORE_GZIP OFF CACHE BOOL "disable")
+  set(SOURCEMETA_CORE_MD5 OFF CACHE BOOL "disable")
+  set(SOURCEMETA_CORE_YAML OFF CACHE BOOL "disable")
+  set(SOURCEMETA_CORE_CONTRIB_ZLIB OFF CACHE BOOL "disable")
+  set(SOURCEMETA_CORE_CONTRIB_BEARSSL OFF CACHE BOOL "disable")
+
   set(SOURCEMETA_CORE_CONTRIB_GOOGLETEST ${BLAZE_TESTS} CACHE BOOL "GoogleTest")
   set(SOURCEMETA_CORE_CONTRIB_GOOGLEBENCHMARK ${BLAZE_BENCHMARK} CACHE BOOL "GoogleBenchmark")
   add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/core")

src/compiler/compile_output_standard.cc

@@ -25,14 +25,13 @@ auto standard(Evaluator &evaluator, const Template &schema,
       auto annotations{sourcemeta::core::JSON::make_array()};
       for (const auto &annotation : output.annotations()) {
         auto unit{sourcemeta::core::JSON::make_object()};
-        unit.assign(
-            "keywordLocation",
-            sourcemeta::core::to_json(annotation.first.evaluate_path).value());
+        unit.assign("keywordLocation",
+                    sourcemeta::core::to_json(annotation.first.evaluate_path));
         unit.assign("absoluteKeywordLocation",
                     sourcemeta::core::JSON{annotation.first.schema_location});
-        unit.assign("instanceLocation", sourcemeta::core::to_json(
-                                            annotation.first.instance_location)
-                                            .value());
+        unit.assign(
+            "instanceLocation",
+            sourcemeta::core::to_json(annotation.first.instance_location));
         unit.assign("annotation", sourcemeta::core::to_json(annotation.second));
         annotations.push_back(std::move(unit));
       }
@@ -49,11 +48,11 @@ auto standard(Evaluator &evaluator, const Template &schema,
       for (const auto &entry : output) {
         auto unit{sourcemeta::core::JSON::make_object()};
         unit.assign("keywordLocation",
-                    sourcemeta::core::to_json(entry.evaluate_path).value());
+                    sourcemeta::core::to_json(entry.evaluate_path));
         unit.assign("absoluteKeywordLocation",
                     sourcemeta::core::JSON{entry.schema_location});
         unit.assign("instanceLocation",
-                    sourcemeta::core::to_json(entry.instance_location).value());
+                    sourcemeta::core::to_json(entry.instance_location));
         unit.assign("error", sourcemeta::core::JSON{entry.message});
         errors.push_back(std::move(unit));
       }