fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[3PP] Replaced cpptoml with tomlplusplus

Browse Source 
Also adjusted code that used cpptoml to be used with toml++ and some more changes
This commit is contained in:
Gliniak
2024-02-26 09:30:54 +01:00
parent d246e3bc70
commit 60b31af811
14 changed files with 243 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/base/cvar.cc
View File

@@ -101,7 +101,7 @@ void ParseLaunchArguments(int& argc, char**& argv,
}
}
namespace toml {
namespace toml_internal {
std::string EscapeBasicString(const std::string_view view) {
std::string result;
@@ -202,7 +202,7 @@ std::string EscapeString(const std::string_view view) {
if (xe::utf8::find_any_of(view, escape_chars) == std::string_view::npos) {
return "'" + std::string(view) + "'";
} else {
return "\"" + toml::EscapeBasicString(view) + "\"";
return "\"" + toml_internal::EscapeBasicString(view) + "\"";
}
} else {
// multi line
@@ -210,11 +210,12 @@ std::string EscapeString(const std::string_view view) {
xe::utf8::find_first_of(view, u8"'''") == std::string_view::npos) {
return "'''\n" + std::string(view) + "'''";
} else {
return u8"\"\"\"\n" + toml::EscapeMultilineBasicString(view) + u8"\"\"\"";
return u8"\"\"\"\n" + toml_internal::EscapeMultilineBasicString(view) +
u8"\"\"\"";
}
}
}
} // namespace toml
} // namespace toml_internal
} // namespace cvar