From 01506e8b717b6a9f33b5931d8888d17487111a1d Mon Sep 17 00:00:00 2001 From: asoffer Date: Sun, 18 Feb 2024 16:26:17 -0500 Subject: [PATCH] Update Jasmin for changes to nth serialization. --- MODULE.bazel | 2 +- examples/BUILD | 4 ++-- examples/serialization.cc | 4 ++-- jasmin/core/BUILD | 4 ++-- jasmin/core/serialization_test.cc | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 58b3ffc..81af7d8 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,3 +1,3 @@ bazel_dep(name = "abseil-cpp", repo_name = "com_google_absl", version = "20230125.1") bazel_dep(name = "bazel_skylib", repo_name = "bazel_skylib", version = "1.4.2") -bazel_dep(name = "nth-cc", repo_name = "nth_cc", version = "20240207.00") +bazel_dep(name = "nth-cc", repo_name = "nth_cc", version = "20240218.00") diff --git a/examples/BUILD b/examples/BUILD index a090ce3..c5dfcde 100644 --- a/examples/BUILD +++ b/examples/BUILD @@ -62,8 +62,8 @@ cc_binary( "@nth_cc//nth/debug/log:stderr_log_sink", "@nth_cc//nth/io/serialize", "@nth_cc//nth/io/serialize:deserialize", - "@nth_cc//nth/io/serialize:string_reader", - "@nth_cc//nth/io/serialize:string_writer", + "@nth_cc//nth/io/reader:string", + "@nth_cc//nth/io/writer:string", "@com_google_absl//absl/container:flat_hash_set", ], ) diff --git a/examples/serialization.cc b/examples/serialization.cc index 2894025..f6109f5 100644 --- a/examples/serialization.cc +++ b/examples/serialization.cc @@ -11,10 +11,10 @@ #include "nth/container/interval.h" #include "nth/debug/debug.h" #include "nth/debug/log/stderr_log_sink.h" +#include "nth/io/reader/string.h" #include "nth/io/serialize/deserialize.h" #include "nth/io/serialize/serialize.h" -#include "nth/io/serialize/string_reader.h" -#include "nth/io/serialize/string_writer.h" +#include "nth/io/writer/string.h" using Instructions = jasmin::MakeInstructionSet< jasmin::Duplicate, jasmin::Swap, jasmin::Push, diff --git a/jasmin/core/BUILD b/jasmin/core/BUILD index 438d2a9..1f14310 100644 --- a/jasmin/core/BUILD +++ b/jasmin/core/BUILD @@ -178,8 +178,8 @@ cc_test( deps = [ ":serialization", "//jasmin/instructions:common", - "@nth_cc//nth/io/serialize:string_reader", - "@nth_cc//nth/io/serialize:string_writer", + "@nth_cc//nth/io/reader:string", + "@nth_cc//nth/io/writer:string", "@nth_cc//nth/test:main", ], ) diff --git a/jasmin/core/serialization_test.cc b/jasmin/core/serialization_test.cc index d8f67d6..89e978d 100644 --- a/jasmin/core/serialization_test.cc +++ b/jasmin/core/serialization_test.cc @@ -2,10 +2,10 @@ #include "jasmin/core/program_fragment.h" #include "jasmin/instructions/common.h" -#include "nth/io/serialize/reader.h" -#include "nth/io/serialize/string_reader.h" -#include "nth/io/serialize/string_writer.h" -#include "nth/io/serialize/writer.h" +#include "nth/io/reader/reader.h" +#include "nth/io/reader/string.h" +#include "nth/io/writer/string.h" +#include "nth/io/writer/writer.h" #include "nth/test/test.h" namespace jasmin {