read_as (#78)

* read_as

changed write_from to read_as

* fix eigen_test

* removed extra decay_t

README.md

@@ -264,20 +264,22 @@ glz::set(tuple, "/0", 5);
 expect(std::get<0>(tuple) == 5.0);
 ```
 
-### write_from
+### read_as
 
-`write_from` allows you to write to a JSON pointer via a JSON input buffer.
+`read_as` allows you to read into an object from a JSON pointer and an input buffer.
 
 ```c++
 Thing thing{};
-glz::write_from(thing, "/vec3", "[7.6, 1292.1, 0.333]");
+glz::read_as_json(thing, "/vec3", "[7.6, 1292.1, 0.333]");
 expect(thing.vec3.x == 7.6 && thing.vec3.y == 1292.1 &&
 thing.vec3.z == 0.333);
 
-glz::write_from(thing, "/vec3/2", "999.9");
+glz::read_as_json(thing, "/vec3/2", "999.9");
 expect(thing.vec3.z == 999.9);
 ```
 
+`read_as_binary` is also supported.
+
 ## JSON With Comments (JSONC)
 
 Comments are supported with the specification defined here: [JSONC](https://github.com/stephenberry/JSONC)

include/glaze/binary.hpp

@@ -6,3 +6,4 @@
 #include "glaze/binary/header.hpp"
 #include "glaze/binary/read.hpp"
 #include "glaze/binary/write.hpp"
+#include "glaze/binary/ptr.hpp"

include/glaze/binary/ptr.hpp

@@ -0,0 +1,22 @@
+// Glaze Library
+// For the license information refer to glaze.hpp
+
+#pragma once
+
+#include "glaze/core/ptr.hpp"
+#include "glaze/binary/read.hpp"
+#include "glaze/binary/write.hpp"
+
+namespace glz
+{
+   template <class T, class B>
+   bool read_as_binary(T&& root_value, const sv json_ptr, B&& buffer) {
+      return read_as<opts{.format = binary}>(std::forward<T>(root_value), json_ptr, buffer);
+   }
+
+   template <class T, class B>
+   bool write_as_binary(T&& root_value, const sv json_ptr, B& buffer)
+   {
+      return write_as<opts{.format = binary}>(std::forward<T>(root_value), json_ptr, buffer);
+   }
+}

include/glaze/core/ptr.hpp

@@ -0,0 +1,38 @@
+// Glaze Library
+// For the license information refer to glaze.hpp
+
+#pragma once
+
+#include "glaze/core/opts.hpp"
+#include "glaze/core/read.hpp"
+#include "glaze/core/write.hpp"
+#include "glaze/util/for_each.hpp"
+#include "glaze/json/json_ptr.hpp"
+
+namespace glz
+{
+   // Given a JSON pointer path, reads from the buffer into the object
+   template <opts Opts, class T, class B>
+   bool read_as(T&& root_value, const sv json_ptr, B&& buffer) {
+      return detail::seek_impl(
+        [&](auto&& val) {
+          read<Opts>(val, buffer);
+        },
+        std::forward<T>(root_value), json_ptr
+    );
+   }
+
+   // Given a JSON pointer path, find the value in the buffer and reads only that sub value
+   /*template <opts Opts, class T, class B>
+   bool read_sub(T&& root_value, const sv json_ptr, B&& buffer) {
+      
+   }*/
+
+   // Given a JSON pointer path, writes into a buffer the specified value
+   template <opts Opts, class T, class B>
+   bool write_as(T&& root_value, const sv json_ptr, B& buffer)
+   {
+      return detail::seek_impl([&](auto&& val) { write<Opts>(val, buffer); },
+                       std::forward<T>(root_value), json_ptr);
+   }
+}

include/glaze/json.hpp

@@ -6,5 +6,5 @@
 #include "glaze/json/read.hpp"
 #include "glaze/json/write.hpp"
 #include "glaze/json/json_ptr.hpp"
-#include "glaze/json/from_ptr.hpp"
+#include "glaze/json/ptr.hpp"
 #include "glaze/json/prettify.hpp"

include/glaze/json/json_ptr.hpp

@@ -17,7 +17,7 @@ namespace glz
    namespace detail
    {
       template <class F, class T>
-      requires glaze_array_t<std::decay_t<T>> || tuple_t<std::decay_t<T>> || array_t<std::decay_t<T>> ||
+      requires glaze_array_t<T> || tuple_t<std::decay_t<T>> || array_t<std::decay_t<T>> ||
          is_std_tuple<std::decay_t<T>>
       bool seek_impl(F&& func, T&& value, sv json_ptr);
 
@@ -122,7 +122,7 @@ namespace glz
       }
 
       template <class F, class T>
-      requires glaze_array_t<std::decay_t<T>> || tuple_t<std::decay_t<T>> || array_t<std::decay_t<T>> ||
+      requires glaze_array_t<T> || tuple_t<std::decay_t<T>> || array_t<std::decay_t<T>> ||
          is_std_tuple<std::decay_t<T>>
       bool seek_impl(F&& func, T&& value, sv json_ptr)
       {

include/glaze/json/ptr.hpp

@@ -0,0 +1,22 @@
+// Glaze Library
+// For the license information refer to glaze.hpp
+
+#pragma once
+
+#include "glaze/core/ptr.hpp"
+#include "glaze/json/read.hpp"
+#include "glaze/json/write.hpp"
+
+namespace glz
+{
+   template <class T, class B>
+   bool read_as_json(T&& root_value, const sv json_ptr, B&& buffer) {
+      return read_as<opts{}>(std::forward<T>(root_value), json_ptr, buffer);
+   }
+
+   template <class T, class B>
+   bool write_as_json(T&& root_value, const sv json_ptr, B& buffer)
+   {
+      return write_as<opts{}>(std::forward<T>(root_value), json_ptr, buffer);
+   }
+}

include/glaze/json/study.hpp

@@ -61,7 +61,7 @@ namespace glz
       void overwrite(auto& state, const std::unordered_map<std::string, raw_json> &overwrites)
       {
          for (auto&& [json_ptr, raw_json_str] : overwrites) {
-            write_from(state, json_ptr, raw_json_str.str);
+            read_as_json(state, json_ptr, raw_json_str.str);
          }
       }
 

include/glaze/json/write.hpp

@@ -14,7 +14,7 @@
 #include "glaze/core/format.hpp"
 #include "glaze/util/for_each.hpp"
 #include "glaze/util/dump.hpp"
-#include "glaze/json/from_ptr.hpp"
+#include "glaze/json/ptr.hpp"
 
 #include "glaze/util/to_chars.hpp"
 #include "glaze/util/itoa.hpp"

tests/eigen_test/eigen_test.cpp

@@ -8,7 +8,7 @@
 
 #include "boost/ut.hpp"
 #include "glaze/json/json_ptr.hpp"
-#include "glaze/json/from_ptr.hpp"
+#include "glaze/json/ptr.hpp"
 #include "glaze/json/read.hpp"
 #include "glaze/json/write.hpp"
 #include "glaze/ext/eigen.hpp"

tests/json_test/json_test.cpp

@@ -14,7 +14,7 @@
 #include "glaze/core/macros.hpp"
 #include "boost/ut.hpp"
 #include "glaze/json/json_ptr.hpp"
-#include "glaze/json/from_ptr.hpp"
+#include "glaze/json/ptr.hpp"
 #include "glaze/json/read.hpp"
 #include "glaze/json/write.hpp"
 #include "glaze/json/prettify.hpp"
@@ -684,13 +684,13 @@ void json_pointer() {
       expect(std::get<2>(tuple) == "fish");
    };
 
-   "overwrite"_test = [] {
+   "read_as_json"_test = [] {
       Thing thing{};
-      glz::write_from(thing, "/vec3", "[7.6, 1292.1, 0.333]");
+      glz::read_as_json(thing, "/vec3", "[7.6, 1292.1, 0.333]");
       expect(thing.vec3.x == 7.6 && thing.vec3.y == 1292.1 &&
              thing.vec3.z == 0.333);
 
-      glz::write_from(thing, "/vec3/2", "999.9");
+      glz::read_as_json(thing, "/vec3/2", "999.9");
       expect(thing.vec3.z == 999.9);
    };