embryo test for tuple binding

ianpaulwright · ianpaulwright · commit 2c733cdd0ea8 · 2020-04-29T13:08:31.000+01:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -35,3 +35,9 @@ add_executable(variable_test ../tests/variable_test.cpp)
 target_include_directories(variable_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(variable_test tests_main)
 target_compile_definitions(variable_test PUBLIC UNIX)
+
+# tuple_binding_test target
+add_executable(tuple_binding_test ../tests/tuple_binding_test.cpp)
+target_include_directories(tuple_binding_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(tuple_binding_test tests_main)
+target_compile_definitions(tuple_binding_test PUBLIC UNIX)
diff --git a/src/Datalog.h b/src/Datalog.h
@@ -20,6 +20,8 @@ namespace datalog
 
 using namespace std;
 
+// High-level API functions
+
 /**
  * @brief create a new variable
  * 
@@ -57,6 +59,8 @@ void deleteVar(Variable<T> *v)
     delete v;
 }
 
+// TODO: all functions below here to be refactored into separate files
+
 template <typename T>
 bool bind(const T &a, const T &b)
 {
diff --git a/src/tuple_binding.h b/src/tuple_binding.h
@@ -5,6 +5,8 @@
 
 namespace datalog {
 
+// TODO: reify the concept of a tuple of values and pointers to Variables
+
 /**
  * @brief unbind a variable
  * 
@@ -18,7 +20,7 @@ void unbind(Variable<T> *t)
 }
 
 /**
- * @brief unbind no-operation for types that are not variables
+ * @brief unbind no-operation for types that are not variables (i.e. values)
  * 
  * @tparam T 
  * @param t 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 set -e
 ../build/types_test
-../build/variable_test
+../build/variable_test
+../build/tuple_binding_test
diff --git a/tests/tuple_binding_test.cpp b/tests/tuple_binding_test.cpp
@@ -0,0 +1,21 @@
+#include "catch.hpp"
+#include "Datalog.h"
+
+using namespace datalog;
+using namespace std;
+
+bool unbindTest()
+{
+    auto v = var<int>();
+    v->bind(3);
+    tuple<decltype(v), int> t{v, 3};
+    v->unbind();
+    bool returnVal = !get<0>(t)->isBound();
+    deleteVar(v);
+    return returnVal;
+}
+
+TEST_CASE("tuple binding test", "[tuple-binding]")
+{
+    REQUIRE(unbindTest());
+}

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ namespace datalog`
`20`	`20`
`21`	`21`	`using namespace std;`
`22`	`22`
	`23`	`+// High-level API functions`
	`24`	`+`
`23`	`25`	`/**`
`24`	`26`	`* @brief create a new variable`
`25`	`27`	`*`
`@@ -57,6 +59,8 @@ void deleteVar(Variable<T> *v)`
`57`	`59`	`delete v;`
`58`	`60`	`}`
`59`	`61`
	`62`	`+// TODO: all functions below here to be refactored into separate files`
	`63`	`+`
`60`	`64`	`template <typename T>`
`61`	`65`	`bool bind(const T &a, const T &b)`
`62`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`namespace datalog {`
`7`	`7`
	`8`	`+// TODO: reify the concept of a tuple of values and pointers to Variables`
	`9`	`+`
`8`	`10`	`/**`
`9`	`11`	`* @brief unbind a variable`
`10`	`12`	`*`
`@@ -18,7 +20,7 @@ void unbind(Variable<T> *t)`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`/**`
`21`		`- * @brief unbind no-operation for types that are not variables`
	`23`	`+ * @brief unbind no-operation for types that are not variables (i.e. values)`
`22`	`24`	`*`
`23`	`25`	`* @tparam T`
`24`	`26`	`* @param t`