From f22fb3005555fd954f67b296dfda3b70684d373c Mon Sep 17 00:00:00 2001
From: DerThorsten <derthorstenbeier@gmail.com>
Date: Fri, 15 Nov 2024 13:25:43 +0100
Subject: [PATCH] detail

---
 include/sparrow/builder/builder.hpp       | 43 ++++++++++++++---------
 include/sparrow/builder/builder_utils.hpp |  9 ++---
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/include/sparrow/builder/builder.hpp b/include/sparrow/builder/builder.hpp
index 8d385cfec..6f44c6828 100644
--- a/include/sparrow/builder/builder.hpp
+++ b/include/sparrow/builder/builder.hpp
@@ -35,6 +35,21 @@
 namespace sparrow
 {
 
+namespace detail{
+template<class T>
+struct builder;
+} // namespace detail
+
+template<class T>
+auto build(T&& t)
+{
+    return detail::builder<T>::create(std::forward<T>(t));
+}
+
+
+namespace detail
+{
+
 template <class T>
 concept translates_to_primitive_layout = 
     std::ranges::input_range<T> &&
@@ -79,16 +94,10 @@ concept translate_to_variable_sized_binary_layout =
 template<class T>
 struct builder;
 
-template<class T>
-auto build(T&& t)
-{
-    return builder<T>::create(std::forward<T>(t));
-}
-
 template< translates_to_primitive_layout T>
 struct builder<T>
 {
-    using type = primitive_array<typename maybe_nullable_value_type<std::ranges::range_value_t<T>>::type>;
+    using type = sparrow::primitive_array<typename maybe_nullable_value_type<std::ranges::range_value_t<T>>::type>;
     template<class U>
     static type create(U&& t)
     {
@@ -121,7 +130,7 @@ struct builder<T>
 template< translate_to_fixed_sized_list_layout T>
 struct builder<T>
 {
-    using type = fixed_sized_list_array;
+    using type = sparrow::fixed_sized_list_array;
     constexpr static std::size_t list_size = std::tuple_size_v<mnv_t<std::ranges::range_value_t<T>>>;
 
     template<class U>
@@ -131,8 +140,8 @@ struct builder<T>
 
         return type(
             static_cast<std::uint64_t>(list_size), 
-            array(build(flat_list_view))
-            //,where_null(t)
+            array(build(flat_list_view)),
+            where_null(t)
         );
     }
 };
@@ -140,7 +149,7 @@ struct builder<T>
 template< translate_to_struct_layout T>
 struct builder<T>
 {
-    using type = struct_array;
+    using type = sparrow::struct_array;
     static constexpr std::size_t n_children = std::tuple_size_v<mnv_t<std::ranges::range_value_t<T>>>;
 
     template<class U>
@@ -156,8 +165,8 @@ struct builder<T>
             }); 
             detyped_children[decltype(i)::value] = array(build(tuple_i_col));
         });
-       return type(std::move(detyped_children)
-       //, where_null(t)
+       return type(std::move(detyped_children),
+       where_null(t)
        );
     }
 };
@@ -166,7 +175,7 @@ struct builder<T>
 template< translate_to_variable_sized_binary_layout T>
 struct builder<T>
 {
-    using type = string_array;
+    using type = sparrow::string_array;
 
     template<class U>
     static type create(U && t)
@@ -180,11 +189,13 @@ struct builder<T>
  
         return type(
             std::move(data_buffer),
-            type::offset_from_sizes(sizes)
-            //,where_null(t)
+            type::offset_from_sizes(sizes),
+            where_null(t)
         );
     }
 };
 
+} // namespace detail
+
 
 }// namespace sparrow
\ No newline at end of file
diff --git a/include/sparrow/builder/builder_utils.hpp b/include/sparrow/builder/builder_utils.hpp
index ba3b44c43..76d0fdc0b 100644
--- a/include/sparrow/builder/builder_utils.hpp
+++ b/include/sparrow/builder/builder_utils.hpp
@@ -30,7 +30,7 @@
 namespace sparrow
 {
 
-    namespace detail
+namespace detail
 {
     template <class F, std::size_t... Is>
     void for_each_index_impl(F&& f, std::index_sequence<Is...>)
@@ -38,13 +38,13 @@ namespace sparrow
         // Apply f to each index individually
         (f(std::integral_constant<std::size_t, Is>{}), ...);
     }
-}
+
 
     template <std::size_t SIZE, class F>
     void for_each_index(F&& f)
     {
         // Use std::forward to preserve value category
-        detail::for_each_index_impl(std::forward<F>(f), std::make_index_sequence<SIZE>());
+        for_each_index_impl(std::forward<F>(f), std::make_index_sequence<SIZE>());
     }
 
 
@@ -95,7 +95,7 @@ namespace sparrow
     };
 
     template<class T>
-    concept is_nullable_like =(is_nullable_like_generic<T>  ||  is_nullable_v<T>);
+    concept is_nullable_like =(is_nullable_like_generic<T>  ||  sparrow::is_nullable_v<T>);
 
 
     template<class T>
@@ -181,6 +181,7 @@ namespace sparrow
         return t | std::views::transform([](auto && v) { return v.get(); });
     }
 
+} // namespace detail
 
 
 } // namespace sparrow
\ No newline at end of file