From f31ef131c160f94e1a47f82b0381bab854d84a94 Mon Sep 17 00:00:00 2001 From: 3lswear Date: Sun, 27 Feb 2022 20:23:08 +0300 Subject: [PATCH] style: clean up --- src/config/TOMLNode.cpp | 22 ---------------------- src/config/TOMLParser.cpp | 38 -------------------------------------- src/config/Tokenizer.cpp | 30 ------------------------------ src/config/Tokenizer.hpp | 11 ----------- 4 files changed, 101 deletions(-) diff --git a/src/config/TOMLNode.cpp b/src/config/TOMLNode.cpp index 1210a64..668583f 100644 --- a/src/config/TOMLNode.cpp +++ b/src/config/TOMLNode.cpp @@ -1,27 +1,5 @@ #include "TOMLNode.hpp" -/* toml_node::toml_node(void) */ -/* { */ -/* return; */ -/* } */ - -/* toml_node::toml_node(const toml_node &src) */ -/* { */ -/* *this = src; */ -/* return; */ -/* } */ - -/* toml_node::~toml_node(void) */ -/* { */ -/* return; */ -/* } */ - -/* toml_node &toml_node::operator=(const toml_node &rhs) */ -/* { */ -/* //code */ -/* return (*this); */ -/* } */ - toml_node::e_type toml_node::get_type(void) { return (type); diff --git a/src/config/TOMLParser.cpp b/src/config/TOMLParser.cpp index c1e1652..fe8317e 100644 --- a/src/config/TOMLParser.cpp +++ b/src/config/TOMLParser.cpp @@ -1,27 +1,5 @@ #include "TOMLParser.hpp" -/* -Template::-Template(void) */ -/* { */ -/* return; */ -/* } */ - -/* -Template::-Template(const -Template &src) */ -/* { */ -/* *this = src; */ -/* return; */ -/* } */ - -/* -Template::~-Template(void) */ -/* { */ -/* return; */ -/* } */ - -/* -Template &-Template::operator=(const -Template &rhs) */ -/* { */ -/* //code */ -/* return (*this); */ -/* } */ - namespace config { @@ -32,7 +10,6 @@ namespace config void TOMLParser::processMap(void) { - /* std::cerr << "Processing map" << std::endl; */ toml_node *map_node; s_token current; @@ -51,8 +28,6 @@ namespace config else throw UnexpectedToken("", "near " + current.value); - /* std::cout << current.value << std::endl; */ - std::vector full_name; full_name = split_name(current.value); @@ -72,7 +47,6 @@ namespace config toml_node *TOMLParser::parseMap(void) { - /* std::cerr << "Parsing map" << std::endl; */ toml_node *node = new toml_node; TOMLMap *mapObject = new TOMLMap; bool completed = false; @@ -105,7 +79,6 @@ namespace config } std::string key = nextToken.value; - /* std::cerr << key << std::endl; */ if (tokenizer.getToken().type != ASSIGN) throw ExpectedToken("assign", "after " + key); @@ -137,7 +110,6 @@ namespace config } case MAPARRAY_DECL: { - /* std::cerr << "reached MAPARRAY_DECL in parseMap" << std::endl; */ completed = true; break; } @@ -170,7 +142,6 @@ namespace config void TOMLParser::processMapArray(void) { - /* std::cerr << "Parsing MapArray" << std::endl; */ toml_node *map_node; s_token current; @@ -189,8 +160,6 @@ namespace config else throw UnexpectedToken(current.value, "when expected array of map declaration"); - /* std::cout << current.value << std::endl; */ - std::vector full_name; full_name = split_name(current.value); @@ -211,7 +180,6 @@ namespace config { std::string *string; - /* std::cerr << "Parsing string" << std::endl; */ s_token token = tokenizer.getToken(); string = new std::string(token.value); @@ -225,7 +193,6 @@ namespace config { int value; - /* std::cerr << "Parsing number" << std::endl; */ s_token token = tokenizer.getToken(); value = std::atoi(token.value.c_str()); @@ -237,7 +204,6 @@ namespace config toml_node *TOMLParser::parseArray(void) { - /* std::cerr << "Parsing array" << std::endl; */ toml_node *result = new toml_node; TOMLArray *array = new TOMLArray; toml_node *node; @@ -305,7 +271,6 @@ namespace config { bool value; - /* std::cerr << "Parsing bool" << std::endl; */ s_token token = tokenizer.getToken(); if (token.value == "true") value = true; @@ -321,7 +286,6 @@ namespace config toml_node *TOMLParser::parseNil(void) { toml_node *node = new toml_node; - /* std::cerr << "Parsing NIL" << std::endl; */ node->setNil(); return (node); } @@ -329,7 +293,6 @@ namespace config /* parse tha root ! */ void TOMLParser::parse(void) { - /* std::cerr << "Parsing ROOT" << std::endl; */ bool completed = false; while (!completed) { @@ -350,7 +313,6 @@ namespace config } else if (current.type == MAP_DECL) { - /* std::cerr << "MAP_DECL value: " << current.value << std::endl; */ tokenizer.set_last(NEWLINE); tokenizer.rollBackToken(); processMap(); diff --git a/src/config/Tokenizer.cpp b/src/config/Tokenizer.cpp index fd8f776..df7dd6c 100644 --- a/src/config/Tokenizer.cpp +++ b/src/config/Tokenizer.cpp @@ -1,26 +1,5 @@ #include "Tokenizer.hpp" -/* -Template::-Template(void) */ -/* { */ -/* return; */ -/* } */ - -/* -Template::-Template(const -Template &src) */ -/* { */ -/* *this = src; */ -/* return; */ -/* } */ - -/* -Template::~-Template(void) */ -/* { */ -/* return; */ -/* } */ - -/* -Template &-Template::operator=(const -Template &rhs) */ -/* { */ -/* //code */ -/* return (*this); */ -/* } */ namespace config { bool isspace(char c) @@ -71,7 +50,6 @@ namespace config if (file.eof()) { - DBOUT << RED << "Tokens exhausted" << ENDL; throw NoMoreTokens(); } prev_pos = file.tellg(); @@ -222,19 +200,12 @@ namespace config do file.get(c); while (c != '\n' || file.eof()); - DBOUT << "getting comment token" << ENDL; if (last_token == NO_TOK || last_token == NEWLINE) { - DBOUT << "getting first token instead of comment" << ENDL; struct s_token actual; actual.type = NEWLINE; while (actual.type == NEWLINE) actual = getToken(); - DBOUT - << "actual token: '" - << actual.value << "', type: " - << actual.type - << ENDL; token = actual; } else @@ -245,7 +216,6 @@ namespace config { while (!config::isspace(c) && (c != '\n')) { - DBOUT << RED << "[" << c << "]" <