Review changes

Neko-Box-Coder · Neko-Box-Coder · commit 14a386dde291 · 2024-03-20T00:13:11.000Z
diff --git a/Src/runcpp2/ConfigParsing.cpp b/Src/runcpp2/ConfigParsing.cpp
@@ -1,6 +1,4 @@
 #include "runcpp2/ConfigParsing.hpp"
-
-//#include "ryml_std.hpp"
 #include "runcpp2/ParseUtil.hpp"
 #include "ryml.hpp"
 #include "c4/std/string.hpp"
@@ -20,6 +18,7 @@ namespace
                                 std::vector<runcpp2::Data::CompilerProfile>& outProfiles,
                                 std::string& outPreferredProfile)
     {
+        //TODO: Use callback once ryml noexcept are dropped
         #if 0
             ryml::Callbacks cb;
             auto errorCallback = [](const char* msg, 
@@ -181,6 +180,7 @@ bool runcpp2::ParseScriptInfo(  const std::string& scriptInfo,
     if(scriptInfo.empty())
         return true;
 
+    //TODO: Use callback once ryml noexcept are dropped
     #if 0
         ryml::Callbacks cb;
         auto errorCallback = [](const char* msg, 
diff --git a/Src/runcpp2/Data/CompilerInfo.cpp b/Src/runcpp2/Data/CompilerInfo.cpp
@@ -5,6 +5,8 @@
 
 bool runcpp2::Data::CompilerInfo::ParseYAML_Node(ryml::ConstNodeRef& profileNode)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+    
     std::vector<NodeRequirement> requirements = 
     {
         NodeRequirement("Executable", ryml::NodeType_e::KEYVAL, true, false),
@@ -42,6 +44,8 @@ bool runcpp2::Data::CompilerInfo::ParseYAML_Node(ryml::ConstNodeRef& profileNode
     compileArgsNode["InputPart"] >> CompileArgs.InputPart;
     compileArgsNode["OutputPart"] >> CompileArgs.OutputPart;
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::CompilerInfo::ToString(std::string indentation) const
diff --git a/Src/runcpp2/Data/CompilerProfile.cpp b/Src/runcpp2/Data/CompilerProfile.cpp
@@ -5,6 +5,8 @@
 
 bool runcpp2::Data::CompilerProfile::ParseYAML_Node(ryml::ConstNodeRef& profileNode)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+
     std::vector<NodeRequirement> requirements =
     {
         NodeRequirement("Name", ryml::NodeType_e::KEYVAL, true, false),
@@ -103,6 +105,8 @@ bool runcpp2::Data::CompilerProfile::ParseYAML_Node(ryml::ConstNodeRef& profileN
     }
     
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::CompilerProfile::ToString(std::string indentation) const
diff --git a/Src/runcpp2/Data/DependencyInfo.cpp b/Src/runcpp2/Data/DependencyInfo.cpp
@@ -5,6 +5,8 @@
 
 bool runcpp2::Data::DependencyInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+    
     std::vector<NodeRequirement> requirements =
     {
         NodeRequirement("Name", ryml::NodeType_e::KEYVAL, true, false),
@@ -98,6 +100,8 @@ bool runcpp2::Data::DependencyInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
     }
     
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::DependencyInfo::ToString(std::string indentation) const
diff --git a/Src/runcpp2/Data/DependencyLinkProperty.cpp b/Src/runcpp2/Data/DependencyLinkProperty.cpp
@@ -5,6 +5,8 @@
 
 bool runcpp2::Data::DependencyLinkProperty::ParseYAML_Node(ryml::ConstNodeRef& node)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+    
     if(!node.is_map())
     {
         ssLOG_ERROR("DependencySearchProperty: Node is not a Map");
@@ -57,6 +59,8 @@ bool runcpp2::Data::DependencyLinkProperty::ParseYAML_Node(ryml::ConstNodeRef& n
     }
 
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::DependencyLinkProperty::ToString(std::string indentation) const
diff --git a/Src/runcpp2/Data/DependencySetup.cpp b/Src/runcpp2/Data/DependencySetup.cpp
@@ -5,6 +5,8 @@
 
 bool runcpp2::Data::DependencySetup::ParseYAML_Node(ryml::ConstNodeRef& node)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+    
     if(!node.is_map())
     {
         ssLOG_ERROR("DependencySetup: Node is not a Map");
@@ -25,6 +27,8 @@ bool runcpp2::Data::DependencySetup::ParseYAML_Node(ryml::ConstNodeRef& node)
     }
     
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::DependencySetup::ToString(std::string indentation) const
diff --git a/Src/runcpp2/Data/DependencySource.cpp b/Src/runcpp2/Data/DependencySource.cpp
@@ -5,6 +5,8 @@
 
 bool runcpp2::Data::DependencySource::ParseYAML_Node(ryml::ConstNodeRef& node)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+    
     std::vector<NodeRequirement> requirements =
     {
         NodeRequirement("Type", ryml::NodeType_e::KEYVAL, true, false),
@@ -31,6 +33,8 @@ bool runcpp2::Data::DependencySource::ParseYAML_Node(ryml::ConstNodeRef& node)
     
     node["Value"] >> Value;
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::DependencySource::ToString(std::string indentation) const
diff --git a/Src/runcpp2/Data/FlagsOverrideInfo.cpp b/Src/runcpp2/Data/FlagsOverrideInfo.cpp
@@ -5,6 +5,8 @@
 
 bool runcpp2::Data::FlagsOverrideInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+
     std::vector<NodeRequirement> requirements =
     {
         NodeRequirement("Remove", ryml::NodeType_e::KEYVAL, false, true),
@@ -24,6 +26,8 @@ bool runcpp2::Data::FlagsOverrideInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
         node["Append"] >> Append;
     
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::FlagsOverrideInfo::ToString(std::string indentation) const
diff --git a/Src/runcpp2/Data/LinkerInfo.cpp b/Src/runcpp2/Data/LinkerInfo.cpp
@@ -6,6 +6,8 @@
 
 bool runcpp2::Data::LinkerInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+    
     std::vector<NodeRequirement> requirements = 
     {
         NodeRequirement("Executable", ryml::NodeType_e::KEYVAL, true, false),
@@ -40,6 +42,8 @@ bool runcpp2::Data::LinkerInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
     linkerArgsNode["DependenciesPart"] >> LinkerArgs.DependenciesPart;
     
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::LinkerInfo::ToString(std::string indentation) const
diff --git a/Src/runcpp2/Data/ScriptInfo.cpp b/Src/runcpp2/Data/ScriptInfo.cpp
@@ -5,6 +5,8 @@
 
 bool runcpp2::Data::ScriptInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
 {
+    INTERNAL_RUNCPP2_SAFE_START();
+    
     std::vector<NodeRequirement> requirements =
     {
         NodeRequirement("Language", ryml::NodeType_e::KEYVAL, false, true),
@@ -95,6 +97,8 @@ bool runcpp2::Data::ScriptInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
     }
     
     return true;
+    
+    INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
 std::string runcpp2::Data::ScriptInfo::ToString(std::string indentation) const
diff --git a/Src/runcpp2/ParseUtil.cpp b/Src/runcpp2/ParseUtil.cpp
@@ -243,6 +243,9 @@ bool runcpp2::ResolveYAML_Stream(   ryml::Tree& rootTree,
 {
     INTERNAL_RUNCPP2_SAFE_START();
     
+    //Resolve the merge keys in the yaml first
+    rootTree.resolve();
+    
     std::string temp;
     
     if(rootTree.rootref().is_stream())

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`bool runcpp2::Data::CompilerInfo::ParseYAML_Node(ryml::ConstNodeRef& profileNode)`
`7`	`7`	`{`
	`8`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`9`	`+`
`8`	`10`	`std::vector<NodeRequirement> requirements =`
`9`	`11`	`{`
`10`	`12`	`NodeRequirement("Executable", ryml::NodeType_e::KEYVAL, true, false),`
`@@ -42,6 +44,8 @@ bool runcpp2::Data::CompilerInfo::ParseYAML_Node(ryml::ConstNodeRef& profileNode`
`42`	`44`	`compileArgsNode["InputPart"] >> CompileArgs.InputPart;`
`43`	`45`	`compileArgsNode["OutputPart"] >> CompileArgs.OutputPart;`
`44`	`46`	`return true;`
	`47`	`+`
	`48`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`45`	`49`	`}`
`46`	`50`
`47`	`51`	`std::string runcpp2::Data::CompilerInfo::ToString(std::string indentation) const`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`bool runcpp2::Data::CompilerProfile::ParseYAML_Node(ryml::ConstNodeRef& profileNode)`
`7`	`7`	`{`
	`8`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`9`	`+`
`8`	`10`	`std::vector<NodeRequirement> requirements =`
`9`	`11`	`{`
`10`	`12`	`NodeRequirement("Name", ryml::NodeType_e::KEYVAL, true, false),`
`@@ -103,6 +105,8 @@ bool runcpp2::Data::CompilerProfile::ParseYAML_Node(ryml::ConstNodeRef& profileN`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`return true;`
	`108`	`+`
	`109`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`106`	`110`	`}`
`107`	`111`
`108`	`112`	`std::string runcpp2::Data::CompilerProfile::ToString(std::string indentation) const`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`bool runcpp2::Data::DependencyInfo::ParseYAML_Node(ryml::ConstNodeRef& node)`
`7`	`7`	`{`
	`8`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`9`	`+`
`8`	`10`	`std::vector<NodeRequirement> requirements =`
`9`	`11`	`{`
`10`	`12`	`NodeRequirement("Name", ryml::NodeType_e::KEYVAL, true, false),`
`@@ -98,6 +100,8 @@ bool runcpp2::Data::DependencyInfo::ParseYAML_Node(ryml::ConstNodeRef& node)`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`return true;`
	`103`	`+`
	`104`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`101`	`105`	`}`
`102`	`106`
`103`	`107`	`std::string runcpp2::Data::DependencyInfo::ToString(std::string indentation) const`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`bool runcpp2::Data::DependencyLinkProperty::ParseYAML_Node(ryml::ConstNodeRef& node)`
`7`	`7`	`{`
	`8`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`9`	`+`
`8`	`10`	`if(!node.is_map())`
`9`	`11`	`{`
`10`	`12`	`ssLOG_ERROR("DependencySearchProperty: Node is not a Map");`
`@@ -57,6 +59,8 @@ bool runcpp2::Data::DependencyLinkProperty::ParseYAML_Node(ryml::ConstNodeRef& n`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`return true;`
	`62`	`+`
	`63`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`60`	`64`	`}`
`61`	`65`
`62`	`66`	`std::string runcpp2::Data::DependencyLinkProperty::ToString(std::string indentation) const`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`bool runcpp2::Data::DependencySetup::ParseYAML_Node(ryml::ConstNodeRef& node)`
`7`	`7`	`{`
	`8`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`9`	`+`
`8`	`10`	`if(!node.is_map())`
`9`	`11`	`{`
`10`	`12`	`ssLOG_ERROR("DependencySetup: Node is not a Map");`
`@@ -25,6 +27,8 @@ bool runcpp2::Data::DependencySetup::ParseYAML_Node(ryml::ConstNodeRef& node)`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`return true;`
	`30`	`+`
	`31`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`28`	`32`	`}`
`29`	`33`
`30`	`34`	`std::string runcpp2::Data::DependencySetup::ToString(std::string indentation) const`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`bool runcpp2::Data::DependencySource::ParseYAML_Node(ryml::ConstNodeRef& node)`
`7`	`7`	`{`
	`8`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`9`	`+`
`8`	`10`	`std::vector<NodeRequirement> requirements =`
`9`	`11`	`{`
`10`	`12`	`NodeRequirement("Type", ryml::NodeType_e::KEYVAL, true, false),`
`@@ -31,6 +33,8 @@ bool runcpp2::Data::DependencySource::ParseYAML_Node(ryml::ConstNodeRef& node)`
`31`	`33`
`32`	`34`	`node["Value"] >> Value;`
`33`	`35`	`return true;`
	`36`	`+`
	`37`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`34`	`38`	`}`
`35`	`39`
`36`	`40`	`std::string runcpp2::Data::DependencySource::ToString(std::string indentation) const`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`bool runcpp2::Data::FlagsOverrideInfo::ParseYAML_Node(ryml::ConstNodeRef& node)`
`7`	`7`	`{`
	`8`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`9`	`+`
`8`	`10`	`std::vector<NodeRequirement> requirements =`
`9`	`11`	`{`
`10`	`12`	`NodeRequirement("Remove", ryml::NodeType_e::KEYVAL, false, true),`
`@@ -24,6 +26,8 @@ bool runcpp2::Data::FlagsOverrideInfo::ParseYAML_Node(ryml::ConstNodeRef& node)`
`24`	`26`	`node["Append"] >> Append;`
`25`	`27`
`26`	`28`	`return true;`
	`29`	`+`
	`30`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`27`	`31`	`}`
`28`	`32`
`29`	`33`	`std::string runcpp2::Data::FlagsOverrideInfo::ToString(std::string indentation) const`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`bool runcpp2::Data::LinkerInfo::ParseYAML_Node(ryml::ConstNodeRef& node)`
`8`	`8`	`{`
	`9`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`10`	`+`
`9`	`11`	`std::vector<NodeRequirement> requirements =`
`10`	`12`	`{`
`11`	`13`	`NodeRequirement("Executable", ryml::NodeType_e::KEYVAL, true, false),`
`@@ -40,6 +42,8 @@ bool runcpp2::Data::LinkerInfo::ParseYAML_Node(ryml::ConstNodeRef& node)`
`40`	`42`	`linkerArgsNode["DependenciesPart"] >> LinkerArgs.DependenciesPart;`
`41`	`43`
`42`	`44`	`return true;`
	`45`	`+`
	`46`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`43`	`47`	`}`
`44`	`48`
`45`	`49`	`std::string runcpp2::Data::LinkerInfo::ToString(std::string indentation) const`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`bool runcpp2::Data::ScriptInfo::ParseYAML_Node(ryml::ConstNodeRef& node)`
`7`	`7`	`{`
	`8`	`+ INTERNAL_RUNCPP2_SAFE_START();`
	`9`	`+`
`8`	`10`	`std::vector<NodeRequirement> requirements =`
`9`	`11`	`{`
`10`	`12`	`NodeRequirement("Language", ryml::NodeType_e::KEYVAL, false, true),`
`@@ -95,6 +97,8 @@ bool runcpp2::Data::ScriptInfo::ParseYAML_Node(ryml::ConstNodeRef& node)`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`return true;`
	`100`	`+`
	`101`	`+ INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`98`	`102`	`}`
`99`	`103`
`100`	`104`	`std::string runcpp2::Data::ScriptInfo::ToString(std::string indentation) const`