revert C++ standard to 20 and improve error handling in expression evaluation

Author: daantimmer

CMakeLists.txt

@@ -33,7 +33,7 @@ if (CCR_BUILD_TESTS)
     ccr_enable_testing()
 endif()
 
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED On)
 set(CMAKE_CXX_EXTENSIONS Off)
 

cucumber_cpp/library/cucumber_expression/Ast.cpp

@@ -2,6 +2,7 @@
 #include <cctype>
 #include <map>
 #include <ranges>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <variant>
@@ -118,7 +119,7 @@ namespace cucumber_cpp::library::cucumber_expression
                 return "invalid";
         }
 
-        std::unreachable();
+        throw std::runtime_error("Invalid token type");
     }
 
     std::string Token::SymbolOf(TokenType type)

cucumber_cpp/library/cucumber_expression/Expression.cpp

@@ -10,6 +10,7 @@
 #include <optional>
 #include <ranges>
 #include <regex>
+#include <stdexcept>
 #include <string>
 #include <string_view>
 #include <utility>
@@ -75,7 +76,7 @@ namespace cucumber_cpp::library::cucumber_expression
                 return RewriteExpression(node);
         }
 
-        std::unreachable();
+        throw std::runtime_error{ "Invalid node type" };
     }
 
     std::string Expression::EscapeRegex(std::string_view text) const

cucumber_cpp/library/cucumber_expression/test/TestExpression.cpp

@@ -9,6 +9,7 @@
 #include <format>
 #include <functional>
 #include <gtest/gtest.h>
+#include <iostream>
 #include <iterator>
 #include <limits>
 #include <optional>
@@ -125,9 +126,9 @@ namespace cucumber_cpp::library::cucumber_expression
 
         parameterRegistry.AddParameter("textAndOrNumber", { R"(([A-Z]+)?(?: )?([0-9]+)?)" }, [](MatchRange matches) -> std::any
             {
-                std::println("matches: {}", std::ranges::distance(matches));
+                std::cout << std::format("matches: {}\n", std::ranges::distance(matches));
                 for (const auto& match : matches)
-                    std::println("match: {}", match.str());
+                    std::cout << std::format("match: {}\n", match.str());
 
                 std::optional<std::string> text{ matches[1].matched ? StringTo<std::string>(matches[1].str()) : std::optional<std::string>{ std::nullopt } };
                 std::optional<std::int64_t> number{ matches[2].matched ? StringTo<std::int64_t>(matches[2].str()) : std::optional<std::int64_t>{ std::nullopt } };

cucumber_cpp/library/test/TestApplication.cpp

@@ -6,7 +6,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <string>
-#include <utility>
+#include <type_traits>
 
 namespace cucumber_cpp::library
 {
@@ -32,39 +32,39 @@ namespace cucumber_cpp::library
 
         const std::array args{ "application" };
 
-        RunWithArgs(args, std::to_underlying(CLI::ExitCodes::RequiredError));
+        RunWithArgs(args, static_cast<std::underlying_type_t<CLI::ExitCodes>>(CLI::ExitCodes::RequiredError));
     }
 
     TEST_F(TestApplication, RunCommandWithoutArguments)
     {
 
         const std::array args{ "application", "run" };
 
-        RunWithArgs(args, std::to_underlying(CLI::ExitCodes::RequiredError));
+        RunWithArgs(args, static_cast<std::underlying_type_t<CLI::ExitCodes>>(CLI::ExitCodes::RequiredError));
     }
 
     TEST_F(TestApplication, RunCommand)
     {
 
         const std::array args{ "application", "run", "--feature", "./", "--report", "console" };
 
-        RunWithArgs(args, std::to_underlying(CLI::ExitCodes::Success));
+        RunWithArgs(args, static_cast<std::underlying_type_t<CLI::ExitCodes>>(CLI::ExitCodes::Success));
     }
 
     TEST_F(TestApplication, DryRunCommand)
     {
 
         const std::array args{ "application", "run", "--feature", "./", "--report", "console", "--dry" };
 
-        RunWithArgs(args, std::to_underlying(CLI::ExitCodes::Success));
+        RunWithArgs(args, static_cast<std::underlying_type_t<CLI::ExitCodes>>(CLI::ExitCodes::Success));
     }
 
     TEST_F(TestApplication, InvalidArgument)
     {
 
         const std::array args{ "application", "run", "--feature", "./", "--report", "console", "--doesntexist" };
 
-        RunWithArgs(args, std::to_underlying(CLI::ExitCodes::ExtrasError));
+        RunWithArgs(args, static_cast<std::underlying_type_t<CLI::ExitCodes>>(CLI::ExitCodes::ExtrasError));
     }
 
     TEST_F(TestApplication, DryRunFeatureFile)
@@ -79,7 +79,7 @@ namespace cucumber_cpp::library
 
         const std::array args{ "application", "run", "--feature", path.c_str(), "--report", "console", "--dry" };
 
-        std::string stdoutString = RunWithArgs(args, std::to_underlying(CLI::ExitCodes::Success));
+        std::string stdoutString = RunWithArgs(args, static_cast<std::underlying_type_t<CLI::ExitCodes>>(CLI::ExitCodes::Success));
 
         EXPECT_THAT(stdoutString, testing::HasSubstr("1/1 passed"));
     }
@@ -96,7 +96,7 @@ namespace cucumber_cpp::library
 
         const std::array args{ "application", "run", "--feature", path.c_str(), "--report", "console" };
 
-        std::string stdoutString = RunWithArgs(args, std::to_underlying(CLI::ExitCodes::Success));
+        std::string stdoutString = RunWithArgs(args, static_cast<std::underlying_type_t<CLI::ExitCodes>>(CLI::ExitCodes::Success));
 
         EXPECT_THAT(stdoutString, testing::HasSubstr("1/1 passed"));
     }