Group encoding/decoding source code into src/runtime

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Feb 9, 2024 · 1f54eba · 1f54eba
1 parent e189a12
commit 1f54eba
Show file tree

Hide file tree

Showing 69 changed files with 176 additions and 217 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,10 +25,7 @@ find_package(JSONToolkit REQUIRED)
 
 # Runtime
 if(JSONBINPACK_RUNTIME OR JSONBINPACK_CLI OR JSONBINPACK_COMPILER)
-  add_subdirectory(src/numeric)
-  add_subdirectory(src/encoding)
-  add_subdirectory(src/encoder)
-  add_subdirectory(src/decoder)
+  add_subdirectory(src/runtime)
 endif()
 
 # Compiler
@@ -67,6 +64,7 @@ if(JSONBINPACK_TESTS)
   enable_testing()
 
   if(JSONBINPACK_RUNTIME OR JSONBINPACK_CLI OR JSONBINPACK_COMPILER)
+    # TODO: Group into a single runtime test module
     add_subdirectory(test/numeric)
     add_subdirectory(test/encoding)
     add_subdirectory(test/encoder)

diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
@@ -8,8 +8,7 @@ target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsonbinpack
 target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsonbinpack::mapper)
 target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsonbinpack::parser)
 target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsonbinpack::schemas)
-target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsonbinpack::encoder)
-target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsonbinpack::decoder)
+target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsonbinpack::runtime)
 target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsontoolkit::json)
 target_link_libraries(sourcemeta_jsonbinpack_cli PRIVATE sourcemeta::jsontoolkit::jsonschema)
 

diff --git a/src/cli/command_decode.cc b/src/cli/command_decode.cc
@@ -3,9 +3,9 @@
 #include "resolver.h"
 
 #include <sourcemeta/jsonbinpack/canonicalizer.h>
-#include <sourcemeta/jsonbinpack/decoder.h>
 #include <sourcemeta/jsonbinpack/mapper.h>
 #include <sourcemeta/jsonbinpack/parser.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 
 #include <sourcemeta/jsontoolkit/json.h>
 #include <sourcemeta/jsontoolkit/jsonschema.h>

diff --git a/src/cli/command_encode.cc b/src/cli/command_encode.cc
@@ -3,9 +3,9 @@
 #include "resolver.h"
 
 #include <sourcemeta/jsonbinpack/canonicalizer.h>
-#include <sourcemeta/jsonbinpack/encoder.h>
 #include <sourcemeta/jsonbinpack/mapper.h>
 #include <sourcemeta/jsonbinpack/parser.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 
 #include <sourcemeta/jsontoolkit/json.h>
 #include <sourcemeta/jsontoolkit/jsonschema.h>

diff --git a/src/decoder/CMakeLists.txt b/src/decoder/CMakeLists.txt
diff --git a/src/encoder/CMakeLists.txt b/src/encoder/CMakeLists.txt
diff --git a/src/encoder/include/sourcemeta/jsonbinpack/encoder_varint.h b/src/encoder/include/sourcemeta/jsonbinpack/encoder_varint.h
diff --git a/src/encoding/CMakeLists.txt b/src/encoding/CMakeLists.txt
diff --git a/src/numeric/CMakeLists.txt b/src/numeric/CMakeLists.txt
diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt
@@ -11,4 +11,4 @@ sourcemeta_jsonbinpack_add_compile_options(PRIVATE sourcemeta_jsonbinpack_parser
 target_link_libraries(sourcemeta_jsonbinpack_parser PUBLIC
   sourcemeta::jsontoolkit::json)
 target_link_libraries(sourcemeta_jsonbinpack_parser PRIVATE
-  sourcemeta::jsonbinpack::encoding)
+  sourcemeta::jsonbinpack::runtime)
diff --git a/src/parser/include/sourcemeta/jsonbinpack/parser.h b/src/parser/include/sourcemeta/jsonbinpack/parser.h
@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_JSONBINPACK_PARSER_H_
 #define SOURCEMETA_JSONBINPACK_PARSER_H_
 
