Rename parse() to load() (#829)

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

src/runtime/CMakeLists.txt

@@ -3,9 +3,9 @@ noa_library(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime
   PRIVATE_HEADERS
     decoder.h decoder_basic.h
     encoder.h encoder_basic.h encoder_context.h
-    plan.h plan_wrap.h parser.h
+    plan.h plan_wrap.h loader.h
     varint.h
-  SOURCES runtime_parser.cc runtime_parser_v1.h)
+  SOURCES loader.cc loader_v1.h)
 
 if(JSONBINPACK_INSTALL)
   noa_library_install(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime)

src/runtime/include/sourcemeta/jsonbinpack/runtime.h

@@ -12,7 +12,7 @@
 
 #include <sourcemeta/jsonbinpack/runtime_decoder.h>
 #include <sourcemeta/jsonbinpack/runtime_encoder.h>
-#include <sourcemeta/jsonbinpack/runtime_parser.h>
+#include <sourcemeta/jsonbinpack/runtime_loader.h>
 #include <sourcemeta/jsonbinpack/runtime_plan.h>
 
 #endif

src/runtime/include/sourcemeta/jsonbinpack/runtime_parser.h → src/runtime/include/sourcemeta/jsonbinpack/runtime_loader.h

@@ -1,5 +1,5 @@
-#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_PARSER_H_
-#define SOURCEMETA_JSONBINPACK_RUNTIME_PARSER_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_LOADER_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_LOADER_H_
 
 #include "runtime_export.h"
 
@@ -8,10 +8,9 @@
 
 namespace sourcemeta::jsonbinpack {
 
-// TODO: Give this a better name
 /// @ingroup runtime
 SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
-auto parse(const sourcemeta::jsontoolkit::JSON &input) -> Plan;
+auto load(const sourcemeta::jsontoolkit::JSON &input) -> Plan;
 
 } // namespace sourcemeta::jsonbinpack
 

src/runtime/runtime_parser.cc → src/runtime/loader.cc

@@ -1,14 +1,14 @@
-#include <sourcemeta/jsonbinpack/runtime_parser.h>
+#include <sourcemeta/jsonbinpack/runtime_loader.h>
 
-#include "runtime_parser_v1.h"
+#include "loader_v1.h"
 
 #include <cassert>   // assert
 #include <sstream>   // std::ostringstream
 #include <stdexcept> // std::runtime_error
 
 namespace sourcemeta::jsonbinpack {
 
-auto parse(const sourcemeta::jsontoolkit::JSON &input) -> Plan {
+auto load(const sourcemeta::jsontoolkit::JSON &input) -> Plan {
   assert(input.defines("binpackEncoding"));
   assert(input.defines("binpackOptions"));
   const auto encoding{input.at("binpackEncoding").to_string()};

src/runtime/runtime_parser_v1.h → src/runtime/loader_v1.h

@@ -1,8 +1,7 @@
-#ifndef SOURCEMETA_JSONBINPACK_PARSER_V1_H_
-#define SOURCEMETA_JSONBINPACK_PARSER_V1_H_
+#ifndef SOURCEMETA_JSONBINPACK_LOADER_V1_H_
+#define SOURCEMETA_JSONBINPACK_LOADER_V1_H_
 
 #include <sourcemeta/jsonbinpack/runtime.h>
-#include <sourcemeta/jsonbinpack/runtime_parser.h>
 #include <sourcemeta/jsontoolkit/json.h>
 
 #include <algorithm> // std::transform
@@ -190,11 +189,11 @@ auto FIXED_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &options) -> Plan {
   std::transform(prefix_encodings.as_array().cbegin(),
                  prefix_encodings.as_array().cend(),
                  std::back_inserter(encodings),
-                 [](const auto &element) { return parse(element); });
+                 [](const auto &element) { return load(element); });
   assert(encodings.size() == prefix_encodings.size());
   return sourcemeta::jsonbinpack::FIXED_TYPED_ARRAY{
-      static_cast<std::uint64_t>(size.to_integer()),
-      wrap(parse(array_encoding)), wrap(encodings.begin(), encodings.end())};
+      static_cast<std::uint64_t>(size.to_integer()), wrap(load(array_encoding)),
+      wrap(encodings.begin(), encodings.end())};
 }
 
 auto BOUNDED_8BITS_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &options)
