Fixed syntax error with Pointers

main
anulax1225 ago%!(EXTRA string=11 months)
parent 9cd879f5a5
commit 492a7a1d76
  1. 5
      src/bakatools/json/fs_manager.cpp
  2. 2
      src/bakatools/json/node.h
  3. 24
      src/bakatools/json/parser.cpp
  4. 8
      src/bakatools/logging/log.h

@ -31,7 +31,6 @@ namespace Bk::Json
void FsManager::config_init(int page_size) void FsManager::config_init(int page_size)
{ {
BK_INFO("CACA");
auto dir = Directory(path); auto dir = Directory(path);
std::string s_config = "\n" std::string s_config = "\n"
"{\n" "{\n"
@ -39,10 +38,7 @@ namespace Bk::Json
" \"id_count\": 0,\n" " \"id_count\": 0,\n"
" \"page_size\": " + std::to_string(page_size) + "\n" " \"page_size\": " + std::to_string(page_size) + "\n"
"}"; "}";
BK_INFO(s_config);
config = Parser(s_config).parse(); config = Parser(s_config).parse();
BK_INFO("ff");
write_config(); write_config();
} }
@ -53,7 +49,6 @@ namespace Bk::Json
if (dir.exists() && force) dir = dir.remove(); if (dir.exists() && force) dir = dir.remove();
if (!dir.exists()) if (!dir.exists())
{ {
BK_INFO("CACA");
Directory::create(dir.path()); Directory::create(dir.path());
config_init(page_size); config_init(page_size);
} }

@ -57,6 +57,6 @@ namespace Bk::Json
bool bValue; bool bValue;
}; };
Values values; Values values;
Type type; Type type = Type::NULL_TYPE;
}; };
} }

