add support for static containers to static iterator wrapper (#17)

nebulastream · Aug 8, 2024 · f4d623a · f4d623a
1 parent 9c505c7
commit f4d623a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/nautilus/include/nautilus/static.hpp b/nautilus/include/nautilus/static.hpp
@@ -159,12 +159,12 @@ class static_iterable {
 	static_iterable(Container& container) : m_container(container) {
 	}
 
-	static_iterator<typename Container::iterator> begin() {
-		return static_iterator<typename Container::iterator>(m_container.begin());
+	auto begin() {
+		return static_iterator<decltype(m_container.begin())>(m_container.begin());
 	}
 
-	static_iterator<typename Container::iterator> end() {
-		return static_iterator<typename Container::iterator>(m_container.end());
+	auto end() {
+		return static_iterator<decltype(m_container.end())>(m_container.end());
 	}
 
 private:

diff --git a/nautilus/test/execution-tests/StaticLoopFunctions.hpp b/nautilus/test/execution-tests/StaticLoopFunctions.hpp
@@ -47,6 +47,18 @@ val<int32_t> staticIterator(val<int32_t> ref) {
 	return sum;
 }
 
+const std::vector<int> constVec = {1, 2, 3, 4, 5};
+
+val<int32_t> staticConstIterator(val<int32_t> ref) {
+	val<int32_t> sum = 0;
+	for (auto x : static_iterable(constVec)) {
+		if (ref > x) {
+			sum = sum + 1;
+		}
+	}
+	return sum;
+}
+
 val<int32_t> staticLoopIncrement() {
 	val<int32_t> agg = val<int32_t>(1);
 	for (static_val<int> start = 0; start < 10; start++) {

diff --git a/nautilus/test/execution-tests/TracingTest.cpp b/nautilus/test/execution-tests/TracingTest.cpp
@@ -213,9 +213,10 @@ TEST_CASE("Loop Trace Test") {
 
 TEST_CASE("Static Trace Test") {
 	auto tests = std::vector<std::tuple<std::string, std::function<void()>>> {{"staticLoop", details::createFunctionWrapper(staticLoop)},
-	                                                                          // {"staticLoopWithIf", details::createFunctionWrapper(staticLoopWithIf)},
+	                                                                          {"staticLoopWithIf", details::createFunctionWrapper(staticLoopWithIf)},
 	                                                                          {"staticLoopWithDynamicLoop", details::createFunctionWrapper(staticLoopWithDynamicLoop)},
-	                                                                          // {"staticIterator", details::createFunctionWrapper(staticIterator)},
+	                                                                          {"staticIterator", details::createFunctionWrapper(staticIterator)},
+	                                                                          {"staticConstIterator", details::createFunctionWrapper(staticConstIterator)},
 	                                                                          {"staticLoopIncrement", details::createFunctionWrapper(staticLoopIncrement)},
 	                                                                          {"staticWhileLoopDecrement", details::createFunctionWrapper(staticWhileLoopDecrement)}};
 	runTraceTests(tests);