Use boost for JSON parsing

vegastrike · Dec 2, 2024 · cc621ff · cc621ff
1 parent a86672e
commit cc621ff
Show file tree

Hide file tree

Showing 16 changed files with 262 additions and 1,875 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
diff --git a/engine/src/cmd/carrier.cpp b/engine/src/cmd/carrier.cpp
@@ -36,27 +36,13 @@
 #include "vs_logging.h"
 #include "vega_cast_utils.h"
 
-#include "json.h"
 
 // TODO: find out where this is and maybe refactor
 extern int SelectDockPort(Unit *, Unit *parent);
 extern void SwitchUnits(Unit *, Unit *);
 extern void abletodock(int dock);
 
-// Replace with std:sto* here and at unit_csv.cpp
-static double stof(const string &inp, double def = 0) {
-    if (inp.length() != 0) {
-        return XMLSupport::parse_float(inp);
-    }
-    return def;
-}
 
-static int stoi(const string &inp, int def = 0) {
-    if (inp.length() != 0) {
-        return XMLSupport::parse_int(inp);
-    }
-    return def;
-}
 
 // TODO: probably replace with a lambda expression
 class CatCompare {

diff --git a/engine/src/cmd/controls_factory.cpp b/engine/src/cmd/controls_factory.cpp
@@ -31,11 +31,12 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <boost/json.hpp>
 
-#include "json.h"
 #include "drawable.h"
 #include "vs_globals.h"
 #include "configxml.h"
+#include "resource/json_utils.h"
 
 #include "gui/staticdisplay.h"
 #include "gui/newbutton.h"
@@ -55,24 +56,34 @@ std::map<std::string, std::map<std::string, std::string>> parseControlsJSON(VSFi
 
     std::map<std::string, std::map<std::string, std::string>> controls_map;
 
-    std::vector<std::string> controls_json = json::parsing::parse_array(json_text.c_str());
-     
-    // Iterate over root
-    for (const std::string &control_text : controls_json) {
-        json::jobject control_json = json::jobject::parse(control_text);
+    boost::json::value json_value = boost::json::parse(json_text);
+    boost::json::array root_array = json_value.get_array();
+
+    for(boost::json::value& control_value : root_array) {
+        boost::json::object control = control_value.get_object();
         std::map<std::string, std::string> control_attributes;
 
         for (const std::string &key : keys) {
-            // For some reason, parser adds quotes
-            if(control_json.has_key(key)) {
-                const std::string attribute = control_json.get(key);
-                const std::string stripped_attribute = attribute.substr(1, attribute.size() - 2);
-                control_attributes[key] = stripped_attribute;
-            } 
-        }
+            if(!control.if_contains(key)) {
+                continue;
+            }
 
+            // Worked in singleson because it saw everything as string.
+            if(key == "multiline") {
+                bool multiline = JsonGetWithDefault(control, key, false);
+                if(multiline) {
+                    control_attributes["multiline"] = "true";
+                } else {
+                    control_attributes["multiline"] = "false";
+                }
+            } else {
+                const std::string attribute = JsonGetStringWithDefault(control, key, "");
+                control_attributes[key] = attribute;
+            }
+        }
+
         controls_map[control_attributes["name"]] = control_attributes;
-    }
+    } 
 
     return controls_map;
 }