renaming signal to sig and introducing val_sig

Author: frameworklabs

include/proto_activities.h

@@ -20,6 +20,9 @@
 #ifdef _PA_ENABLE_CPP
 #include <functional> /* for std::function */
 #include <type_traits> /* for std::true_type, std::void_t, std::enable_if etc. */
+#if __cplusplus >= 201703L
+#include <optional>
+#endif
 #endif
 
 /* Types */
@@ -503,14 +506,15 @@ namespace proto_activities {
 
 /* Signals */
 
-#ifdef __cplusplus
+#ifdef _PA_ENABLE_CPP
+
 namespace proto_activities {
-    struct BoolSignal final : Updatable {
-        BoolSignal(Enter& enter) {
+    struct Signal final : Updatable {
+        Signal(Enter& enter) {
             enter.add(this);
         }
-        BoolSignal(const BoolSignal&) = delete;
-        BoolSignal& operator=(const BoolSignal&) {
+        Signal(const Signal&) = delete;
+        Signal& operator=(const Signal&) {
             value_ = false;
             return *this;
         }
@@ -526,12 +530,47 @@ namespace proto_activities {
     private:
         bool value_;
     };
+#if __cplusplus >= 201703L
+    template <typename T>
+    struct ValSignal final : Updatable {
+        ValSignal(Enter& enter) {
+            enter.add(this);
+        }
+        ValSignal(const ValSignal&) = delete;
+        ValSignal& operator=(const ValSignal&) {
+            value_.reset();
+            return *this;
+        }
+        void emit(T&& t) {
+            value_.emplace(std::move(t));
+        }
+        operator bool() const {
+            return value_.has_value();
+        }
+        const T& val() const {
+            return *value_;
+        }
+        void update() final {
+            value_.reset();
+        }
+    private:
+        std::optional<T> value_;
+    };
+#endif
 }
-using pa_signal = proto_activities::BoolSignal;
 
-#define pa_def_signal(nm) pa_signal nm{_pa_enter};
+using pa_sig = proto_activities::Signal;
+#define pa_sig_res pa_enter_res
+#define pa_def_sig(nm) pa_sig nm{_pa_enter};
 #define pa_emit(sig) sig.emit();
 
+#if __cplusplus >= 201703L
+template <typename T>
+using pa_val_sig = proto_activities::ValSignal<T>;
+#define pa_def_val_sig(ty, nm) pa_val_sig<ty> nm{_pa_enter};
+#define pa_emit_val(sig, val) sig.emit(val);
+#endif
+
 #endif
 
 /* Trigger */

tests_cpp/Makefile

@@ -1,8 +1,13 @@
-run: tests
+run: tests tests17
 	./tests
+	./tests17
 
 tests: tests.cpp ../include/proto_activities.h
 	c++ --std c++14 -I ../include tests.cpp -o tests
-	
+
+tests17: tests.cpp ../include/proto_activities.h
+	c++ --std c++17 -I ../include tests.cpp -o tests17
+
 clean:
 	rm tests
+	rm tests17

tests_cpp/tests.cpp

@@ -804,7 +804,7 @@ pa_activity (TestLifecycle, pa_ctx(pa_co_res(2); pa_use(TestLifecycleBody); pa_u
 
 // Signal Tests
 
-pa_activity (TestSignalsBodySub, pa_ctx(), pa_signal& s1, pa_signal& s2) {
+pa_activity (TestSignalsBodySub, pa_ctx(), pa_sig& s1, pa_sig& s2) {
     assert(!s1); assert(!s2);
     pa_pause;
 
@@ -817,8 +817,8 @@ pa_activity (TestSignalsBodySub, pa_ctx(), pa_signal& s1, pa_signal& s2) {
     pa_pause;
 } pa_end
 
-pa_activity (TestSignalsBody, pa_ctx(pa_enter_res; pa_use(TestSignalsBodySub);
-                                     pa_def_signal(s1); pa_def_signal(s2))) {
+pa_activity (TestSignalsBody, pa_ctx(pa_sig_res; pa_use(TestSignalsBodySub);
+                                     pa_def_sig(s1); pa_def_sig(s2))) {
     assert(!pa_self.s1); assert(!pa_self.s2);
     pa_pause;
 
@@ -830,7 +830,7 @@ pa_activity (TestSignalsBody, pa_ctx(pa_enter_res; pa_use(TestSignalsBodySub);
     assert(!pa_self.s1); assert(!pa_self.s2);
     pa_pause;
 
-    pa_run(TestSignalsBodySub, pa_self.s1, pa_self.s1);
+    pa_run(TestSignalsBodySub, pa_self.s1, pa_self.s2);
 } pa_end
 
 pa_activity (TestSignals, pa_ctx_tm(pa_use(TestSignalsBody))) {
@@ -840,6 +840,48 @@ pa_activity (TestSignals, pa_ctx_tm(pa_use(TestSignalsBody))) {
     pa_run (TestSignalsBody); // Test re-invocation after abort
 } pa_end
 
+#if __cplusplus >= 201703L
+
+pa_activity (TestValSignalsBodySub, pa_ctx(), pa_val_sig<int>& s1, pa_val_sig<float>& s2) {
+    assert(!s1); assert(!s2);
+    pa_pause;
+
+    assert(!s1); assert(!s2);
+    pa_emit_val(s1, 42); pa_emit_val(s2, 3.14f);
+    assert(s1); assert(s2);
+    assert(s1.val() == 42); assert(s2.val() != 0.0f);
+    pa_pause;
+
+    assert(!s1); assert(!s2);
+    pa_pause;
+} pa_end
+
+pa_activity (TestValSignalsBody, pa_ctx(pa_sig_res; pa_use(TestValSignalsBodySub);
+                                        pa_def_val_sig(int, s1); pa_def_val_sig(float, s2))) {
+    assert(!pa_self.s1); assert(!pa_self.s2);
+    pa_pause;
+
+    assert(!pa_self.s1); assert(!pa_self.s2);
+    pa_emit_val(pa_self.s1, 42); pa_emit_val(pa_self.s2, 3.14f);
+    assert(pa_self.s1); assert(pa_self.s2);
+    assert(pa_self.s1.val() == 42); assert(pa_self.s2.val() != 0.0f);
+    pa_pause;
+
+    assert(!pa_self.s1); assert(!pa_self.s2);
+    pa_pause;
+
+    pa_run(TestValSignalsBodySub, pa_self.s1, pa_self.s2);
+} pa_end
+
+pa_activity (TestValSignals, pa_ctx_tm(pa_use(TestValSignalsBody))) {
+    pa_run (TestValSignalsBody);
+    pa_run (TestValSignalsBody); // Test re-invocation
+    pa_after_abort (2, TestValSignalsBody);
+    pa_run (TestValSignalsBody); // Test re-invocation after abort
+} pa_end
+
+#endif
+
 } // namespace tests
 
 // Test Driver
@@ -861,6 +903,9 @@ int main(int argc, char* argv[]) {
     run_test(tests, TestEvery);
     run_test(tests, TestLifecycle);
     run_test(tests, TestSignals);
+#if __cplusplus >= 201703L
+    run_test(tests, TestValSignals);
+#endif
 
     std::cout << "Done" << std::endl;