@@ -217,12 +216,12 @@ auto BOUNDED_8BITS_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &options)
   std::transform(prefix_encodings.as_array().cbegin(),
                  prefix_encodings.as_array().cend(),
                  std::back_inserter(encodings),
-                 [](const auto &element) { return parse(element); });
+                 [](const auto &element) { return load(element); });
   assert(encodings.size() == prefix_encodings.size());
   return sourcemeta::jsonbinpack::BOUNDED_8BITS_TYPED_ARRAY{
       static_cast<std::uint64_t>(minimum.to_integer()),
       static_cast<std::uint64_t>(maximum.to_integer()),
-      wrap(parse(array_encoding)), wrap(encodings.begin(), encodings.end())};
+      wrap(load(array_encoding)), wrap(encodings.begin(), encodings.end())};
 }
 
 auto FLOOR_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &options) -> Plan {
@@ -240,11 +239,11 @@ auto FLOOR_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &options) -> Plan {
   std::transform(prefix_encodings.as_array().cbegin(),
                  prefix_encodings.as_array().cend(),
                  std::back_inserter(encodings),
-                 [](const auto &element) { return parse(element); });
+                 [](const auto &element) { return load(element); });
   assert(encodings.size() == prefix_encodings.size());
   return sourcemeta::jsonbinpack::FLOOR_TYPED_ARRAY{
       static_cast<std::uint64_t>(minimum.to_integer()),
-      wrap(parse(array_encoding)), wrap(encodings.begin(), encodings.end())};
+      wrap(load(array_encoding)), wrap(encodings.begin(), encodings.end())};
 }
 
 auto ROOF_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &options) -> Plan {
@@ -262,11 +261,11 @@ auto ROOF_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &options) -> Plan {
   std::transform(prefix_encodings.as_array().cbegin(),
                  prefix_encodings.as_array().cend(),
                  std::back_inserter(encodings),
-                 [](const auto &element) { return parse(element); });
+                 [](const auto &element) { return load(element); });
   assert(encodings.size() == prefix_encodings.size());
   return sourcemeta::jsonbinpack::ROOF_TYPED_ARRAY{
       static_cast<std::uint64_t>(maximum.to_integer()),
-      wrap(parse(array_encoding)), wrap(encodings.begin(), encodings.end())};
+      wrap(load(array_encoding)), wrap(encodings.begin(), encodings.end())};
 }
 
 // Any

test/e2e/runner.cc

@@ -65,7 +65,7 @@ auto main(int argc, char *argv[]) -> int {
 
   // Encoder
   const sourcemeta::jsonbinpack::Plan plan{
-      sourcemeta::jsonbinpack::parse(schema)};
+      sourcemeta::jsonbinpack::load(schema)};
   std::ofstream output_stream(directory / "output.bin", std::ios::binary);
   output_stream.exceptions(std::ios_base::badbit);
   sourcemeta::jsonbinpack::Encoder encoder{output_stream};

test/packaging/find_package/hello.cc

@@ -21,7 +21,7 @@ auto main() -> int {
       "https://json-schema.org/draft/2020-12/schema");
 
   const sourcemeta::jsonbinpack::Plan plan{
-      sourcemeta::jsonbinpack::parse(schema)};
+      sourcemeta::jsonbinpack::load(schema)};
 
   const sourcemeta::jsontoolkit::JSON instance{5};
   sourcemeta::jsonbinpack::Encoder encoder{std::cout};

test/runtime/CMakeLists.txt

@@ -25,12 +25,12 @@ add_executable(sourcemeta_jsonbinpack_runtime_unit
   encode_varint_test.cc
   plan_traits_test.cc
   plan_wrap_test.cc
-  v1_any_parser_test.cc
-  v1_array_parser_test.cc
-  v1_enum_parser_test.cc
-  v1_integer_parser_test.cc
-  v1_number_parser_test.cc
-  v1_string_parser_test.cc)
+  v1_any_loader_test.cc
+  v1_array_loader_test.cc
+  v1_enum_loader_test.cc
+  v1_integer_loader_test.cc
+  v1_number_loader_test.cc
+  v1_string_loader_test.cc)
 
 noa_add_default_options(PRIVATE sourcemeta_jsonbinpack_runtime_unit)
 

test/runtime/v1_any_parser_test.cc → test/runtime/v1_any_loader_test.cc

@@ -5,7 +5,7 @@
 
 #include <variant>
 
-TEST(JSONBinPack_Parser_v1, ANY_PACKED_TYPE_TAG_BYTE_PREFIX) {
+TEST(JSONBinPack_Loader_v1, ANY_PACKED_TYPE_TAG_BYTE_PREFIX) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -14,7 +14,7 @@ TEST(JSONBinPack_Parser_v1, ANY_PACKED_TYPE_TAG_BYTE_PREFIX) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<ANY_PACKED_TYPE_TAG_BYTE_PREFIX>(result));
 }

test/runtime/v1_array_parser_test.cc → test/runtime/v1_array_loader_test.cc

@@ -5,7 +5,7 @@
 
 #include <variant>
 
