Upgrade Core to 38d686c3e828da4748d4b58bb522bf91e5a0e8b5 (#894)

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

Author: jviotti

DEPENDENCIES

@@ -1,3 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core 1f23fc7df56f41ceb140719bbcf94ee6f4d6f066
+core https://github.com/sourcemeta/core 38d686c3e828da4748d4b58bb522bf91e5a0e8b5
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

src/runtime/encoder_any.cc

@@ -81,7 +81,7 @@ auto Encoder::ANY_PACKED_TYPE_TAG_BYTE_PREFIX(
                                                      : SUBTYPE_FALSE};
     this->put_byte(TYPE_OTHER |
                    static_cast<std::uint8_t>(subtype << type_size));
-  } else if (document.is_integer_real()) {
+  } else if (document.is_real() && document.is_integral()) {
     const auto value{document.as_integer()};
     if (value >= 0 && is_byte(value)) {
       this->put_byte(TYPE_OTHER | SUBTYPE_POSITIVE_REAL_INTEGER_BYTE

test/e2e/runner.cc

@@ -41,8 +41,11 @@ auto main(int argc, char *argv[]) -> int {
   std::ofstream canonical_output_stream(directory / "canonical.json",
                                         std::ios::binary);
   canonical_output_stream.exceptions(std::ios_base::badbit);
-  sourcemeta::core::prettify(schema, canonical_output_stream,
-                             sourcemeta::core::schema_format_compare);
+
+  sourcemeta::core::format(schema, sourcemeta::core::schema_official_walker,
+                           sourcemeta::core::schema_official_resolver,
+                           "https://json-schema.org/draft/2020-12/schema");
+  sourcemeta::core::prettify(schema, canonical_output_stream);
   canonical_output_stream << "\n";
   canonical_output_stream.flush();
   canonical_output_stream.close();
@@ -55,8 +58,7 @@ auto main(int argc, char *argv[]) -> int {
   std::ofstream encoding_output_stream(directory / "encoding.json",
                                        std::ios::binary);
   encoding_output_stream.exceptions(std::ios_base::badbit);
-  sourcemeta::core::prettify(schema, encoding_output_stream,
-                             sourcemeta::core::schema_format_compare);
+  sourcemeta::core::prettify(schema, encoding_output_stream);
   encoding_output_stream << "\n";
   encoding_output_stream.flush();
   encoding_output_stream.close();

test/runtime/decode_any_test.cc

@@ -268,10 +268,10 @@ TEST(JSONBinPack_Decoder, ANY_PACKED_TYPE_TAG_BYTE_PREFIX__real_3_0) {
   Decoder decoder{stream};
   const auto result = decoder.ANY_PACKED_TYPE_TAG_BYTE_PREFIX({});
   EXPECT_TRUE(result.is_real());
-  EXPECT_TRUE(result.is_integer_real());
+  EXPECT_TRUE(result.is_integral());
   const sourcemeta::core::JSON expected{3.0};
   EXPECT_TRUE(expected.is_real());
-  EXPECT_TRUE(expected.is_integer_real());
+  EXPECT_TRUE(expected.is_integral());
   EXPECT_EQ(result, expected);
 }
 
@@ -281,10 +281,10 @@ TEST(JSONBinPack_Decoder, ANY_PACKED_TYPE_TAG_BYTE_PREFIX__real_103_0) {
   Decoder decoder{stream};
   const auto result = decoder.ANY_PACKED_TYPE_TAG_BYTE_PREFIX({});
   EXPECT_TRUE(result.is_real());
-  EXPECT_TRUE(result.is_integer_real());
+  EXPECT_TRUE(result.is_integral());
   const sourcemeta::core::JSON expected{103.0};
   EXPECT_TRUE(expected.is_real());
-  EXPECT_TRUE(expected.is_integer_real());
+  EXPECT_TRUE(expected.is_integral());
   EXPECT_EQ(result, expected);
 }