restructured Tuple bind a bit

arBmind · arBmind · commit cb9a10d6758a · 2020-07-25T16:19:56.000+02:00
* added some bind tests
diff --git a/src/tuple19.lib/tuple19/Tuple.bind.h b/src/tuple19.lib/tuple19/Tuple.bind.h
@@ -6,35 +6,34 @@ namespace tuple19 {
 
 using meta19::_index;
 
-template<size_t I, class... Ts> auto constexpr get(Tuple<Ts...>& tuple) -> decltype(auto) {
+template<size_t I, class... Ts> constexpr auto get(Tuple<Ts...>& tuple) -> decltype(auto) {
     return tuple.amendAt(_index<I>);
 }
-template<size_t I, class... Ts> auto constexpr get(Tuple<Ts...>&& tuple) -> decltype(auto) {
+template<size_t I, class... Ts> constexpr auto get(Tuple<Ts...>&& tuple) -> decltype(auto) {
     return std::move(tuple.amendAt(_index<I>));
 }
-template<size_t I, class... Ts> auto constexpr get(const Tuple<Ts...>& tuple) -> decltype(auto) {
+template<size_t I, class... Ts> constexpr auto get(const Tuple<Ts...>& tuple) -> decltype(auto) {
     return tuple.at(_index<I>);
 }
-template<class T, class... Ts> auto constexpr get(Tuple<Ts...>& tuple, Type<T>* = {}) -> decltype(auto) {
+template<class T, class... Ts> constexpr auto get(Tuple<Ts...>& tuple, Type<T>* = {}) -> decltype(auto) {
     return tuple.amendOf(type<T>);
 }
-template<class T, class... Ts> auto constexpr get(Tuple<Ts...>&& tuple, Type<T>* = {}) -> decltype(auto) {
+template<class T, class... Ts> constexpr auto get(Tuple<Ts...>&& tuple, Type<T>* = {}) -> decltype(auto) {
     return std::move(tuple.amendOf(type<T>));
 }
-template<class T, class... Ts> auto constexpr get(const Tuple<Ts...>& tuple, Type<T>* = {}) -> decltype(auto) {
+template<class T, class... Ts> constexpr auto get(const Tuple<Ts...>& tuple, Type<T>* = {}) -> decltype(auto) {
     return tuple.of(type<T>);
 }
 
 } // namespace tuple19
 
 /// for c++17 structured bindings support
-namespace std {
-
-template<class... Ts> class tuple_size<tuple19::Tuple<Ts...>> : public std::integral_constant<size_t, sizeof...(Ts)> {};
+template<class... Ts> class std::tuple_size<tuple19::Tuple<Ts...>> {
+public:
+    static constexpr auto value = sizeof...(Ts);
+};
 
-template<size_t I, class... Ts> class tuple_element<I, tuple19::Tuple<Ts...>> {
+template<size_t I, class... Ts> class std::tuple_element<I, tuple19::Tuple<Ts...>> {
 public:
     using type = typename tuple19::Tuple<Ts...>::template At<I>;
 };
-
-} // namespace std
diff --git a/src/tuple19.lib/tuple19/Tuple.bind.test.cpp b/src/tuple19.lib/tuple19/Tuple.bind.test.cpp
@@ -0,0 +1,36 @@
+#include "Tuple.bind.h"
+#include "Tuple.h"
+#include "Tuple.ostream.h"
+
+#include <gtest/gtest.h>
+
+using namespace tuple19;
+
+TEST(TupleBind, copy) {
+    auto tpl = Tuple{12, 'a'};
+    auto [num, chr] = tpl;
+
+    EXPECT_EQ(num, 12);
+    EXPECT_EQ(chr, 'a');
+
+    num = 23;
+    EXPECT_EQ(tpl, (Tuple{12, 'a'}));
+}
+
+TEST(TupleBind, reference) {
+    auto tpl = Tuple{12, 'a'};
+    auto& [num, chr] = tpl;
+
+    EXPECT_EQ(num, 12);
+    EXPECT_EQ(chr, 'a');
+
+    num = 23;
+    EXPECT_EQ(tpl, (Tuple{23, 'a'}));
+}
+
+TEST(TupleBind, moved) {
+    auto&& [num, chr] = Tuple{12, 'a'};
+
+    EXPECT_EQ(num, 12);
+    EXPECT_EQ(chr, 'a');
+}
diff --git a/src/tuple19.lib/tuple19/tuple19.tests.qbs b/src/tuple19.lib/tuple19/tuple19.tests.qbs
@@ -10,6 +10,7 @@ Application {
     Depends { name: "googletest" }
 
     files: [
+        "Tuple.bind.test.cpp",
         "Tuple.test.cpp",
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ Application {`
`10`	`10`	`Depends { name: "googletest" }`
`11`	`11`
`12`	`12`	`files: [`
	`13`	`+ "Tuple.bind.test.cpp",`
`13`	`14`	`"Tuple.test.cpp",`
`14`	`15`	`]`
`15`	`16`	`}`