-#include <sourcemeta/jsonbinpack/encoding.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 #include <sourcemeta/jsontoolkit/json.h>
 
 namespace sourcemeta::jsonbinpack {

diff --git a/src/parser/v1_any.h b/src/parser/v1_any.h
@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_JSONBINPACK_PARSER_V1_ANY_H_
 #define SOURCEMETA_JSONBINPACK_PARSER_V1_ANY_H_
 
-#include <sourcemeta/jsonbinpack/encoding.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 #include <sourcemeta/jsontoolkit/json.h>
 
 namespace sourcemeta::jsonbinpack::parser::v1 {

diff --git a/src/parser/v1_array.h b/src/parser/v1_array.h
@@ -1,9 +1,8 @@
 #ifndef SOURCEMETA_JSONBINPACK_PARSER_V1_ARRAY_H_
 #define SOURCEMETA_JSONBINPACK_PARSER_V1_ARRAY_H_
 
-#include <sourcemeta/jsonbinpack/encoding.h>
-#include <sourcemeta/jsonbinpack/encoding_wrap.h>
 #include <sourcemeta/jsonbinpack/parser.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 #include <sourcemeta/jsontoolkit/json.h>
 
 #include <algorithm> // std::transform

diff --git a/src/parser/v1_enum.h b/src/parser/v1_enum.h
@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_JSONBINPACK_PARSER_V1_ENUM_H_
 #define SOURCEMETA_JSONBINPACK_PARSER_V1_ENUM_H_
 
-#include <sourcemeta/jsonbinpack/encoding.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 #include <sourcemeta/jsontoolkit/json.h>
 
 #include <cassert> // assert

diff --git a/src/parser/v1_integer.h b/src/parser/v1_integer.h
@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_JSONBINPACK_PARSER_V1_INTEGER_H_
 #define SOURCEMETA_JSONBINPACK_PARSER_V1_INTEGER_H_
 
-#include <sourcemeta/jsonbinpack/encoding.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 #include <sourcemeta/jsontoolkit/json.h>
 
 #include <cassert> // assert

diff --git a/src/parser/v1_number.h b/src/parser/v1_number.h
@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_JSONBINPACK_PARSER_V1_NUMBER_H_
 #define SOURCEMETA_JSONBINPACK_PARSER_V1_NUMBER_H_
 
-#include <sourcemeta/jsonbinpack/encoding.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 #include <sourcemeta/jsontoolkit/json.h>
 
 namespace sourcemeta::jsonbinpack::parser::v1 {

diff --git a/src/parser/v1_string.h b/src/parser/v1_string.h
@@ -1,7 +1,7 @@
 #ifndef SOURCEMETA_JSONBINPACK_PARSER_V1_STRING_H_
 #define SOURCEMETA_JSONBINPACK_PARSER_V1_STRING_H_
 
-#include <sourcemeta/jsonbinpack/encoding.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 #include <sourcemeta/jsontoolkit/json.h>
 
 #include <cassert> // assert

diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
@@ -0,0 +1,25 @@
+noa_library(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime
+  FOLDER "JSON BinPack/Runtime"
+  PRIVATE_HEADERS
+    decoder.h
+    decoder_basic.h
+    decoder_zigzag.h
+    encoder.h
+    encoder_basic.h
+    encoder_context.h
+    encoder_real.h
+    encoder_zigzag.h
+    encoding.h
+    encoding_tag.h
+    encoding_wrap.h
+    varint.h
+    numeric.h)
+
+if(JSONBINPACK_INSTALL)
+  noa_library_install(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime)
+endif()
+
+sourcemeta_jsonbinpack_add_compile_options(INTERFACE sourcemeta_jsonbinpack_runtime)
+
+target_link_libraries(sourcemeta_jsonbinpack_runtime INTERFACE
+  sourcemeta::jsontoolkit::json)
diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime.h
@@ -0,0 +1,8 @@
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_H_
+
+#include <sourcemeta/jsonbinpack/runtime_decoder.h>
+#include <sourcemeta/jsonbinpack/runtime_encoder.h>
+#include <sourcemeta/jsonbinpack/runtime_encoding.h>
+
+#endif
diff --git a/.../include/sourcemeta/jsonbinpack/decoder.h → .../sourcemeta/jsonbinpack/runtime_decoder.h b/.../include/sourcemeta/jsonbinpack/decoder.h → .../sourcemeta/jsonbinpack/runtime_decoder.h
@@ -1,15 +1,16 @@
-#ifndef SOURCEMETA_JSONBINPACK_DECODER_H_
-#define SOURCEMETA_JSONBINPACK_DECODER_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_DECODER_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_DECODER_H_
 
 /// @defgroup decoder Decoder
 /// @brief A set of procedures to deserialize a bit-string given a Encoding
 /// Schema
 
-#include <sourcemeta/jsonbinpack/decoder_basic.h>
-#include <sourcemeta/jsonbinpack/encoding.h>
-#include <sourcemeta/jsonbinpack/encoding_tag.h>
-#include <sourcemeta/jsonbinpack/encoding_wrap.h>
-#include <sourcemeta/jsonbinpack/numeric.h>
+#include <sourcemeta/jsonbinpack/runtime_decoder_basic.h>
+#include <sourcemeta/jsonbinpack/runtime_encoding.h>
+#include <sourcemeta/jsonbinpack/runtime_encoding_tag.h>
+#include <sourcemeta/jsonbinpack/runtime_encoding_wrap.h>
+#include <sourcemeta/jsonbinpack/runtime_numeric.h>
+
 #include <sourcemeta/jsontoolkit/json.h>
 
 #include <cassert> // assert

diff --git a/...de/sourcemeta/jsonbinpack/decoder_basic.h → ...emeta/jsonbinpack/runtime_decoder_basic.h b/...de/sourcemeta/jsonbinpack/decoder_basic.h → ...emeta/jsonbinpack/runtime_decoder_basic.h
@@ -1,8 +1,8 @@
-#ifndef SOURCEMETA_JSONBINPACK_DECODER_BASIC_H_
-#define SOURCEMETA_JSONBINPACK_DECODER_BASIC_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_DECODER_BASIC_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_DECODER_BASIC_H_
 
-#include <sourcemeta/jsonbinpack/decoder_varint.h>
-#include <sourcemeta/jsonbinpack/decoder_zigzag.h>
+#include <sourcemeta/jsonbinpack/runtime_decoder_zigzag.h>
+#include <sourcemeta/jsonbinpack/runtime_varint.h>
 
 #include <cassert> // assert
 #include <cmath>   // std::ceil
@@ -55,12 +55,10 @@ template <typename CharT, typename Traits> class BasicDecoder {
     return word;
   }
 
-  inline auto get_varint() -> std::uint64_t {
-    return decoder::varint(this->stream);
-  }
+  inline auto get_varint() -> std::uint64_t { return varint(this->stream); }
 
   inline auto get_varint_zigzag() -> std::int64_t {
-    const std::uint64_t value = decoder::varint(this->stream);
+    const std::uint64_t value = varint(this->stream);
     return decoder::zigzag(value);
   }
 

diff --git a/...e/sourcemeta/jsonbinpack/decoder_zigzag.h → ...meta/jsonbinpack/runtime_decoder_zigzag.h b/...e/sourcemeta/jsonbinpack/decoder_zigzag.h → ...meta/jsonbinpack/runtime_decoder_zigzag.h
@@ -1,5 +1,5 @@
-#ifndef SOURCEMETA_JSONBINPACK_DECODER_ZIGZAG_H_
-#define SOURCEMETA_JSONBINPACK_DECODER_ZIGZAG_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_DECODER_ZIGZAG_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_DECODER_ZIGZAG_H_
 
 #include <cstdint> // std::uint64_t, std::int64_t
 

diff --git a/.../include/sourcemeta/jsonbinpack/encoder.h → .../sourcemeta/jsonbinpack/runtime_encoder.h b/.../include/sourcemeta/jsonbinpack/encoder.h → .../sourcemeta/jsonbinpack/runtime_encoder.h
@@ -1,16 +1,17 @@
-#ifndef SOURCEMETA_JSONBINPACK_ENCODER_H_
-#define SOURCEMETA_JSONBINPACK_ENCODER_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_H_
 
 /// @defgroup encoder Encoder
 /// @brief A set of procedures to serialize a JSON document given a Encoding
 /// Schema
 
-#include <sourcemeta/jsonbinpack/encoder_basic.h>
-#include <sourcemeta/jsonbinpack/encoder_real.h>
-#include <sourcemeta/jsonbinpack/encoding.h>
-#include <sourcemeta/jsonbinpack/encoding_tag.h>
-#include <sourcemeta/jsonbinpack/encoding_wrap.h>
-#include <sourcemeta/jsonbinpack/numeric.h>
+#include <sourcemeta/jsonbinpack/runtime_encoder_basic.h>
+#include <sourcemeta/jsonbinpack/runtime_encoder_real.h>
+#include <sourcemeta/jsonbinpack/runtime_encoding.h>
+#include <sourcemeta/jsonbinpack/runtime_encoding_tag.h>
+#include <sourcemeta/jsonbinpack/runtime_encoding_wrap.h>
+#include <sourcemeta/jsonbinpack/runtime_numeric.h>
+
 #include <sourcemeta/jsontoolkit/json.h>
 
 #include <cmath>   // std::abs

diff --git a/...de/sourcemeta/jsonbinpack/encoder_basic.h → ...emeta/jsonbinpack/runtime_encoder_basic.h b/...de/sourcemeta/jsonbinpack/encoder_basic.h → ...emeta/jsonbinpack/runtime_encoder_basic.h
@@ -1,9 +1,9 @@
-#ifndef SOURCEMETA_JSONBINPACK_ENCODER_BASIC_H_
-#define SOURCEMETA_JSONBINPACK_ENCODER_BASIC_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_BASIC_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_BASIC_H_
 
-#include <sourcemeta/jsonbinpack/encoder_context.h>
-#include <sourcemeta/jsonbinpack/encoder_varint.h>
-#include <sourcemeta/jsonbinpack/encoder_zigzag.h>
+#include <sourcemeta/jsonbinpack/runtime_encoder_context.h>
+#include <sourcemeta/jsonbinpack/runtime_encoder_zigzag.h>
+#include <sourcemeta/jsonbinpack/runtime_varint.h>
 
 #include <algorithm> // std::find_if
 #include <cassert>   // assert
@@ -40,11 +40,11 @@ template <typename CharT, typename Traits> class BasicEncoder {
   }
 
   inline auto put_varint(const std::uint64_t value) -> void {
-    encoder::varint(this->stream, value);
+    varint(this->stream, value);
   }
 
   inline auto put_varint_zigzag(const std::int64_t value) -> void {
-    encoder::varint(this->stream, encoder::zigzag(value));
+    varint(this->stream, encoder::zigzag(value));
   }
 
   inline auto put_string_utf8(const std::basic_string<CharT> &string,

diff --git a/.../sourcemeta/jsonbinpack/encoder_context.h → ...eta/jsonbinpack/runtime_encoder_context.h b/.../sourcemeta/jsonbinpack/encoder_context.h → ...eta/jsonbinpack/runtime_encoder_context.h
@@ -1,5 +1,5 @@
-#ifndef SOURCEMETA_JSONBINPACK_ENCODER_CONTEXT_H_
-#define SOURCEMETA_JSONBINPACK_ENCODER_CONTEXT_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_CONTEXT_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_CONTEXT_H_
 
 #include <cassert>   // assert
 #include <iterator>  // std::cbegin, std::cend

diff --git a/...ude/sourcemeta/jsonbinpack/encoder_real.h → ...cemeta/jsonbinpack/runtime_encoder_real.h b/...ude/sourcemeta/jsonbinpack/encoder_real.h → ...cemeta/jsonbinpack/runtime_encoder_real.h
@@ -1,5 +1,5 @@
-#ifndef SOURCEMETA_JSONBINPACK_ENCODER_REAL_H_
-#define SOURCEMETA_JSONBINPACK_ENCODER_REAL_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_REAL_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_REAL_H_
 
 #include <cassert>  // assert
 #include <cmath>    // std::modf, std::floor, std::isfinite

diff --git a/...e/sourcemeta/jsonbinpack/encoder_zigzag.h → ...meta/jsonbinpack/runtime_encoder_zigzag.h b/...e/sourcemeta/jsonbinpack/encoder_zigzag.h → ...meta/jsonbinpack/runtime_encoder_zigzag.h
@@ -1,5 +1,5 @@
-#ifndef SOURCEMETA_JSONBINPACK_ENCODER_ZIGZAG_H_
-#define SOURCEMETA_JSONBINPACK_ENCODER_ZIGZAG_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_ZIGZAG_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_ENCODER_ZIGZAG_H_
 
 #include <cmath>   // std::abs
 #include <cstdint> // std::uint64_t, std::int64_t

diff --git a/...include/sourcemeta/jsonbinpack/encoding.h → ...sourcemeta/jsonbinpack/runtime_encoding.h b/...include/sourcemeta/jsonbinpack/encoding.h → ...sourcemeta/jsonbinpack/runtime_encoding.h
@@ -1,5 +1,5 @@
-#ifndef SOURCEMETA_JSONBINPACK_ENCODING_H_
-#define SOURCEMETA_JSONBINPACK_ENCODING_H_
+#ifndef SOURCEMETA_JSONBINPACK_RUNTIME_ENCODING_H_
+#define SOURCEMETA_JSONBINPACK_RUNTIME_ENCODING_H_
 
 /// @defgroup encoding Encodings
 ///