move bind functions out

Z80coder · Z80coder · Apr 28, 2020 · Apr 28, 2020 · Apr 28, 2020 · Apr 28, 2020
commit a1d6c266c7a1e0c2e512afae9c8839e1451e1066
diff --git a/src/Datalog.h b/src/Datalog.h
@@ -9,6 +9,7 @@
 #include <functional>
 #include <cassert>
 #include <iostream>
+#include <tuple>
 
 #include "tuple_hash.h"
 #include "Variable.h"
@@ -18,6 +19,56 @@ namespace datalog
 
 using namespace std;
 
+template <typename T>
+Variable<T> *var()
+{
+    return new Variable<T>();
+}
+
+template <typename T>
+T val(Variable<T> *t)
+{
+    return t->value();
+}
+
+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)
+{
+    return a == b;
+}
+
+template <typename T>
+bool bind(const T &a, Variable<T> *const b)
+{
+    if (b->isBound())
+    {
+        return b->value() == a;
+    }
+    b->bind(a);
+    return true;
+}
+
 template <typename GROUND_TYPE, typename ... Ts, size_t... Is>
 bool bind(const GROUND_TYPE &fact, const tuple<Ts...> &atom, index_sequence<Is...>)
 {

diff --git a/src/Variable.h b/src/Variable.h
@@ -1,7 +1,7 @@
 #ifndef VARIABLE_H
 #define VARIABLE_H
 
-#include <tuple>
+#include <optional>
 
 namespace datalog
 {
@@ -56,56 +56,6 @@ struct Variable : optional<T>
     }
 };
 
-template <typename T>
-Variable<T> *var()
-{
-    return new Variable<T>();
-}
-
-template <typename T>
-T val(Variable<T> *t)
-{
-    return t->value();
-}
-
-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)
-{
-    return a == b;
-}
-
-template <typename T>
-bool bind(const T &a, Variable<T> *const b)
-{
-    if (b->isBound())
-    {
-        return b->value() == a;
-    }
-    b->bind(a);
-    return true;
-}
-
 } // namespace datalog
 
 #endif