From 8bea03e0811588e741050b598b8123865b333999 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Tue, 4 Nov 2025 22:06:39 +0800 Subject: Move toml to base. --- src/CMakeLists.txt | 2 -- src/base/CMakeLists.txt | 2 ++ src/base/toml/TomlDocument.cpp | 51 ++++++++++++++++++++++++++++++++++++++++++ src/base/toml/TomlParser.cpp | 46 +++++++++++++++++++++++++++++++++++++ src/toml/CMakeLists.txt | 6 ----- src/toml/TomlDocument.cpp | 49 ---------------------------------------- src/toml/TomlParser.cpp | 45 ------------------------------------- 7 files changed, 99 insertions(+), 102 deletions(-) create mode 100644 src/base/toml/TomlDocument.cpp create mode 100644 src/base/toml/TomlParser.cpp delete mode 100644 src/toml/CMakeLists.txt delete mode 100644 src/toml/TomlDocument.cpp delete mode 100644 src/toml/TomlParser.cpp (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f9c205f..d4df1752 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,4 @@ add_subdirectory(base) add_subdirectory(platform) add_subdirectory(ui) add_subdirectory(parse) -add_subdirectory(toml) - add_subdirectory(ThemeBuilder) diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index ef5afe3c..3cffb125 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -14,6 +14,8 @@ add_library(CruBase io/MemoryStream.cpp log/Logger.cpp log/StdioLogTarget.cpp + toml/TomlDocument.cpp + toml/TomlParser.cpp xml/XmlNode.cpp xml/XmlParser.cpp ) diff --git a/src/base/toml/TomlDocument.cpp b/src/base/toml/TomlDocument.cpp new file mode 100644 index 00000000..fa155c80 --- /dev/null +++ b/src/base/toml/TomlDocument.cpp @@ -0,0 +1,51 @@ +#include "cru/base/toml/TomlDocument.h" + +namespace cru::toml { +std::optional TomlSection::GetValue(const std::string& key) const { + auto it = values_.find(key); + if (it == values_.end()) { + return std::nullopt; + } + return it->second; +} + +void TomlSection::SetValue(const std::string& key, std::string value) { + values_[key] = std::move(value); +} + +void TomlSection::DeleteValue(const std::string& key) { values_.erase(key); } + +TomlSection* TomlDocument::GetSection(const std::string& name) { + auto it = sections_.find(name); + if (it == sections_.end()) { + return nullptr; + } + return &it->second; +} + +const TomlSection* TomlDocument::GetSection(const std::string& name) const { + auto it = sections_.find(name); + if (it == sections_.end()) { + return nullptr; + } + return &it->second; +} + +TomlSection* TomlDocument::GetSectionOrCreate(const std::string& name) { + auto it = sections_.find(name); + if (it == sections_.end()) { + sections_[name] = TomlSection(); + return §ions_[name]; + } + return &it->second; +} + +void TomlDocument::SetSection(const std::string& name, TomlSection section) { + sections_[name] = std::move(section); +} + +void TomlDocument::DeleteSection(const std::string& name) { + sections_.erase(name); +} + +} // namespace cru::toml diff --git a/src/base/toml/TomlParser.cpp b/src/base/toml/TomlParser.cpp new file mode 100644 index 00000000..a45af712 --- /dev/null +++ b/src/base/toml/TomlParser.cpp @@ -0,0 +1,46 @@ +#include "cru/base/toml/TomlParser.h" +#include "cru/base/StringUtil.h" +#include "cru/base/toml/TomlDocument.h" + +namespace cru::toml { +TomlParser::TomlParser(std::string input) : input_(std::move(input)) {} + +TomlParser::~TomlParser() = default; + +TomlDocument TomlParser::Parse() { + if (cache_) { + return *cache_; + } + + cache_ = TomlDocument(); + DoParse(*cache_); + return *cache_; +} + +void TomlParser::DoParse(TomlDocument& document) { + std::vector lines = + cru::string::Split(input_, "\n", cru::string::SplitOptions::RemoveSpace); + + std::string current_section_name; + + for (auto& line : lines) { + line = cru::string::Trim(line); + if (line.starts_with("[") && line.ends_with("]")) { + current_section_name = line.substr(1, line.size() - 2); + } else if (line.starts_with("#")) { + // Ignore comments. + } else { + auto equal_index = line.find('='); + + if (equal_index == std::string::npos) { + throw TomlParsingException("Invalid TOML line: " + line); + } + + auto key = cru::string::Trim(line.substr(0, equal_index)); + auto value = cru::string::Trim(line.substr(equal_index + 1)); + + document.GetSectionOrCreate(current_section_name)->SetValue(key, value); + } + } +} +} // namespace cru::toml diff --git a/src/toml/CMakeLists.txt b/src/toml/CMakeLists.txt deleted file mode 100644 index 33b31b8f..00000000 --- a/src/toml/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_library(CruToml - TomlDocument.cpp - TomlParser.cpp -) -target_compile_definitions(CruToml PRIVATE CRU_TOML_EXPORT_API) -target_link_libraries(CruToml PUBLIC CruBase) diff --git a/src/toml/TomlDocument.cpp b/src/toml/TomlDocument.cpp deleted file mode 100644 index af9e2ac8..00000000 --- a/src/toml/TomlDocument.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "cru/toml/TomlDocument.h" - -namespace cru::toml { -std::optional TomlSection::GetValue(const std::string& key) const { - auto it = values_.find(key); - if (it == values_.end()) { - return std::nullopt; - } - return it->second; -} - -void TomlSection::SetValue(const std::string& key, std::string value) { - values_[key] = std::move(value); -} - -void TomlSection::DeleteValue(const std::string& key) { values_.erase(key); } - -TomlSection* TomlDocument::GetSection(const std::string& name) { - auto it = sections_.find(name); - if (it == sections_.end()) { - return nullptr; - } - return &it->second; -} - -const TomlSection* TomlDocument::GetSection(const std::string& name) const { - auto it = sections_.find(name); - if (it == sections_.end()) { - return nullptr; - } - return &it->second; -} - -TomlSection* TomlDocument::GetSectionOrCreate(const std::string& name) { - auto it = sections_.find(name); - if (it == sections_.end()) { - sections_[name] = TomlSection(); - return §ions_[name]; - } - return &it->second; -} - -void TomlDocument::SetSection(const std::string& name, TomlSection section) { - sections_[name] = std::move(section); -} - -void TomlDocument::DeleteSection(const std::string& name) { sections_.erase(name); } - -} // namespace cru::toml diff --git a/src/toml/TomlParser.cpp b/src/toml/TomlParser.cpp deleted file mode 100644 index 1aea5b73..00000000 --- a/src/toml/TomlParser.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "cru/toml/TomlParser.h" -#include "cru/base/StringUtil.h" -#include "cru/toml/TomlDocument.h" - -namespace cru::toml { -TomlParser::TomlParser(std::string input) : input_(std::move(input)) {} - -TomlParser::~TomlParser() = default; - -TomlDocument TomlParser::Parse() { - if (cache_) { - return *cache_; - } - - cache_ = TomlDocument(); - DoParse(*cache_); - return *cache_; -} - -void TomlParser::DoParse(TomlDocument& document) { - std::vector lines = cru::string::Split(input_, "\n", cru::string::SplitOptions::RemoveSpace); - - std::string current_section_name; - - for (auto& line : lines) { - line = cru::string::Trim(line); - if (line.starts_with("[") && line.ends_with("]")) { - current_section_name = line.substr(1, line.size() - 2); - } else if (line.starts_with("#")) { - // Ignore comments. - } else { - auto equal_index = line.find('='); - - if (equal_index == std::string::npos) { - throw TomlParsingException("Invalid TOML line: " + line); - } - - auto key = cru::string::Trim(line.substr(0, equal_index)); - auto value = cru::string::Trim(line.substr(equal_index + 1)); - - document.GetSectionOrCreate(current_section_name)->SetValue(key, value); - } - } -} -} // namespace cru::toml -- cgit v1.2.3