diff --git a/src/bakatools/json/fs_manager.cpp b/src/bakatools/json/fs_manager.cpp index 13ec674..82c5779 100644 --- a/src/bakatools/json/fs_manager.cpp +++ b/src/bakatools/json/fs_manager.cpp @@ -31,7 +31,6 @@ namespace Bk::Json void FsManager::config_init(int page_size) { - BK_INFO("CACA"); auto dir = Directory(path); std::string s_config = "\n" "{\n" @@ -39,10 +38,7 @@ namespace Bk::Json " \"id_count\": 0,\n" " \"page_size\": " + std::to_string(page_size) + "\n" "}"; - - BK_INFO(s_config); config = Parser(s_config).parse(); - BK_INFO("ff"); write_config(); } @@ -53,7 +49,6 @@ namespace Bk::Json if (dir.exists() && force) dir = dir.remove(); if (!dir.exists()) { - BK_INFO("CACA"); Directory::create(dir.path()); config_init(page_size); } diff --git a/src/bakatools/json/node.h b/src/bakatools/json/node.h index 29beb34..07c18c8 100644 --- a/src/bakatools/json/node.h +++ b/src/bakatools/json/node.h @@ -57,6 +57,6 @@ namespace Bk::Json bool bValue; }; Values values; - Type type; + Type type = Type::NULL_TYPE; }; } \ No newline at end of file diff --git a/src/bakatools/json/parser.cpp b/src/bakatools/json/parser.cpp index 11b9d3b..9668ec3 100644 --- a/src/bakatools/json/parser.cpp +++ b/src/bakatools/json/parser.cpp @@ -4,6 +4,8 @@ namespace Bk::Json { Parser::Parser(File& file) { + root = Pointer(new Node()); + root->set_null(); Type::DataStream data; if (file.exists()) { @@ -15,6 +17,8 @@ namespace Bk::Json Parser::Parser(const char* str, int length) { + root = Pointer(new Node()); + root->set_null(); Type::DataStream data; data.push(str, length); data.reverse(); @@ -23,8 +27,10 @@ namespace Bk::Json Parser::Parser(const std::string& str) { + root = Pointer(new Node()); + root->set_null(); Type::DataStream data; - data.payload = std::vector(str.c_str(), str.c_str() + str.length()); + data.payload = std::vector(str.begin(), str.end()); data.reverse(); lexer = Lexer(data); } @@ -32,9 +38,7 @@ namespace Bk::Json Pointer Parser::parse() { Token token; - BK_INFO("LALA"); while (lexer.has_more_tokens()) { - BK_INFO("LALA"); try { token = lexer.get_token(); @@ -87,7 +91,7 @@ namespace Bk::Json Pointer Parser::parse_list() { - Pointer node = Pointer(); + Pointer node = Pointer(new Node()); Json::List* list = new Json::List(); bool has_completed = false; Token next_token; @@ -148,7 +152,7 @@ namespace Bk::Json Pointer Parser::parse_object() { std::string key = ""; - Pointer node = Pointer(); + Pointer node = Pointer(new Node()); Json::Object *key_object_map = new Json::Object(); bool has_completed = false; bool no_key = true; @@ -160,6 +164,7 @@ namespace Bk::Json if (no_key) { next_token = lexer.get_token(); + if (next_token.type == TokenType::CURLY_CLOSE) { has_completed = true; @@ -173,7 +178,6 @@ namespace Bk::Json next_token = lexer.get_token(); if (next_token.type == TokenType::COLON || next_token.type == TokenType::COMMA) continue; - Pointer node; switch (next_token.type) { case TokenType::STRING: @@ -189,7 +193,7 @@ namespace Bk::Json case TokenType::NUMBER: { (*key_object_map)[key] = parse_number(); - break; + break; } case TokenType::CURLY_OPEN: { @@ -227,7 +231,7 @@ namespace Bk::Json Pointer Parser::parse_string() { - Pointer node = Pointer(); + Pointer node = Pointer(new Node()); Token token = lexer.roll_back_token(); std::string *sValue = new std::string(token.value); node->set_string(sValue); @@ -236,7 +240,7 @@ namespace Bk::Json Pointer Parser::parse_number() { - Pointer node = Pointer(); + Pointer node = Pointer(new Node()); Token token = lexer.roll_back_token(); float fValue = std::stof(token.value); node->set_float(fValue); @@ -245,7 +249,7 @@ namespace Bk::Json Pointer Parser::parse_boolean() { - Pointer node = Pointer(); + Pointer node = Pointer(new Node()); Token token = lexer.roll_back_token(); bool bValue = token.value == "True" ? true : false; node->set_bool(bValue); @@ -254,7 +258,7 @@ namespace Bk::Json Pointer Parser::parse_null() { - Pointer node = Pointer(); + Pointer node = Pointer(new Node()); Token token = lexer.roll_back_token(); node->set_null(); return node; diff --git a/src/bakatools/logging/log.h b/src/bakatools/logging/log.h index a4e0231..c79b6c4 100644 --- a/src/bakatools/logging/log.h +++ b/src/bakatools/logging/log.h @@ -21,26 +21,26 @@ namespace Bk { #define BK_STATIC_CORE_TRACE(...) Log::get_core_logger()->trace(__VA_ARGS__) #define BK_STATIC_CORE_INFO(...) Log::get_core_logger()->info(__VA_ARGS__) - #define BK_STATIC_CORE_WARNING(...) Log::get_core_logger()->warning(__VA_ARGS__) + #define BK_STATIC_CORE_WARNING(...) Log::get_core_logger()->warn(__VA_ARGS__) #define BK_STATIC_CORE_ERROR(...) Log::get_core_logger()->error(__VA_ARGS__) #define BK_STATIC_CORE_CRITICAL(...) Log::get_core_logger()->critical(__VA_ARGS__) #define BK_STATIC_TRACE(...) Bk::Log::get_app_logger()->trace(__VA_ARGS__) #define BK_STATIC_INFO(...) Bk::Log::get_app_logger()->info(__VA_ARGS__) - #define BK_STATIC_WARNING(...) Bk::Log::get_app_logger()->warning(__VA_ARGS__) + #define BK_STATIC_WARNING(...) Bk::Log::get_app_logger()->warn(__VA_ARGS__) #define BK_STATIC_ERROR(...) Bk::Log::get_app_logger()->error(__VA_ARGS__) #define BK_STATIC_CRITICAL(...) Bk::Log::get_app_logger()->critical(__VA_ARGS__) #ifdef BK_DEBUG #define BK_CORE_TRACE(...) Log::get_core_logger()->trace(__VA_ARGS__) #define BK_CORE_INFO(...) Log::get_core_logger()->info(__VA_ARGS__) - #define BK_CORE_WARNING(...) Log::get_core_logger()->warning(__VA_ARGS__) + #define BK_CORE_WARNING(...) Log::get_core_logger()->warn(__VA_ARGS__) #define BK_CORE_ERROR(...) Log::get_core_logger()->error(__VA_ARGS__) #define BK_CORE_CRITICAL(...) Log::get_core_logger()->critical(__VA_ARGS__) #define BK_TRACE(...) Bk::Log::get_app_logger()->trace(__VA_ARGS__) #define BK_INFO(...) Bk::Log::get_app_logger()->info(__VA_ARGS__) - #define BK_WARNING(...) Bk::Log::get_app_logger()->warning(__VA_ARGS__) + #define BK_WARNING(...) Bk::Log::get_app_logger()->warn(__VA_ARGS__) #define BK_ERROR(...) Bk::Log::get_app_logger()->error(__VA_ARGS__) #define BK_CRITICAL(...) Bk::Log::get_app_logger()->critical(__VA_ARGS__) #else