Inline the runtime loader header into runtime.h (#831)

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Oct 4, 2024 · ee129bf · ee129bf
1 parent 64af701
commit ee129bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
@@ -3,8 +3,7 @@ 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 loader.h
-    varint.h
+    plan.h plan_wrap.h varint.h
   SOURCES loader.cc loader_v1.h)
 
 if(JSONBINPACK_INSTALL)

diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime.h
@@ -10,9 +10,20 @@
 /// #include <sourcemeta/jsonbinpack/runtime.h>
 /// ```
 
+#include "runtime_export.h"
+
+#include <sourcemeta/jsontoolkit/json.h>
+
 #include <sourcemeta/jsonbinpack/runtime_decoder.h>
 #include <sourcemeta/jsonbinpack/runtime_encoder.h>
-#include <sourcemeta/jsonbinpack/runtime_loader.h>
 #include <sourcemeta/jsonbinpack/runtime_plan.h>
 
+namespace sourcemeta::jsonbinpack {
+
+/// @ingroup runtime
+SOURCEMETA_JSONBINPACK_RUNTIME_EXPORT
+auto load(const sourcemeta::jsontoolkit::JSON &input) -> Plan;
+
+} // namespace sourcemeta::jsonbinpack
+
 #endif
diff --git a/src/runtime/include/sourcemeta/jsonbinpack/runtime_loader.h b/src/runtime/include/sourcemeta/jsonbinpack/runtime_loader.h
diff --git a/src/runtime/loader.cc b/src/runtime/loader.cc
@@ -1,4 +1,4 @@
-#include <sourcemeta/jsonbinpack/runtime_loader.h>
+#include <sourcemeta/jsonbinpack/runtime.h>
 
 #include "loader_v1.h"