Fix up issues

Fastcode · Oct 26, 2024 · 589469d · 589469d
1 parent 0a58dc6
commit 589469d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 119 deletions.
diff --git a/src/dsl/fusion/PostRunFusion.hpp b/src/dsl/fusion/PostRunFusion.hpp
@@ -32,7 +32,7 @@ namespace NUClear {
 namespace dsl {
     namespace fusion {
 
-        /// Make a SFINAE type to check if a word has a postcondition method
+        /// Make a SFINAE type to check if a word has a post_run method
         HAS_NUCLEAR_DSL_METHOD(post_run);
 
         // Default case where there are no post_run words

diff --git a/src/dsl/fusion/PreRunFusion.hpp b/src/dsl/fusion/PreRunFusion.hpp
@@ -26,12 +26,15 @@
 #include "../../threading/ReactionTask.hpp"
 #include "../operation/DSLProxy.hpp"
 #include "FindWords.hpp"
-#include "has_pre_run.hpp"
+#include "has_nuclear_dsl_method.hpp"
 
 namespace NUClear {
 namespace dsl {
     namespace fusion {
 
+        /// Make a SFINAE type to check if a word has a pre_run method
+        HAS_NUCLEAR_DSL_METHOD(pre_run);
+
         // Default case where there are no pre_run words
         template <typename Words>
         struct PreRunFuser {};

diff --git a/src/dsl/fusion/ScopeFusion.hpp b/src/dsl/fusion/ScopeFusion.hpp
@@ -27,12 +27,15 @@
 #include "../../util/tuplify.hpp"
 #include "../operation/DSLProxy.hpp"
 #include "FindWords.hpp"
-#include "has_scope.hpp"
+#include "has_nuclear_dsl_method.hpp"
 
 namespace NUClear {
 namespace dsl {
     namespace fusion {
 
+        /// Make a SFINAE type to check if a word has a scope method
+        HAS_NUCLEAR_DSL_METHOD(scope);
+
         /**
          * This is our Function Fusion wrapper class that allows it to call scope functions.
          *

diff --git a/src/dsl/fusion/has_pre_run.hpp b/src/dsl/fusion/has_pre_run.hpp
diff --git a/src/dsl/fusion/has_scope.hpp b/src/dsl/fusion/has_scope.hpp