Skip to content

Commit 3dc921a

Browse files
jviottijviotti
authored
Rename Plan to Encoding (#842)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 59258d2 commit 3dc921a

34 files changed

+140
-163
lines changed

‎src/runtime/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
noa_library(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime
22
FOLDER "JSON BinPack/Runtime"
33
PRIVATE_HEADERS
4-
decoder.h encoder.h
4+
decoder.h
5+
encoder.h
56
input_stream.h
67
output_stream.h
78
encoder_context.h
8-
plan.h plan_wrap.h
9+
encoding.h
10+
encoding_wrap.h
911
SOURCES
1012
input_stream.cc
1113
output_stream.cc

‎src/runtime/decoder_any.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <sourcemeta/jsonbinpack/numeric.h>
22
#include <sourcemeta/jsonbinpack/runtime_decoder.h>
33

4-
#include <sourcemeta/jsonbinpack/runtime_plan_wrap.h>
4+
#include <sourcemeta/jsonbinpack/runtime_encoding_wrap.h>
55

66
#include "unreachable.h"
77

‎src/runtime/decoder_array.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ auto Decoder::FIXED_TYPED_ARRAY(const struct FIXED_TYPED_ARRAY &options)
1313
sourcemeta::jsontoolkit::JSON result =
1414
sourcemeta::jsontoolkit::JSON::make_array();
1515
for (std::size_t index = 0; index < options.size; index++) {
16-
const Plan &encoding{prefix_encodings > index
17-
? options.prefix_encodings[index].value
18-
: options.encoding->value};
16+
const Encoding &encoding{prefix_encodings > index
17+
? options.prefix_encodings[index].value
18+
: options.encoding->value};
1919
result.push_back(this->read(encoding));
2020
}
2121

‎src/runtime/decoder_common.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace sourcemeta::jsonbinpack {
99

1010
Decoder::Decoder(Stream &input) : InputStream{input} {}
1111

12-
auto Decoder::read(const Plan &encoding) -> sourcemeta::jsontoolkit::JSON {
12+
auto Decoder::read(const Encoding &encoding) -> sourcemeta::jsontoolkit::JSON {
1313
switch (encoding.index()) {
1414
#define HANDLE_DECODING(index, name) \
1515
case (index): \

‎src/runtime/encoder_any.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <sourcemeta/jsonbinpack/numeric.h>
22
#include <sourcemeta/jsonbinpack/runtime_encoder.h>
3-
#include <sourcemeta/jsonbinpack/runtime_plan_wrap.h>
3+
#include <sourcemeta/jsonbinpack/runtime_encoding_wrap.h>
44

55
#include "unreachable.h"
66

@@ -159,7 +159,8 @@ auto Encoder::ANY_PACKED_TYPE_TAG_BYTE_PREFIX(
159159
static_cast<std::uint8_t>(TYPE_ARRAY | ((size + 1) << type_size)));
160160
}
161161

162-
Plan encoding{sourcemeta::jsonbinpack::ANY_PACKED_TYPE_TAG_BYTE_PREFIX{}};
162+
Encoding encoding{
163+
sourcemeta::jsonbinpack::ANY_PACKED_TYPE_TAG_BYTE_PREFIX{}};
163164
this->FIXED_TYPED_ARRAY(document, {size, wrap(std::move(encoding)), {}});
164165
} else if (document.is_object()) {
165166
const auto size{document.size()};
@@ -171,9 +172,9 @@ auto Encoder::ANY_PACKED_TYPE_TAG_BYTE_PREFIX(
171172
static_cast<std::uint8_t>(TYPE_OBJECT | ((size + 1) << type_size)));
172173
}
173174

174-
Plan key_encoding{
175+
Encoding key_encoding{
175176
sourcemeta::jsonbinpack::PREFIX_VARINT_LENGTH_STRING_SHARED{}};
176-
Plan value_encoding{
177+
Encoding value_encoding{
177178
sourcemeta::jsonbinpack::ANY_PACKED_TYPE_TAG_BYTE_PREFIX{}};
178179
this->FIXED_TYPED_ARBITRARY_OBJECT(
179180
document,

‎src/runtime/encoder_array.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ auto Encoder::FIXED_TYPED_ARRAY(const sourcemeta::jsontoolkit::JSON &document,
1515
const auto prefix_encodings{options.prefix_encodings.size()};
1616
assert(prefix_encodings <= document.size());
1717
for (std::size_t index = 0; index < options.size; index++) {
18-
const Plan &encoding{prefix_encodings > index
19-
? options.prefix_encodings[index].value
20-
: options.encoding->value};
18+
const Encoding &encoding{prefix_encodings > index
19+
? options.prefix_encodings[index].value
20+
: options.encoding->value};
2121
this->write(document.at(index), encoding);
2222
}
2323
}

‎src/runtime/encoder_common.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace sourcemeta::jsonbinpack {
1010
Encoder::Encoder(Stream &output) : OutputStream{output} {}
1111

1212
auto Encoder::write(const sourcemeta::jsontoolkit::JSON &document,
13-
const Plan &encoding) -> void {
13+
const Encoding &encoding) -> void {
1414
switch (encoding.index()) {
1515
#define HANDLE_ENCODING(index, name) \
1616
case (index): \

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
#include <sourcemeta/jsonbinpack/runtime_decoder.h>
1818
#include <sourcemeta/jsonbinpack/runtime_encoder.h>
19-
#include <sourcemeta/jsonbinpack/runtime_plan.h>
19+
#include <sourcemeta/jsonbinpack/runtime_encoding.h>
2020

2121
namespace sourcemeta::jsonbinpack {
2222

2323
/// @ingroup runtime
2424
SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
25-
auto load(const sourcemeta::jsontoolkit::JSON &input) -> Plan;
25+
auto load(const sourcemeta::jsontoolkit::JSON &input) -> Encoding;
2626

2727
} // namespace sourcemeta::jsonbinpack
2828

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "runtime_export.h"
55

6+
#include <sourcemeta/jsonbinpack/runtime_encoding.h>
67
#include <sourcemeta/jsonbinpack/runtime_input_stream.h>
7-
#include <sourcemeta/jsonbinpack/runtime_plan.h>
88

99
#include <sourcemeta/jsontoolkit/json.h>
1010

@@ -14,7 +14,7 @@ namespace sourcemeta::jsonbinpack {
1414
class SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT Decoder : private InputStream {
1515
public:
1616
Decoder(Stream &input);
17-
auto read(const Plan &encoding) -> sourcemeta::jsontoolkit::JSON;
17+
auto read(const Encoding &encoding) -> sourcemeta::jsontoolkit::JSON;
1818

1919
// The methods that implement individual encodings as considered private
2020
#ifndef DOXYGEN

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include "runtime_export.h"
55

66
#include <sourcemeta/jsonbinpack/runtime_encoder_context.h>
7+
#include <sourcemeta/jsonbinpack/runtime_encoding.h>
78
#include <sourcemeta/jsonbinpack/runtime_output_stream.h>
8-
#include <sourcemeta/jsonbinpack/runtime_plan.h>
99

1010
#include <sourcemeta/jsontoolkit/json.h>
1111

@@ -16,7 +16,7 @@ class SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT Encoder : private OutputStream {
1616
public:
1717
Encoder(Stream &output);
1818
auto write(const sourcemeta::jsontoolkit::JSON &document,
19-
const Plan &encoding) -> void;
19+
const Encoding &encoding) -> void;
2020

2121
// The methods that implement individual encodings as considered private
2222
#ifndef DOXYGEN

0 commit comments

Comments
 (0)