Add ostream operators to vstr_t and add .size() member to varr_t

DavidAce · Nov 7, 2022 · e85246e · e85246e
1 parent 33577b1
commit e85246e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/include/h5pp/details/h5ppVarr.h b/include/h5pp/details/h5ppVarr.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "h5ppFormat.h"
 #include "h5ppTypeCompound.h"
 #include <complex>
 #include <cstdlib>
@@ -41,6 +42,7 @@ namespace h5pp::type::vlen {
         hvl_t               *vlen_data();
         const hvl_t         *vlen_data() const;
         [[nodiscard]] size_t vlen_size() const;
+        [[nodiscard]] size_t size() const;
         [[nodiscard]] size_t length() const;
         const T             *begin() const;
         const T             *end() const;
@@ -49,6 +51,19 @@ namespace h5pp::type::vlen {
         bool                 empty() const;
         static hid::h5t      get_h5type();
         ~varr_t() noexcept;
+
+#if !defined(FMT_FORMAT_H_) || !defined(H5PP_USE_FMT)
+        friend auto operator<<(std::ostream &os, const varr_t &v) -> std::ostream & {
+            if(v.empty())
+                os << "[]";
+            else {
+                os << "[";
+                std::copy(v.begin(), v.end(), std::ostream_iterator<T>(os, ", "));
+                os << "\b\b]";
+            }
+            return os;
+        }
+#endif
     };
 
     template<typename T>
@@ -197,6 +212,10 @@ namespace h5pp::type::vlen {
         return vl.len;
     }
     template<typename T>
+    size_t varr_t<T>::size() const {
+        return vl.len;
+    }
+    template<typename T>
     size_t varr_t<T>::length() const {
         return vl.len;
     }

diff --git a/include/h5pp/details/h5ppVstr.h b/include/h5pp/details/h5ppVstr.h
@@ -44,6 +44,12 @@ namespace h5pp::type::vlen {
         void                 append(std::string_view v);
         static hid::h5t      get_h5type();
         ~vstr_t() noexcept;
+#if !defined(FMT_FORMAT_H_) || !defined(H5PP_USE_FMT)
+        friend auto operator<<(std::ostream &os, const vstr_t &v) -> std::ostream & {
+            std::copy(v.begin(), v.end(), std::ostream_iterator<char>(os, ", "));
+            return os;
+        }
+#endif
     };
 
     inline vstr_t::operator std::string_view() const { return {begin(), size()}; }