refactor: consolidate error handling by replacing InternalError with Errors.hpp

Author: daantimmer

cucumber_cpp/library/Application.cpp

@@ -1,6 +1,6 @@
 #include "cucumber_cpp/library/Application.hpp"
 #include "cucumber_cpp/library/Context.hpp"
-#include "cucumber_cpp/library/InternalError.hpp"
+#include "cucumber_cpp/library/Errors.hpp"
 #include "cucumber_cpp/library/StepRegistry.hpp"
 #include "cucumber_cpp/library/cucumber_expression/Errors.hpp"
 #include "cucumber_cpp/library/engine/ContextManager.hpp"
@@ -21,7 +21,6 @@
 #include <algorithm>
 #include <exception>
 #include <filesystem>
-#include <format>
 #include <functional>
 #include <iostream>
 #include <iterator>

cucumber_cpp/library/CMakeLists.txt

@@ -5,18 +5,18 @@ add_library(cucumber_cpp.library STATIC ${CCR_EXCLUDE_FROM_ALL})
 target_sources(cucumber_cpp.library PRIVATE
     Application.cpp
     Application.hpp
-    BodyMacro.hpp
     Body.hpp
+    BodyMacro.hpp
     Context.hpp
+    Errors.hpp
     HookRegistry.cpp
     HookRegistry.hpp
     Hooks.hpp
-    InternalError.hpp
     Rtrim.cpp
     Rtrim.hpp
-    Steps.hpp
     StepRegistry.cpp
     StepRegistry.hpp
+    Steps.hpp
     TagExpression.cpp
     TagExpression.hpp
     TagsToSet.hpp

cucumber_cpp/library/Errors.hpp

@@ -0,0 +1,19 @@
+#ifndef LIBRARY_ERRORS_HPP
+#define LIBRARY_ERRORS_HPP
+
+#include <stdexcept>
+
+namespace cucumber_cpp::library
+{
+    struct InternalError : std::runtime_error
+    {
+        using runtime_error::runtime_error;
+    };
+
+    struct UnsupportedAsteriskError : std::runtime_error
+    {
+        using runtime_error::runtime_error;
+    };
+}
+
+#endif

cucumber_cpp/library/InternalError.hpp

@@ -1,5 +1,5 @@
 #include "cucumber_cpp/library/TagExpression.hpp"
-#include "cucumber_cpp/library/InternalError.hpp"
+#include "cucumber_cpp/library/Errors.hpp"
 #include <functional>
 #include <regex>
 #include <set>

cucumber_cpp/library/TagExpression.cpp

@@ -13,7 +13,7 @@
 #include "cucumber/messages/scenario.hpp"
 #include "cucumber/messages/step.hpp"
 #include "cucumber/messages/tag.hpp"
-#include "cucumber_cpp/library/InternalError.hpp"
+#include "cucumber_cpp/library/Errors.hpp"
 #include "cucumber_cpp/library/StepRegistry.hpp"
 #include "cucumber_cpp/library/TagExpression.hpp"
 #include "cucumber_cpp/library/engine/FeatureInfo.hpp"

cucumber_cpp/library/engine/FeatureFactory.cpp

@@ -1,11 +1,10 @@
 #ifndef ENGINE_STRINGTO_HPP
 #define ENGINE_STRINGTO_HPP
 
-#include "cucumber_cpp/library/InternalError.hpp"
+#include "cucumber_cpp/library/Errors.hpp"
 #include <algorithm>
 #include <any>
 #include <cctype>
-#include <source_location>
 #include <sstream>
 #include <string>
 #include <string_view>
@@ -15,18 +14,18 @@ namespace cucumber_cpp::library::engine
 {
 
     template<class To>
-    inline To StringTo(const std::string& s, std::source_location sourceLocation = std::source_location::current())
+    inline To StringTo(const std::string& s)
     {
         std::istringstream stream{ s };
         To to;
         stream >> to;
         if (stream.fail())
-            throw InternalError{ "Cannnot convert parameter \"" + s + "\"", sourceLocation };
+            throw InternalError{ "Cannnot convert parameter \"" + s + "\"" };
         return to;
     }
 
     template<>
-    inline std::string StringTo<std::string>(const std::string& s, std::source_location /*sourceLocation*/)
+    inline std::string StringTo<std::string>(const std::string& s)
     {
         return s;
     }
@@ -46,7 +45,7 @@ namespace cucumber_cpp::library::engine
     }
 
     template<>
-    inline bool StringTo<bool>(const std::string& s, std::source_location /*sourceLocation*/)
+    inline bool StringTo<bool>(const std::string& s)
     {
         using details::iequals;
 

cucumber_cpp/library/engine/StringTo.hpp

@@ -2,7 +2,6 @@
 #define ENGINE_TABLE_HPP
 
 #include "cucumber_cpp/library/engine/StringTo.hpp"
-#include <source_location>
 #include <string>
 #include <utility>
 #include <vector>
@@ -12,9 +11,9 @@ namespace cucumber_cpp::library::engine
     struct TableValue
     {
         template<class T>
-        T As(std::source_location sourceLocation = std::source_location::current()) const
+        T As() const
         {
-            return StringTo<T>(value, sourceLocation);
+            return StringTo<T>(value);
         }
 
         explicit TableValue(std::string value)

cucumber_cpp/library/engine/Table.hpp

@@ -1,4 +1,4 @@
-#include "cucumber_cpp/library/InternalError.hpp"
+#include "cucumber_cpp/library/Errors.hpp"
 #include "cucumber_cpp/library/engine/StringTo.hpp"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"