refactored Parameter

Author: daantimmer

cucumber_cpp/library/CMakeLists.txt

@@ -13,6 +13,8 @@ target_sources(cucumber_cpp.library PRIVATE
     HookRegistry.cpp
     HookRegistry.hpp
     Hooks.hpp
+    Parameter.cpp
+    Parameter.hpp
     Query.cpp
     Query.hpp
     Rtrim.cpp

cucumber_cpp/library/Parameter.cpp

@@ -0,0 +1,24 @@
+#include "cucumber_cpp/CucumberCpp.hpp"
+#include <compare>
+#include <set>
+#include <tuple>
+
+namespace cucumber_cpp::library
+{
+    std::strong_ordering ParameterEntry::operator<=>(const ParameterEntry& other) const
+    {
+        return std::tie(params.name, params.regex) <=> std::tie(other.params.name, other.params.regex);
+    }
+
+    ParameterRegistration& ParameterRegistration::Instance()
+    {
+        static ParameterRegistration instance;
+        return instance;
+    }
+
+    const std::set<ParameterEntry>& ParameterRegistration::GetRegisteredParameters() const
+    {
+        return customParameters;
+    }
+
+}

cucumber_cpp/library/Parameter.hpp

@@ -5,23 +5,15 @@
 // IWYU pragma: friend cucumber_cpp/.*
 
 #include "cucumber/messages/group.hpp"
-#include "cucumber_cpp/library/cucumber_expression/MatchRange.hpp"
 #include "cucumber_cpp/library/cucumber_expression/ParameterRegistry.hpp"
-#include <any>
+#include <compare>
 #include <cstddef>
-#include <functional>
 #include <set>
 #include <source_location>
 #include <string>
-#include <string_view>
-#include <tuple>
-#include <utility>
 
 namespace cucumber_cpp::library
 {
-    using ToStringFn = std::function<cucumber::messages::group(cucumber_expression::MatchRange)>;
-    using ToAnyFn = std::function<std::any(const cucumber::messages::group&)>;
-
     struct ParameterEntryParams
     {
         std::string name;
@@ -37,10 +29,7 @@ namespace cucumber_cpp::library
 
         std::source_location location;
 
-        auto operator<=>(const ParameterEntry& other) const
-        {
-            return std::tie(params.name, params.regex) <=> std::tie(other.params.name, other.params.regex);
-        }
+        std::strong_ordering operator<=>(const ParameterEntry& other) const;
     };
 
     struct ParameterRegistration
@@ -49,30 +38,30 @@ namespace cucumber_cpp::library
         ParameterRegistration() = default;
 
     public:
-        static ParameterRegistration& Instance()
-        {
-            static ParameterRegistration instance;
-            return instance;
-        }
+        static ParameterRegistration& Instance();
 
         template<class Transformer, class TReturn>
-        std::size_t Register(ParameterEntryParams params, std::source_location location = std::source_location::current())
-        {
-            customParameters.emplace(params, customParameters.size() + 1, location);
-
-            cucumber_expression::ConverterTypeMap<TReturn>::Instance()[params.name] = Transformer::Transform;
+        std::size_t Register(ParameterEntryParams params, std::source_location location = std::source_location::current());
 
-            return customParameters.size();
-        }
-
-        const std::set<ParameterEntry>& GetRegisteredParameters() const
-        {
-            return customParameters;
-        }
+        const std::set<ParameterEntry>& GetRegisteredParameters() const;
 
     private:
         std::set<ParameterEntry> customParameters;
     };
+
+    ////////////////////
+    // Implementation //
+    ////////////////////
+
+    template<class Transformer, class TReturn>
+    std::size_t ParameterRegistration::Register(ParameterEntryParams params, std::source_location location)
+    {
+        customParameters.emplace(params, customParameters.size() + 1, location);
+
+        cucumber_expression::ConverterTypeMap<TReturn>::Instance()[params.name] = Transformer::Transform;
+
+        return customParameters.size();
+    }
 }
 
 #define PARAMETER_STRUCT CONCAT(ParameterImpl, __LINE__)