Upgrade Core to 3ea3a54756071232ca017b96bc15f17d8b5be370 (#911)

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

Author: jviotti

CMakeLists.txt

@@ -8,7 +8,6 @@ both schema-driven and schema-less support."
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 # Options
-option(JSONBINPACK_NUMERIC "Build the JSON BinPack numeric library" ON)
 option(JSONBINPACK_RUNTIME "Build the JSON BinPack runtime" ON)
 option(JSONBINPACK_COMPILER "Build the JSON BinPack compiler" ON)
 option(JSONBINPACK_TESTS "Build the JSON BinPack tests" OFF)
@@ -37,11 +36,6 @@ if(JSONBINPACK_INSTALL)
     COMPONENT sourcemeta_jsonbinpack_dev)
 endif()
 
-# Numeric
-if(JSONBINPACK_NUMERIC)
-  add_subdirectory(src/numeric)
-endif()
-
 # Runtime
 if(JSONBINPACK_RUNTIME)
   add_subdirectory(src/runtime)
@@ -73,10 +67,6 @@ endif()
 if(JSONBINPACK_TESTS)
   enable_testing()
 
-  if(JSONBINPACK_NUMERIC)
-    add_subdirectory(test/numeric)
-  endif()
-
   if(JSONBINPACK_RUNTIME)
     add_subdirectory(test/runtime)
   endif()

DEPENDENCIES

@@ -1,4 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core efaed8a73fa1ba38f0c2fdcbd11d0b3223c5a70e
+core https://github.com/sourcemeta/core 3ea3a54756071232ca017b96bc15f17d8b5be370
 blaze https://github.com/sourcemeta/blaze 0ff98cb5e537f571bdf04f0d59a031a0d8634e07
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

config.cmake.in

@@ -4,23 +4,18 @@
 list(APPEND JSONBINPACK_COMPONENTS ${JSONBinPack_FIND_COMPONENTS})
 list(APPEND JSONBINPACK_COMPONENTS ${jsonbinpack_FIND_COMPONENTS})
 if(NOT JSONBINPACK_COMPONENTS)
-  list(APPEND JSONBINPACK_COMPONENTS numeric)
   list(APPEND JSONBINPACK_COMPONENTS runtime)
   list(APPEND JSONBINPACK_COMPONENTS compiler)
 endif()
 
 include(CMakeFindDependencyMacro)
-find_dependency(Core COMPONENTS regex uri json jsonpointer jsonschema)
+find_dependency(Core COMPONENTS numeric regex uri json jsonpointer jsonschema)
 find_dependency(Blaze COMPONENTS alterschema)
 
 foreach(component ${JSONBINPACK_COMPONENTS})
-  if(component STREQUAL "numeric")
-    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_jsonbinpack_numeric.cmake")
-  elseif(component STREQUAL "runtime")
-    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_jsonbinpack_numeric.cmake")
+  if(component STREQUAL "runtime")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_jsonbinpack_runtime.cmake")
   elseif(component STREQUAL "compiler")
-    include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_jsonbinpack_numeric.cmake")
     include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_jsonbinpack_compiler.cmake")
   else()
     message(FATAL_ERROR "Unknown JSON BinPack component: ${component}")

src/compiler/CMakeLists.txt

@@ -23,7 +23,7 @@ if(JSONBINPACK_INSTALL)
 endif()
 
 target_link_libraries(sourcemeta_jsonbinpack_compiler PRIVATE
-  sourcemeta::jsonbinpack::numeric)
+  sourcemeta::core::numeric)
 target_link_libraries(sourcemeta_jsonbinpack_compiler PUBLIC
   sourcemeta::core::json)
 target_link_libraries(sourcemeta_jsonbinpack_compiler PRIVATE

src/compiler/compiler.cc

@@ -1,5 +1,6 @@
 #include <sourcemeta/jsonbinpack/compiler.h>
-#include <sourcemeta/jsonbinpack/numeric.h>
+
+#include <sourcemeta/core/numeric.h>
 
 #include <sourcemeta/blaze/alterschema.h>
 #include <sourcemeta/core/jsonpointer.h>

src/compiler/mapper/enum_8_bit.h

@@ -20,7 +20,7 @@ class Enum8Bit final : public sourcemeta::blaze::SchemaTransformRule {
            schema.is_object() && schema.defines("enum") &&
            schema.at("enum").is_array() && !location.pointer.empty() &&
            schema.at("enum").size() > 1 &&
-           is_byte(schema.at("enum").size() - 1);
+           sourcemeta::core::is_byte(schema.at("enum").size() - 1);
   }
 
   auto transform(sourcemeta::core::JSON &schema,

src/compiler/mapper/enum_8_bit_top_level.h

@@ -20,7 +20,7 @@ class Enum8BitTopLevel final : public sourcemeta::blaze::SchemaTransformRule {
            schema.is_object() && schema.defines("enum") &&
            schema.at("enum").is_array() && location.pointer.empty() &&
            schema.at("enum").size() > 1 &&
-           is_byte(schema.at("enum").size() - 1);
+           sourcemeta::core::is_byte(schema.at("enum").size() - 1);
   }
 
   auto transform(sourcemeta::core::JSON &schema,

src/compiler/mapper/enum_arbitrary.h

@@ -21,7 +21,7 @@ class EnumArbitrary final : public sourcemeta::blaze::SchemaTransformRule {
            schema.is_object() && schema.defines("enum") &&
            schema.at("enum").is_array() && !location.pointer.empty() &&
            schema.at("enum").size() > 1 &&
-           !is_byte(schema.at("enum").size() - 1);
+           !sourcemeta::core::is_byte(schema.at("enum").size() - 1);
   }
 
   auto transform(sourcemeta::core::JSON &schema,

src/compiler/mapper/integer_bounded_8_bit.h

@@ -20,8 +20,8 @@ class IntegerBounded8Bit final : public sourcemeta::blaze::SchemaTransformRule {
            schema.is_object() && schema.defines("type") &&
            schema.at("type").to_string() == "integer" &&
            schema.defines("minimum") && schema.defines("maximum") &&
-           is_byte(schema.at("maximum").to_integer() -
-                   schema.at("minimum").to_integer()) &&
+           sourcemeta::core::is_byte(schema.at("maximum").to_integer() -
+                                     schema.at("minimum").to_integer()) &&
            !schema.defines("multipleOf");
   }
 

src/compiler/mapper/integer_bounded_greater_than_8_bit.h

@@ -22,8 +22,8 @@ class IntegerBoundedGreaterThan8Bit final
            schema.is_object() && schema.defines("type") &&
            schema.at("type").to_string() == "integer" &&
            schema.defines("minimum") && schema.defines("maximum") &&
-           !is_byte(schema.at("maximum").to_integer() -
-                    schema.at("minimum").to_integer()) &&
+           !sourcemeta::core::is_byte(schema.at("maximum").to_integer() -
+                                      schema.at("minimum").to_integer()) &&
            !schema.defines("multipleOf");
   }