Merge pull request #1 from Neko-Box-Coder/rapidyaml

Rapidyaml Implementation

Author: Neko-Box-Coder

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "CLI11"]
-	path = External/CLI11
-	url = https://github.com/CLIUtils/CLI11.git
 [submodule "ssLogger"]
 	path = External/ssLogger
 	url = https://github.com/Neko-Box-Coder/ssLogger.git
@@ -10,12 +7,12 @@
 [submodule "Embed2C"]
 	path = External/Embed2C
 	url = https://github.com/Neko-Box-Coder/Embed2C.git
-[submodule "yaml-cpp"]
-	path = External/yaml-cpp
-	url = https://github.com/jbeder/yaml-cpp.git
 [submodule "filesystem"]
 	path = External/filesystem
 	url = https://github.com/gulrak/filesystem.git
 [submodule "System2"]
 	path = External/System2
 	url = https://github.com/Neko-Box-Coder/System2.git
+[submodule "rapidyaml"]
+	path = External/rapidyaml
+	url = https://github.com/biojppm/rapidyaml.git

CMakeLists.txt

@@ -9,9 +9,8 @@ set(CMAKE_CXX_STANDARD 11)
 
 option(RUNCPP2_UPDATE_DEFAULT_YAMLS "Update default yaml files" OFF)
 
-add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/CLI11")
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/ssLogger")
-add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/yaml-cpp")
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/rapidyaml")
 
 # =========================================================================
 # filesystem
@@ -80,7 +79,7 @@ add_executable(runcpp2  "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/CompilerInfo
 target_include_directories(runcpp2 PRIVATE  "${CMAKE_CURRENT_LIST_DIR}/Include"
                                             "${CMAKE_CURRENT_LIST_DIR}/External/cfgpath")
 
-target_link_libraries(runcpp2 PRIVATE CLI11::CLI11 ssLogger yaml-cpp ghc_filesystem System2)
+target_link_libraries(runcpp2 PRIVATE ssLogger ghc_filesystem System2 ryml::ryml)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set(STANDARD_COMPILE_FLAGS "/utf-8;/W1")

External/CLI11

@@ -1,7 +1,7 @@
 #ifndef RUNCPP2_DATA_COMPILER_INFO_HPP
 #define RUNCPP2_DATA_COMPILER_INFO_HPP
 
-#include "yaml-cpp/yaml.h"
+#include "ryml.hpp"
 
 #include <string>
 
@@ -25,7 +25,7 @@ namespace runcpp2
 
                 Args CompileArgs;
 
-                bool ParseYAML_Node(YAML::Node& profileNode);
+                bool ParseYAML_Node(ryml::ConstNodeRef& profileNode);
                 std::string ToString(std::string indentation) const;
         };
     }

External/rapidyaml

@@ -4,6 +4,9 @@
 #include "runcpp2/Data/CompilerInfo.hpp"
 #include "runcpp2/Data/LinkerInfo.hpp"
 
+#include "runcpp2/Data/ParseCommon.hpp"
+#include "ryml.hpp"
+
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
@@ -20,15 +23,15 @@ namespace runcpp2
                 std::unordered_set<std::string> FileExtensions;
                 std::unordered_set<std::string> Languages;
                 std::vector<std::string> SetupSteps;
-                std::unordered_map<std::string, std::string> ObjectFileExtensions;
-                std::unordered_map<std::string, std::vector<std::string>> SharedLibraryExtensions;
-                std::unordered_map<std::string, std::vector<std::string>> StaticLibraryExtensions;
-                std::unordered_map<std::string, std::vector<std::string>> DebugSymbolFileExtensions;
+                std::unordered_map<PlatformName, std::string> ObjectFileExtensions;
+                std::unordered_map<PlatformName, std::vector<std::string>> SharedLibraryExtensions;
+                std::unordered_map<PlatformName, std::vector<std::string>> StaticLibraryExtensions;
+                std::unordered_map<PlatformName, std::vector<std::string>> DebugSymbolFileExtensions;
 
                 CompilerInfo Compiler;
                 LinkerInfo Linker;
 
-                bool ParseYAML_Node(YAML::Node& profileNode);
+                bool ParseYAML_Node(ryml::ConstNodeRef& profileNode);
                 std::string ToString(std::string indentation) const;
         };
     }

External/yaml-cpp

@@ -7,6 +7,8 @@
 #include "runcpp2/Data/DependencySetup.hpp"
 #include "runcpp2/Data/ParseCommon.hpp"
 
+#include "ryml.hpp"
+
 #include <string>
 #include <unordered_set>
 
@@ -26,7 +28,7 @@ namespace runcpp2
                 std::unordered_map<ProfileName, DependencyLinkProperty> LinkProperties;
                 std::unordered_map<PlatformName, DependencySetup> Setup;
 
-                bool ParseYAML_Node(YAML::Node& node);
+                bool ParseYAML_Node(ryml::ConstNodeRef& node);
                 std::string ToString(std::string indentation) const;
         };
     }

Include/runcpp2/Data/CompilerInfo.hpp

@@ -2,7 +2,11 @@
 #define RUNCPP2_DATA_DEPENDENCY_LINK_PROPERTY_HPP
 
 #include "runcpp2/Data/ParseCommon.hpp"
-#include "yaml-cpp/yaml.h"
+
+#include "ryml.hpp"
+
+#include <vector>
+#include <unordered_map>
 #include <string>
 
 namespace runcpp2
@@ -17,7 +21,7 @@ namespace runcpp2
                 std::vector<std::string> ExcludeLibraryNames;
                 std::unordered_map<PlatformName, std::vector<std::string>> AdditionalLinkOptions;
 
-                bool ParseYAML_Node(YAML::Node& node);
+                bool ParseYAML_Node(ryml::ConstNodeRef& node);
                 std::string ToString(std::string indentation) const;
         };
     }

Include/runcpp2/Data/CompilerProfile.hpp

@@ -3,7 +3,7 @@
 
 #include "runcpp2/Data/ParseCommon.hpp"
 
-#include "yaml-cpp/yaml.h"
+#include "ryml.hpp"
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -17,7 +17,7 @@ namespace runcpp2
             public:
                 std::unordered_map<ProfileName, std::vector<std::string>> SetupSteps;
 
-                bool ParseYAML_Node(YAML::Node& node);
+                bool ParseYAML_Node(ryml::ConstNodeRef& node);
                 std::string ToString(std::string indentation) const;
         };
     }