feat: Add tuple and record support

Signed-off-by Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

README.md

@@ -77,4 +77,3 @@ TODO
     <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=GordonSmith/component-model-cpp&type=Date" />
   </picture>
 </a>
-

src/CMakeLists.txt

@@ -3,6 +3,8 @@ project(component-model-cpp)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+find_package(Boost)
+
 set(SRC
     boolean.cpp
     boolean.hpp
@@ -31,10 +33,6 @@ add_library(${PROJECT_NAME} STATIC
     ${SRC}
 )
 
-# target_include_directories(${PROJECT_NAME}
-#   ...
-# )
-
 target_link_libraries(${PROJECT_NAME} 
 )
 
@@ -47,4 +45,5 @@ target_compile_options(${PROJECT_NAME} PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>
 target_include_directories(
     ${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
                          $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+                         ${Boost_INCLUDE_DIR}
 )

src/lift.hpp

@@ -7,7 +7,7 @@
 #include "string.hpp"
 #include "list.hpp"
 #include "flags.hpp"
-#include "record.hpp"
+#include "tuple.hpp"
 #include "variant.hpp"
 #include "util.hpp"
 
@@ -62,13 +62,21 @@ namespace cmcpp
         return flags::lift_flat<T>(cx, vi);
     }
 
-    template <Record T>
+    template <Tuple T>
     T lift_flat(const CallContext &cx, const CoreValueIter &vi)
     {
-        auto x = record::lift_flat_record<T>(cx, vi);
+        auto x = tuple::lift_flat_tuple<T>(cx, vi);
         return x;
     }
 
+    template <Record T>
+    T lift_flat(const CallContext &cx, const CoreValueIter &vi)
+    {
+        using TupleType = decltype(boost::pfr::structure_to_tuple(std::declval<typename ValTrait<T>::inner_type>()));
+        TupleType x = tuple::lift_flat_tuple<TupleType>(cx, vi);
+        return to_struct<T>(x);
+    }
+
     template <Variant T>
     T lift_flat(const CallContext &cx, const CoreValueIter &vi)
     {

src/lower.hpp

@@ -7,7 +7,7 @@
 #include "string.hpp"
 #include "list.hpp"
 #include "flags.hpp"
-#include "record.hpp"
+#include "tuple.hpp"
 #include "util.hpp"
 
 #include <tuple>
@@ -66,17 +66,25 @@ namespace cmcpp
         return flags::lower_flat(cx, v);
     }
 
+    template <Tuple T>
+    inline WasmValVector lower_flat(CallContext &cx, const T &v)
+    {
+        return tuple::lower_flat_tuple(cx, v);
+    }
+
     template <Record T>
     inline WasmValVector lower_flat(CallContext &cx, const T &v)
     {
-        return record::lower_flat_record(cx, v);
+        auto x = boost::pfr::structure_to_tuple(v);
+        return tuple::lower_flat_tuple(cx, x);
     }
 
     template <Variant T>
     inline WasmValVector lower_flat(CallContext &cx, const T &v)
     {
         return variant::lower_flat_variant(cx, v);
     }
+
 }
 
 #endif