feat: enhance ParameterRegistry with regex patterns and improve destructor visibility

Author: daantimmer

cucumber_cpp/library/cucumber_expression/ParameterRegistry.cpp

@@ -38,6 +38,13 @@ namespace cucumber_cpp::library::cucumber_expression
                 return str;
             };
         }
+
+        const std::string integerNegativeRegex{ R"__(-?\d+)__" };
+        const std::string integerPositiveRegex{ R"__(\d+)__" };
+        const std::string floatRegex{ R"__((?=.*\d.*)[-+]?\d*(?:\.(?=\d.*))?\d*(?:\d+[E][+-]?\d+)?)__" };
+        const std::string stringDoubleRegex{ R"__("([^\"\\]*(\\.[^\"\\]*)*)")__" };
+        const std::string stringSingleRegex{ R"__('([^'\\]*(\\.[^'\\]*)*)')__" };
+        const std::string wordRegex{ R"__([^\s]+)__" };
     }
 
     std::smatch::const_iterator MatchRange::begin() const
@@ -62,27 +69,20 @@ namespace cucumber_cpp::library::cucumber_expression
 
     ParameterRegistry::ParameterRegistry()
     {
-        const static std::string integerNegativeRegex{ R"__(-?\d+)__" };
-        const static std::string integerPositiveRegex{ R"__(\d+)__" };
-        const static std::string floatRegex{ R"__((?=.*\d.*)[-+]?\d*(?:\.(?=\d.*))?\d*(?:\d+[E][+-]?\d+)?)__" };
-        const static std::string stringDoubleRegex{ R"__("([^\"\\]*(\\.[^\"\\]*)*)")__" };
-        const static std::string stringSingleRegex{ R"__('([^'\\]*(\\.[^'\\]*)*)')__" };
-        const static std::string wordRegex{ R"__([^\s]+)__" };
-
-        ParameterRegistry::Add("int", { integerNegativeRegex, integerPositiveRegex }, CreateStreamConverter<std::int32_t>());
-        ParameterRegistry::Add("float", { floatRegex }, CreateStreamConverter<float>());
-        ParameterRegistry::Add("word", { wordRegex }, CreateStreamConverter<std::string>());
-        ParameterRegistry::Add("string", { stringDoubleRegex, stringSingleRegex }, CreateStringConverter());
-        ParameterRegistry::Add("", { ".*" }, CreateStreamConverter<std::string>());
-        ParameterRegistry::Add("bigdecimal", { floatRegex }, CreateStreamConverter<double>());
-        ParameterRegistry::Add("biginteger", { { integerNegativeRegex, integerPositiveRegex } }, CreateStreamConverter<std::int64_t>());
-        ParameterRegistry::Add("byte", { { integerNegativeRegex, integerPositiveRegex } }, CreateStreamConverter<std::int32_t>());
-        ParameterRegistry::Add("short", { { integerNegativeRegex, integerPositiveRegex } }, CreateStreamConverter<std::int32_t>());
-        ParameterRegistry::Add("long", { { integerNegativeRegex, integerPositiveRegex } }, CreateStreamConverter<std::int64_t>());
-        ParameterRegistry::Add("double", { floatRegex }, CreateStreamConverter<double>());
+        Add("int", { integerNegativeRegex, integerPositiveRegex }, CreateStreamConverter<std::int32_t>());
+        Add("float", { floatRegex }, CreateStreamConverter<float>());
+        Add("word", { wordRegex }, CreateStreamConverter<std::string>());
+        Add("string", { stringDoubleRegex, stringSingleRegex }, CreateStringConverter());
+        Add("", { ".*" }, CreateStreamConverter<std::string>());
+        Add("bigdecimal", { floatRegex }, CreateStreamConverter<double>());
+        Add("biginteger", { { integerNegativeRegex, integerPositiveRegex } }, CreateStreamConverter<std::int64_t>());
+        Add("byte", { { integerNegativeRegex, integerPositiveRegex } }, CreateStreamConverter<std::int32_t>());
+        Add("short", { { integerNegativeRegex, integerPositiveRegex } }, CreateStreamConverter<std::int32_t>());
+        Add("long", { { integerNegativeRegex, integerPositiveRegex } }, CreateStreamConverter<std::int64_t>());
+        Add("double", { floatRegex }, CreateStreamConverter<double>());
 
         // extension
-        ParameterRegistry::Add("bool", { wordRegex }, CreateStreamConverter<bool>());
+        Add("bool", { wordRegex }, CreateStreamConverter<bool>());
     }
 
     Parameter ParameterRegistry::Lookup(const std::string& name) const

cucumber_cpp/library/cucumber_expression/ParameterRegistry.hpp

@@ -122,13 +122,19 @@ namespace cucumber_cpp::library::cucumber_expression
 
     struct ParameterRegistration
     {
+    protected:
+        ~ParameterRegistration() = default;
+
+    public:
         virtual void Add(std::string name, std::vector<std::string> regex, std::function<std::any(MatchRange)> converter) = 0;
     };
 
     struct ParameterRegistry : ParameterRegistration
     {
         ParameterRegistry();
 
+        virtual ~ParameterRegistry() = default;
+
         Parameter Lookup(const std::string& name) const;
         void Add(std::string name, std::vector<std::string> regex, std::function<std::any(MatchRange)> converter) override;