pull out tuple binding

ianpaulwright · ianpaulwright · commit 8bbc8964f329 · 2020-04-28T16:34:35.000+01:00
diff --git a/src/Datalog.h b/src/Datalog.h
@@ -12,46 +12,51 @@
 #include <tuple>
 
 #include "tuple_hash.h"
-#include "Variable.h"
+#include "variable.h"
+#include "tuple_binding.h"
 
 namespace datalog
 {
 
 using namespace std;
 
+/**
+ * @brief create a new variable
+ * 
+ * @tparam T 
+ * @return Variable<T>* 
+ */
 template <typename T>
 Variable<T> *var()
 {
     return new Variable<T>();
 }
 
+/**
+ * @brief get the value of a variable
+ * 
+ * @tparam T 
+ * @param t 
+ * @return T 
+ */
 template <typename T>
 T val(Variable<T> *t)
 {
     return t->value();
 }
 
+/**
+ * @brief delete a variable
+ * 
+ * @tparam T 
+ * @param v 
+ */
 template <typename T>
 void deleteVar(Variable<T> *v)
 {
     delete v;
 }
 
-template <typename T>
-void unbind(Variable<T> *t)
-{
-    t->unbind();
-}
-
-template <typename T>
-void unbind(const T &t) {}
-
-template <typename... Ts>
-void unbind(const tuple<Ts...> &tuple)
-{
-    apply([](auto &&... args) { ((unbind(args), ...)); }, tuple);
-}
-
 template <typename T>
 bool bind(const T &a, const T &b)
 {
diff --git a/src/tuple_binding.h b/src/tuple_binding.h
@@ -0,0 +1,45 @@
+#ifndef TUPLES_H
+#define TUPLES_H
+
+#include "variable.h"
+
+namespace datalog {
+
+/**
+ * @brief unbind a variable
+ * 
+ * @tparam T 
+ * @param t 
+ */
+template <typename T>
+void unbind(Variable<T> *t)
+{
+    t->unbind();
+}
+
+/**
+ * @brief unbind no-operation for types that are not variables
+ * 
+ * @tparam T 
+ * @param t 
+ */
+template <typename T>
+void unbind(const T &t) {
+	// If t is not a Variable then perform no-op
+}
+
+/**
+ * @brief apply unbind to a tuple of variables and values
+ * 
+ * @tparam Ts 
+ * @param tuple 
+ */
+template <typename... Ts>
+void unbind(const tuple<Ts...> &tuple)
+{
+    apply([](auto &&... args) { ((unbind(args), ...)); }, tuple);
+}
+
+}
+
+#endif // TUPLES_H
diff --git a/src/variable.h b/src/variable.h
diff --git a/tests/variable_test.cpp b/tests/variable_test.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "Variable.h"
+#include "variable.h"
 
 using namespace datalog;
 
