Fixed windows build

Author: daantimmer

cucumber_cpp/library/cucumber_expression/test/TestExpressionParser.cpp

@@ -1,5 +1,4 @@
 #include "cucumber_cpp/library/cucumber_expression/Ast.hpp"
-#include "cucumber_cpp/library/cucumber_expression/Errors.hpp"
 #include "cucumber_cpp/library/cucumber_expression/ExpressionParser.hpp"
 #include "yaml-cpp/node/node.h"
 #include "yaml-cpp/node/parse.h"

cucumber_cpp/library/cucumber_expression/test/TestExpressionTokenizer.cpp

@@ -1,5 +1,4 @@
 #include "cucumber_cpp/library/cucumber_expression/Ast.hpp"
-#include "cucumber_cpp/library/cucumber_expression/Errors.hpp"
 #include "cucumber_cpp/library/cucumber_expression/ExpressionTokenizer.hpp"
 #include "yaml-cpp/node/node.h"
 #include "yaml-cpp/node/parse.h"
@@ -9,9 +8,7 @@
 #include <filesystem>
 #include <format>
 #include <gtest/gtest.h>
-#include <iostream>
 #include <map>
-#include <ostream>
 #include <string>
 #include <string_view>
 #include <utility>

cucumber_cpp/library/tag_expression/Parser.cpp

@@ -21,7 +21,7 @@ namespace cucumber_cpp::library::tag_expression
         void EnsureExpectedTokenType(TokenType tokenType, TokenType expected, std::string_view lastPart)
         {
             if (tokenType != expected)
-                throw Error(std::format(R"(Syntax error. Expected {} after {})", tokenTypeMap.at(expected), lastPart));
+                throw Error(std::format(R"(Syntax error. Expected {} after {})", TokenTypeMap().at(expected), lastPart));
         }
 
         void RequireArgCount(const Token& token, std::deque<std::unique_ptr<Expression>>& expressions, std::size_t number)
@@ -116,10 +116,10 @@ namespace cucumber_cpp::library::tag_expression
 
         const Token* SelectToken(std::string_view expression)
         {
-            if (!tokenMap.contains(expression))
+            if (!TokenMap().contains(expression))
                 return nullptr;
 
-            return &tokenMap.at(expression);
+            return &TokenMap().at(expression);
         }
     }
 

cucumber_cpp/library/tag_expression/Token.hpp

@@ -16,20 +16,19 @@ namespace cucumber_cpp::library::tag_expression
         right
     };
 
-    inline const std::map<Associative, std::string_view> associativeMap{
-        { Associative::left, "left" },
-        { Associative::right, "right" },
-    };
-
     enum struct TokenType
     {
         operand,
         operator_
     };
 
-    inline const std::map<TokenType, std::string_view> tokenTypeMap{
-        { TokenType::operand, "operand" },
-        { TokenType::operator_, "operator" },
+    inline const std::map<TokenType, std::string_view>& TokenTypeMap()
+    {
+        static std::map<TokenType, std::string_view> map{
+            { TokenType::operand, "operand" },
+            { TokenType::operator_, "operator" },
+        };
+        return map;
     };
 
     struct Token
@@ -60,12 +59,16 @@ namespace cucumber_cpp::library::tag_expression
     inline const Token OPEN_PARENTHESIS{ "(", -2, std::nullopt };
     inline const Token CLOSE_PARENTHESIS{ ")", -1, std::nullopt };
 
-    inline const std::map<std::string_view, const Token&> tokenMap{
-        { OR.keyword, OR },
-        { AND.keyword, AND },
-        { NOT.keyword, NOT },
-        { OPEN_PARENTHESIS.keyword, OPEN_PARENTHESIS },
-        { CLOSE_PARENTHESIS.keyword, CLOSE_PARENTHESIS }
+    inline const std::map<std::string_view, const Token&>& TokenMap()
+    {
+        static std::map<std::string_view, const Token&> map{
+            { OR.keyword, OR },
+            { AND.keyword, AND },
+            { NOT.keyword, NOT },
+            { OPEN_PARENTHESIS.keyword, OPEN_PARENTHESIS },
+            { CLOSE_PARENTHESIS.keyword, CLOSE_PARENTHESIS }
+        };
+        return map;
     };
 }