@ -4,6 +4,8 @@ namespace Bk::Json
{ {
Parser::Parser(File& file) Parser::Parser(File& file)
{ {
root = Pointer(new Node());
root->set_null();
Type::DataStream data; Type::DataStream data;
if (file.exists()) if (file.exists())
{ {
@ -15,6 +17,8 @@ namespace Bk::Json
Parser::Parser(const char* str, int length) Parser::Parser(const char* str, int length)
{ {
root = Pointer(new Node());
root->set_null();
Type::DataStream data; Type::DataStream data;
data.push<char>(str, length); data.push<char>(str, length);
data.reverse(); data.reverse();
@ -23,8 +27,10 @@ namespace Bk::Json
Parser::Parser(const std::string& str) Parser::Parser(const std::string& str)
{ {
root = Pointer(new Node());
root->set_null();
Type::DataStream data; Type::DataStream data;
data.payload = std::vector<char>(str.c_str(), str.c_str() + str.length()); data.payload = std::vector<char>(str.begin(), str.end());
data.reverse(); data.reverse();
lexer = Lexer(data); lexer = Lexer(data);
} }
@ -32,9 +38,7 @@ namespace Bk::Json
Pointer Parser::parse() Pointer Parser::parse()
{ {
Token token; Token token;
BK_INFO("LALA");
while (lexer.has_more_tokens()) { while (lexer.has_more_tokens()) {
BK_INFO("LALA");
try try
{ {
token = lexer.get_token(); token = lexer.get_token();
@ -87,7 +91,7 @@ namespace Bk::Json
Pointer Parser::parse_list() Pointer Parser::parse_list()
{ {
Pointer node = Pointer(); Pointer node = Pointer(new Node());
Json::List* list = new Json::List(); Json::List* list = new Json::List();
bool has_completed = false; bool has_completed = false;
Token next_token; Token next_token;
@ -148,7 +152,7 @@ namespace Bk::Json
Pointer Parser::parse_object() Pointer Parser::parse_object()
{ {
std::string key = ""; std::string key = "";
Pointer node = Pointer(); Pointer node = Pointer(new Node());
Json::Object *key_object_map = new Json::Object(); Json::Object *key_object_map = new Json::Object();
bool has_completed = false; bool has_completed = false;
bool no_key = true; bool no_key = true;
@ -160,6 +164,7 @@ namespace Bk::Json
if (no_key) if (no_key)
{ {
next_token = lexer.get_token(); next_token = lexer.get_token();
if (next_token.type == TokenType::CURLY_CLOSE) if (next_token.type == TokenType::CURLY_CLOSE)
{ {
has_completed = true; has_completed = true;
@ -173,7 +178,6 @@ namespace Bk::Json
next_token = lexer.get_token(); next_token = lexer.get_token();
if (next_token.type == TokenType::COLON || next_token.type == TokenType::COMMA) if (next_token.type == TokenType::COLON || next_token.type == TokenType::COMMA)
continue; continue;
Pointer node;
switch (next_token.type) switch (next_token.type)
{ {
case TokenType::STRING: case TokenType::STRING:
@ -227,7 +231,7 @@ namespace Bk::Json
Pointer Parser::parse_string() Pointer Parser::parse_string()
{ {
Pointer node = Pointer(); Pointer node = Pointer(new Node());
Token token = lexer.roll_back_token(); Token token = lexer.roll_back_token();
std::string *sValue = new std::string(token.value); std::string *sValue = new std::string(token.value);
node->set_string(sValue); node->set_string(sValue);
@ -236,7 +240,7 @@ namespace Bk::Json
Pointer Parser::parse_number() Pointer Parser::parse_number()
{ {
Pointer node = Pointer(); Pointer node = Pointer(new Node());
Token token = lexer.roll_back_token(); Token token = lexer.roll_back_token();
float fValue = std::stof(token.value); float fValue = std::stof(token.value);
node->set_float(fValue); node->set_float(fValue);
@ -245,7 +249,7 @@ namespace Bk::Json
Pointer Parser::parse_boolean() Pointer Parser::parse_boolean()
{ {
Pointer node = Pointer(); Pointer node = Pointer(new Node());
Token token = lexer.roll_back_token(); Token token = lexer.roll_back_token();
bool bValue = token.value == "True" ? true : false; bool bValue = token.value == "True" ? true : false;
node->set_bool(bValue); node->set_bool(bValue);
@ -254,7 +258,7 @@ namespace Bk::Json
Pointer Parser::parse_null() Pointer Parser::parse_null()
{ {
Pointer node = Pointer(); Pointer node = Pointer(new Node());
Token token = lexer.roll_back_token(); Token token = lexer.roll_back_token();
node->set_null(); node->set_null();
return node; return node;

@ -21,26 +21,26 @@ namespace Bk {
#define BK_STATIC_CORE_TRACE(...) Log::get_core_logger()->trace(__VA_ARGS__) #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_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_ERROR(...) Log::get_core_logger()->error(__VA_ARGS__)
#define BK_STATIC_CORE_CRITICAL(...) Log::get_core_logger()->critical(__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_TRACE(...) Bk::Log::get_app_logger()->trace(__VA_ARGS__)
#define BK_STATIC_INFO(...) Bk::Log::get_app_logger()->info(__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_ERROR(...) Bk::Log::get_app_logger()->error(__VA_ARGS__)
#define BK_STATIC_CRITICAL(...) Bk::Log::get_app_logger()->critical(__VA_ARGS__) #define BK_STATIC_CRITICAL(...) Bk::Log::get_app_logger()->critical(__VA_ARGS__)
#ifdef BK_DEBUG #ifdef BK_DEBUG
#define BK_CORE_TRACE(...) Log::get_core_logger()->trace(__VA_ARGS__) #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_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_ERROR(...) Log::get_core_logger()->error(__VA_ARGS__)
#define BK_CORE_CRITICAL(...) Log::get_core_logger()->critical(__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_TRACE(...) Bk::Log::get_app_logger()->trace(__VA_ARGS__)
#define BK_INFO(...) Bk::Log::get_app_logger()->info(__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_ERROR(...) Bk::Log::get_app_logger()->error(__VA_ARGS__)
#define BK_CRITICAL(...) Bk::Log::get_app_logger()->critical(__VA_ARGS__) #define BK_CRITICAL(...) Bk::Log::get_app_logger()->critical(__VA_ARGS__)
#else #else

Loading…
Cancel
Save