refactor RemoveIncompatibilities to enhance iteration logic and ensure proper handling of JSON elements

Author: daantimmer

compatibility/compatibility.cpp

@@ -60,8 +60,7 @@ namespace compatibility
 
         void RemoveIncompatibilities(nlohmann::json& json)
         {
-
-            for (auto jsonIter = json.begin(); jsonIter != json.end(); ++jsonIter)
+            for (auto jsonIter = json.begin(); jsonIter != json.end();)
             {
                 const auto& key = jsonIter.key();
                 auto& value = jsonIter.value();
@@ -77,23 +76,24 @@ namespace compatibility
                 else if (value.is_object())
                 {
                     RemoveIncompatibilities(value);
+                    ++jsonIter;
                 }
                 else if (value.is_array())
                 {
-                    auto idx = 0;
                     for (auto valueIter = value.begin(); valueIter != value.end();)
                     {
-                        auto& item = *valueIter;
-
-                        if (item.is_object())
-                            RemoveIncompatibilities(item);
+                        if (valueIter->is_object())
+                            RemoveIncompatibilities(*valueIter);
 
                         ++valueIter;
                     }
+
+                    ++jsonIter;
                 }
                 else if (key == "data")
                 {
                     json[key] = std::regex_replace(json[key].get<std::string>(), std::regex(R"(\r\n)"), "\n");
+                    ++jsonIter;
                 }
                 else if (key == "uri")
                 {
@@ -103,7 +103,11 @@ namespace compatibility
                     uri = std::regex_replace(uri, std::regex(R"(\.ts$)"), ".cpp");
 
                     json[key] = std::filesystem::canonical(uri).string();
+
+                    ++jsonIter;
                 }
+                else
+                    ++jsonIter;
             }
         }