-TEST(JSONBinPack_Parser_v1, FIXED_TYPED_ARRAY_enum_integer_number) {
+TEST(JSONBinPack_Loader_v1, FIXED_TYPED_ARRAY_enum_integer_number) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -34,7 +34,7 @@ TEST(JSONBinPack_Parser_v1, FIXED_TYPED_ARRAY_enum_integer_number) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<FIXED_TYPED_ARRAY>(result));
   EXPECT_EQ(std::get<FIXED_TYPED_ARRAY>(result).size, 3);
@@ -69,7 +69,7 @@ TEST(JSONBinPack_Parser_v1, FIXED_TYPED_ARRAY_enum_integer_number) {
       1);
 }
 
-TEST(JSONBinPack_Parser_v1, BOUNDED_8BITS_TYPED_ARRAY_enum_integer_number) {
+TEST(JSONBinPack_Loader_v1, BOUNDED_8BITS_TYPED_ARRAY_enum_integer_number) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -99,7 +99,7 @@ TEST(JSONBinPack_Parser_v1, BOUNDED_8BITS_TYPED_ARRAY_enum_integer_number) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<BOUNDED_8BITS_TYPED_ARRAY>(result));
   EXPECT_EQ(std::get<BOUNDED_8BITS_TYPED_ARRAY>(result).minimum, 1);
@@ -144,7 +144,7 @@ TEST(JSONBinPack_Parser_v1, BOUNDED_8BITS_TYPED_ARRAY_enum_integer_number) {
             1);
 }
 
-TEST(JSONBinPack_Parser_v1, FLOOR_TYPED_ARRAY_enum_integer_number) {
+TEST(JSONBinPack_Loader_v1, FLOOR_TYPED_ARRAY_enum_integer_number) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -173,7 +173,7 @@ TEST(JSONBinPack_Parser_v1, FLOOR_TYPED_ARRAY_enum_integer_number) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<FLOOR_TYPED_ARRAY>(result));
   EXPECT_EQ(std::get<FLOOR_TYPED_ARRAY>(result).minimum, 1);
@@ -208,7 +208,7 @@ TEST(JSONBinPack_Parser_v1, FLOOR_TYPED_ARRAY_enum_integer_number) {
       1);
 }
 
-TEST(JSONBinPack_Parser_v1, ROOF_TYPED_ARRAY_enum_integer_number) {
+TEST(JSONBinPack_Loader_v1, ROOF_TYPED_ARRAY_enum_integer_number) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -237,7 +237,7 @@ TEST(JSONBinPack_Parser_v1, ROOF_TYPED_ARRAY_enum_integer_number) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<ROOF_TYPED_ARRAY>(result));
   EXPECT_EQ(std::get<ROOF_TYPED_ARRAY>(result).maximum, 3);

test/runtime/v1_enum_parser_test.cc → test/runtime/v1_enum_loader_test.cc

@@ -5,7 +5,7 @@
 
 #include <variant>
 
-TEST(JSONBinPack_Parser_v1, BYTE_CHOICE_INDEX_scalars) {
+TEST(JSONBinPack_Loader_v1, BYTE_CHOICE_INDEX_scalars) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -16,7 +16,7 @@ TEST(JSONBinPack_Parser_v1, BYTE_CHOICE_INDEX_scalars) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<BYTE_CHOICE_INDEX>(result));
   EXPECT_EQ(std::get<BYTE_CHOICE_INDEX>(result).choices.size(), 3);
@@ -28,7 +28,7 @@ TEST(JSONBinPack_Parser_v1, BYTE_CHOICE_INDEX_scalars) {
             sourcemeta::jsontoolkit::JSON{3});
 }
 
-TEST(JSONBinPack_Parser_v1, LARGE_CHOICE_INDEX_scalars) {
+TEST(JSONBinPack_Loader_v1, LARGE_CHOICE_INDEX_scalars) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -39,7 +39,7 @@ TEST(JSONBinPack_Parser_v1, LARGE_CHOICE_INDEX_scalars) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<LARGE_CHOICE_INDEX>(result));
   EXPECT_EQ(std::get<LARGE_CHOICE_INDEX>(result).choices.size(), 3);
@@ -51,7 +51,7 @@ TEST(JSONBinPack_Parser_v1, LARGE_CHOICE_INDEX_scalars) {
             sourcemeta::jsontoolkit::JSON{3});
 }
 
-TEST(JSONBinPack_Parser_v1, TOP_LEVEL_BYTE_CHOICE_INDEX_scalars) {
+TEST(JSONBinPack_Loader_v1, TOP_LEVEL_BYTE_CHOICE_INDEX_scalars) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -62,7 +62,7 @@ TEST(JSONBinPack_Parser_v1, TOP_LEVEL_BYTE_CHOICE_INDEX_scalars) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<TOP_LEVEL_BYTE_CHOICE_INDEX>(result));
   EXPECT_EQ(std::get<TOP_LEVEL_BYTE_CHOICE_INDEX>(result).choices.size(), 3);
