MSVC's regex implementation is different

Pika-Software · Sep 24, 2023 · aaf73df · aaf73df
1 parent 2a3a2a7
commit aaf73df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/source/compiler.cpp b/source/compiler.cpp
@@ -18,9 +18,9 @@ std::unordered_map<int, int> ParseYueLines(std::string_view code) {
 
     std::unordered_map<int, int> line_map;
     Utils::Split(code, [&](auto line, auto num) {
-        std::match_results<std::string_view::const_iterator> match;
+        std::cmatch match;
         if (std::regex_search(line.cbegin(), line.cend(), match, YUE_LINE_REGEX)) {
-            int source_line = std::atoi(match[1].first);
+            int source_line = std::stoi(match[1].str());
             line_map[num] = source_line;
         }
     });

diff --git a/source/errors.cpp b/source/errors.cpp
@@ -41,11 +41,12 @@ void Errors::TransformStackEntry(GarrysMod::Lua::ILuaGameCallback::CLuaError::St
 std::optional<GarrysMod::Lua::ILuaGameCallback::CLuaError::StackEntry> Errors::TransformErrorMessage(std::string& err) {
     static std::regex ERROR_MESSAGE_REGEX("^(.*?):(\\d+): (.+)$", 
         std::regex_constants::optimize | std::regex_constants::ECMAScript);
+
     std::smatch match;
     if (std::regex_search(err, match, ERROR_MESSAGE_REGEX)) {
         GarrysMod::Lua::ILuaGameCallback::CLuaError::StackEntry entry;
         entry.source = match[1].str();
-        entry.line = std::atoi(match[2].first.base());
+        entry.line = std::stoi(match[2].str());
         std::string message = match[3].str();
 
         TransformStackEntry(entry);