From db00552d848bba528f89ab8bb914022e14e88f5f Mon Sep 17 00:00:00 2001 From: anulax1225 Date: Sat, 5 Oct 2024 01:46:14 +0200 Subject: [PATCH] Code update? --- src/bakatools/json/fs_manager.cpp | 10 +++---- src/bakatools/json/fs_manager.h | 4 +-- src/bakatools/json/lexer.cpp | 2 +- src/bakatools/json/lexer.h | 2 +- src/bakatools/json/node.cpp | 48 +++++++++++++++---------------- src/bakatools/json/node.h | 4 +-- src/bakatools/logging/log.cpp | 2 +- src/bakatools/logging/log.h | 2 +- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/bakatools/json/fs_manager.cpp b/src/bakatools/json/fs_manager.cpp index beefd0c..7d45da5 100644 --- a/src/bakatools/json/fs_manager.cpp +++ b/src/bakatools/json/fs_manager.cpp @@ -29,7 +29,7 @@ namespace Bk::Json } } - void FsManager::config_init(int page_size) + void FsManager::config_Init(int page_size) { auto dir = Directory(path); std::string s_config = "\n" @@ -42,7 +42,7 @@ namespace Bk::Json write_config(); } - void FsManager::init(bool force, int page_size) + void FsManager::Init(bool force, int page_size) { auto dir = Directory(path); @@ -50,14 +50,14 @@ namespace Bk::Json if (!dir.exists()) { Directory::create(dir.path()); - config_init(page_size); + config_Init(page_size); } else { File f_conf(path + "/collection.json"); if (!f_conf.exists()) { - config_init(page_size); + config_Init(page_size); } } } @@ -71,7 +71,7 @@ namespace Bk::Json void FsManager::write(File file, Pointer& node) { Type::DataStream data; - auto raw = node->to_string(); + auto raw = node->ToString(); data.push(raw.c_str(), raw.length()); file.write(data); } diff --git a/src/bakatools/json/fs_manager.h b/src/bakatools/json/fs_manager.h index 1f98fb3..8ad8f11 100644 --- a/src/bakatools/json/fs_manager.h +++ b/src/bakatools/json/fs_manager.h @@ -13,8 +13,8 @@ namespace Bk::Json public: FsManager(std::string path); - void init(bool force = false, int page_size = 100); - void config_init(int page_size); + void Init(bool force = false, int page_size = 100); + void config_Init(int page_size); bool exists() { return File(path + "/collection.json").exists(); } void erase() { Directory(path).remove(); } diff --git a/src/bakatools/json/lexer.cpp b/src/bakatools/json/lexer.cpp index ebf2106..21fbdd6 100644 --- a/src/bakatools/json/lexer.cpp +++ b/src/bakatools/json/lexer.cpp @@ -2,7 +2,7 @@ namespace Bk::Json { - std::string Token::to_string() + std::string Token::ToString() { return Tools::string_format("%s %d", this->value, (int)this->type); } diff --git a/src/bakatools/json/lexer.h b/src/bakatools/json/lexer.h index fc9fbdf..0de541b 100644 --- a/src/bakatools/json/lexer.h +++ b/src/bakatools/json/lexer.h @@ -27,7 +27,7 @@ namespace Bk::Json std::string value; TokenType type = TokenType::NULL_TYPE; - std::string to_string(); + std::string ToString(); }; class Lexer diff --git a/src/bakatools/json/node.cpp b/src/bakatools/json/node.cpp index b2c67e6..1f0561b 100644 --- a/src/bakatools/json/node.cpp +++ b/src/bakatools/json/node.cpp @@ -1,29 +1,29 @@ #include "node.h" namespace Bk::Json { - // Node::~Node() - // { - // switch(type) - // { - // case Type::OBJECT: - // { - // delete values.object; - // break; - // } - // case Type::LIST: - // { - // delete values.list; - // break; - // } - // case Type::STRING: - // { - // delete values.s; - // break; - // } - // } - // } + Node::~Node() + { + switch(type) + { + case Type::OBJECT: + { + delete values.object; + break; + } + case Type::LIST: + { + delete values.list; + break; + } + case Type::STRING: + { + delete values.s; + break; + } + } + } - std::string Node::to_string(int indent) + std::string Node::ToString(int indent) { std::string space_string = std::string(indent, ' '); std::string output_string = ""; @@ -54,7 +54,7 @@ namespace Bk::Json output_string += space_string + "[\n"; for (int i = 0; i < (*values.list).size(); i++) { - output_string += get_list()[i]->to_string(indent + 4); + output_string += get_list()[i]->ToString(indent + 4); if (i < (*values.list).size() - 1) { output_string += ",\n"; @@ -69,7 +69,7 @@ namespace Bk::Json for (Object::iterator i = (*values.object).begin(); i != (*values.object).end(); i++) { output_string += space_string + " " + "\"" + i->first + "\"" + ": "; - output_string += i->second->to_string(indent + 4); + output_string += i->second->ToString(indent + 4); Object::iterator next = i; next++; if ((next) != (*values.object).end()) diff --git a/src/bakatools/json/node.h b/src/bakatools/json/node.h index ba86bee..3fae5ba 100644 --- a/src/bakatools/json/node.h +++ b/src/bakatools/json/node.h @@ -23,7 +23,7 @@ namespace Bk::Json NULL_TYPE }; - //~Node(); + ~Node(); Type get_type() { return type; } bool is_type(Type type) { return type == this->type; } @@ -52,7 +52,7 @@ namespace Bk::Json void set_null(); bool is_null(); - std::string to_string(int indent = 0); + std::string ToString(int indent = 0); private: union Values { diff --git a/src/bakatools/logging/log.cpp b/src/bakatools/logging/log.cpp index 10ad424..09b57a2 100644 --- a/src/bakatools/logging/log.cpp +++ b/src/bakatools/logging/log.cpp @@ -5,7 +5,7 @@ namespace Bk { std::shared_ptr Log::p_core_logger; std::shared_ptr Log::p_app_logger; - void Log::init(std::string core, bool file_log) + void Log::Init(std::string core, bool file_log) { std::vector log_sinks; log_sinks.emplace_back(std::make_shared()); diff --git a/src/bakatools/logging/log.h b/src/bakatools/logging/log.h index c79b6c4..90ceb9a 100644 --- a/src/bakatools/logging/log.h +++ b/src/bakatools/logging/log.h @@ -10,7 +10,7 @@ namespace Bk { class Log { public: - static void init(std::string core, bool file_log = false); + static void Init(std::string core, bool file_log = false); static std::shared_ptr& get_core_logger() { return p_core_logger; } static std::shared_ptr& get_app_logger() { return p_app_logger; }