@@ -74,7 +74,7 @@ TEST(JSONBinPack_Parser_v1, TOP_LEVEL_BYTE_CHOICE_INDEX_scalars) {
             sourcemeta::jsontoolkit::JSON{3});
 }
 
-TEST(JSONBinPack_Parser_v1, CONST_NONE_scalar) {
+TEST(JSONBinPack_Loader_v1, CONST_NONE_scalar) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -85,7 +85,7 @@ TEST(JSONBinPack_Parser_v1, CONST_NONE_scalar) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<CONST_NONE>(result));
   EXPECT_EQ(std::get<CONST_NONE>(result).value,

test/runtime/v1_integer_parser_test.cc → test/runtime/v1_integer_loader_test.cc

@@ -5,7 +5,7 @@
 
 #include <variant>
 
-TEST(JSONBinPack_Parser_v1, BOUNDED_MULTIPLE_8BITS_ENUM_FIXED_positive) {
+TEST(JSONBinPack_Loader_v1, BOUNDED_MULTIPLE_8BITS_ENUM_FIXED_positive) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -18,7 +18,7 @@ TEST(JSONBinPack_Parser_v1, BOUNDED_MULTIPLE_8BITS_ENUM_FIXED_positive) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(
       std::holds_alternative<BOUNDED_MULTIPLE_8BITS_ENUM_FIXED>(result));
@@ -27,7 +27,7 @@ TEST(JSONBinPack_Parser_v1, BOUNDED_MULTIPLE_8BITS_ENUM_FIXED_positive) {
   EXPECT_EQ(std::get<BOUNDED_MULTIPLE_8BITS_ENUM_FIXED>(result).multiplier, 2);
 }
 
-TEST(JSONBinPack_Parser_v1, FLOOR_MULTIPLE_ENUM_VARINT_positive) {
+TEST(JSONBinPack_Loader_v1, FLOOR_MULTIPLE_ENUM_VARINT_positive) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -39,14 +39,14 @@ TEST(JSONBinPack_Parser_v1, FLOOR_MULTIPLE_ENUM_VARINT_positive) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<FLOOR_MULTIPLE_ENUM_VARINT>(result));
   EXPECT_EQ(std::get<FLOOR_MULTIPLE_ENUM_VARINT>(result).minimum, 0);
   EXPECT_EQ(std::get<FLOOR_MULTIPLE_ENUM_VARINT>(result).multiplier, 2);
 }
 
-TEST(JSONBinPack_Parser_v1, ROOF_MULTIPLE_MIRROR_ENUM_VARINT_positive) {
+TEST(JSONBinPack_Loader_v1, ROOF_MULTIPLE_MIRROR_ENUM_VARINT_positive) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -58,14 +58,14 @@ TEST(JSONBinPack_Parser_v1, ROOF_MULTIPLE_MIRROR_ENUM_VARINT_positive) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<ROOF_MULTIPLE_MIRROR_ENUM_VARINT>(result));
   EXPECT_EQ(std::get<ROOF_MULTIPLE_MIRROR_ENUM_VARINT>(result).maximum, 100);
   EXPECT_EQ(std::get<ROOF_MULTIPLE_MIRROR_ENUM_VARINT>(result).multiplier, 2);
 }
 
-TEST(JSONBinPack_Parser_v1, ARBITRARY_MULTIPLE_ZIGZAG_VARINT_unit_multiplier) {
+TEST(JSONBinPack_Loader_v1, ARBITRARY_MULTIPLE_ZIGZAG_VARINT_unit_multiplier) {
   const sourcemeta::jsontoolkit::JSON input =
       sourcemeta::jsontoolkit::parse(R"JSON({
     "$schema": "tag:sourcemeta.com,2024:jsonbinpack/encoding/v1",
@@ -76,7 +76,7 @@ TEST(JSONBinPack_Parser_v1, ARBITRARY_MULTIPLE_ZIGZAG_VARINT_unit_multiplier) {
   })JSON");
 
   const sourcemeta::jsonbinpack::Plan result{
-      sourcemeta::jsonbinpack::parse(input)};
+      sourcemeta::jsonbinpack::load(input)};
   using namespace sourcemeta::jsonbinpack;
   EXPECT_TRUE(std::holds_alternative<ARBITRARY_MULTIPLE_ZIGZAG_VARINT>(result));
   EXPECT_EQ(std::get<ARBITRARY_MULTIPLE_ZIGZAG_VARINT>(result).multiplier, 1);