Merge branch 'main' into quadrature_encoder

Author: audiobird

.github/workflows/c-cpp.yml

@@ -11,19 +11,27 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-22.04]
-        cxx: [g++-12, g++-11, clang++-15, clang++-14]
+        os: [ubuntu-22.04, ubuntu-24.04]
+        cxx: [g++-14, g++-13, g++-12, g++-11, clang++-18, clang++-17, clang++-16, clang++-15 ]
         include:
           - os: macos-latest
             cxx: clang++
-          - os: ubuntu-24.04
-            cxx: g++-13
-          - os: ubuntu-24.04
+        exclude:
+          - os: ubuntu-22.04
             cxx: clang++-16
-          - os: ubuntu-24.04
+          - os: ubuntu-22.04
             cxx: clang++-17
-          - os: ubuntu-24.04
+          - os: ubuntu-22.04
             cxx: clang++-18
+          - os: ubuntu-22.04
+            cxx: g++-13
+          - os: ubuntu-22.04
+            cxx: g++-14
+
+          - os: ubuntu-24.04
+            cxx: clang++-15
+          - os: ubuntu-24.04
+            cxx: g++-11
 
     runs-on: ${{ matrix.os }}
 

tests/callable_tests.cc

@@ -48,3 +48,91 @@ TEST_CASE("Callable Function lots of params") {
 	CHECK(func(10, 10.f, 'a', {}, {2, 'a', 1.2f, 1.4}) == 137);
 	CHECK(capture == 20);
 }
+
+TEST_CASE("FunctionSized") {
+	// This fails to compile (which is what we want)
+	// auto capture{0};
+	// auto capture2{0};
+	// auto capture3{0};
+	// auto func = Function<int(int, int)>{[&](int a, int b) {
+	// 	capture += 10;
+	// 	capture2 += 10;
+	// 	capture3 += 10;
+	// 	return a + b + capture;
+	// }};
+
+	auto capture{0};
+	auto capture2{0};
+	auto capture3{0};
+	auto func = FunctionSized<sizeof(void *) * 3, int(int, int)>{[&](int a, int b) {
+		capture += 10;
+		capture2 += 10;
+		capture3 += 10;
+		return a + b + capture;
+	}};
+}
+
+TEST_CASE("Callable") {
+	auto capture{0};
+
+	auto func = Callback{[&capture] {
+		capture += 10;
+		return capture;
+	}};
+
+	func();
+	CHECK(capture == 10);
+	func();
+	CHECK(capture == 20);
+}
+
+TEST_CASE("CallableSized") {
+	auto capture{0};
+	auto capture2{0};
+	auto capture3{0};
+
+	auto func = CallbackSized<sizeof(void *) * 3>{[&] {
+		capture += 10;
+		capture2 += 10;
+		capture3 += 10;
+		return capture;
+	}};
+
+	func();
+	CHECK(capture3 == 10);
+	func();
+	CHECK(capture3 == 20);
+}
+
+TEST_CASE("~Callable") {
+	auto capture{0};
+
+	Callback *func = new Callback{[&capture] {
+		capture += 10;
+		return capture;
+	}};
+
+	(*func)();
+	CHECK(capture == 10);
+	(*func)();
+	CHECK(capture == 20);
+
+	delete func;
+
+	Callback *empty = new Callback();
+	delete empty;
+}
+
+TEST_CASE("operator bool") {
+	auto capture{0};
+
+	Callback func;
+	CHECK_FALSE((bool)func);
+
+	func = Callback{[&capture] {
+		capture += 10;
+		return capture;
+	}};
+
+	CHECK((bool)func);
+}

util/callable.hh

@@ -51,7 +51,10 @@ private:
 	template<typename Callable>
 	static Ret invoke(void *object, Args... args) {
 		Callable &callable = *reinterpret_cast<Callable *>(object);
-		return callable(std::forward<Args>(args)...);
+		if constexpr (std::is_same_v<void, Ret>)
+			callable(std::forward<Args>(args)...);
+		else
+			return callable(std::forward<Args>(args)...);
 	}
 
 	template<typename Callable>