roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-29 13:27:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove debug output

Browse Source
This commit is contained in:
3lswear
2022-01-30 12:35:42 +03:00
parent 744c84f544
commit 668566a462
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/config/TOMLParser.cpp
View File

@@ -30,7 +30,7 @@ namespace config
void TOMLParser::processMap(void) void TOMLParser::processMap(void)
{ {
std::cerr << "Processing map" << std::endl; /* std::cerr << "Processing map" << std::endl; */
toml_node *map_node; toml_node *map_node;
s_token current; s_token current;
@@ -49,7 +49,7 @@ namespace config
else else
throw std::logic_error("unexpected token in processMap"); throw std::logic_error("unexpected token in processMap");
std::cout << current.value << std::endl; /* std::cout << current.value << std::endl; */
std::vector<std::string> full_name; std::vector<std::string> full_name;
@@ -61,7 +61,7 @@ namespace config
toml_node *TOMLParser::parseMap(void) toml_node *TOMLParser::parseMap(void)
{ {
std::cerr << "Parsing map" << std::endl; /* std::cerr << "Parsing map" << std::endl; */
toml_node *node = new toml_node; toml_node *node = new toml_node;
TOMLMap *mapObject = new TOMLMap; TOMLMap *mapObject = new TOMLMap;
bool completed = false; bool completed = false;
@@ -89,7 +89,7 @@ namespace config
break; break;
} }
std::string key = nextToken.value; std::string key = nextToken.value;
std::cerr << key << std::endl; /* std::cerr << key << std::endl; */
if (tokenizer.getToken().type != ASSIGN) if (tokenizer.getToken().type != ASSIGN)
throw std::logic_error("EXPECTED assign!"); throw std::logic_error("EXPECTED assign!");
nextToken = tokenizer.getToken(); nextToken = tokenizer.getToken();
@@ -120,7 +120,7 @@ namespace config
} }
case MAPARRAY_DECL: case MAPARRAY_DECL:
{ {
std::cerr << "reached MAPARRAY_DECL in parseMap" << std::endl; /* std::cerr << "reached MAPARRAY_DECL in parseMap" << std::endl; */
completed = true; completed = true;
break; break;
} }
@@ -153,7 +153,7 @@ namespace config
void TOMLParser::processMapArray(void) void TOMLParser::processMapArray(void)
{ {
std::cerr << "Parsing MapArray" << std::endl; /* std::cerr << "Parsing MapArray" << std::endl; */
toml_node *map_node; toml_node *map_node;
s_token current; s_token current;
@@ -172,7 +172,7 @@ namespace config
else else
throw std::logic_error("unexpected token in processMapArray"); throw std::logic_error("unexpected token in processMapArray");
std::cout << current.value << std::endl; /* std::cout << current.value << std::endl; */
std::vector<std::string> full_name; std::vector<std::string> full_name;
@@ -188,7 +188,7 @@ namespace config
toml_node *node = new toml_node; toml_node *node = new toml_node;
std::string *sValue; std::string *sValue;
std::cerr << "Parsing string" << std::endl; /* std::cerr << "Parsing string" << std::endl; */
s_token token = tokenizer.getToken(); s_token token = tokenizer.getToken();
sValue = new std::string(token.value); sValue = new std::string(token.value);
node->setString(sValue); node->setString(sValue);
@@ -201,7 +201,7 @@ namespace config
toml_node *node = new toml_node; toml_node *node = new toml_node;
int value; int value;
std::cerr << "Parsing number" << std::endl; /* std::cerr << "Parsing number" << std::endl; */
s_token token = tokenizer.getToken(); s_token token = tokenizer.getToken();
value = std::atoi(token.value.c_str()); value = std::atoi(token.value.c_str());
node->setNumber(value); node->setNumber(value);
@@ -211,7 +211,7 @@ namespace config
toml_node *TOMLParser::parseArray(void) toml_node *TOMLParser::parseArray(void)
{ {
std::cerr << "Parsing array" << std::endl; /* std::cerr << "Parsing array" << std::endl; */
toml_node *node; toml_node *node;
toml_node *result = new toml_node; toml_node *result = new toml_node;
TOMLArray *array = new TOMLArray; TOMLArray *array = new TOMLArray;
@@ -280,7 +280,7 @@ namespace config
toml_node *node = new toml_node; toml_node *node = new toml_node;
bool value; bool value;
std::cerr << "Parsing bool" << std::endl; /* std::cerr << "Parsing bool" << std::endl; */
s_token token = tokenizer.getToken(); s_token token = tokenizer.getToken();
if (token.value == "true") if (token.value == "true")
value = true; value = true;
@@ -296,7 +296,7 @@ namespace config
toml_node *TOMLParser::parseNil(void) toml_node *TOMLParser::parseNil(void)
{ {
toml_node *node = new toml_node; toml_node *node = new toml_node;
std::cerr << "Parsing NIL" << std::endl; /* std::cerr << "Parsing NIL" << std::endl; */
node->setNil(); node->setNil();
return (node); return (node);
} }
@@ -304,7 +304,7 @@ namespace config
/* parse tha root ! */ /* parse tha root ! */
TOMLMap *TOMLParser::parse(void) TOMLMap *TOMLParser::parse(void)
{ {
std::cerr << "Parsing ROOT" << std::endl; /* std::cerr << "Parsing ROOT" << std::endl; */
root = new TOMLMap; root = new TOMLMap;
bool completed = false; bool completed = false;
while (!completed) while (!completed)
@@ -327,7 +327,7 @@ namespace config
} }
else if (current.type == MAP_DECL) else if (current.type == MAP_DECL)
{ {
std::cerr << "MAP_DECL value: " << current.value << std::endl; /* std::cerr << "MAP_DECL value: " << current.value << std::endl; */
tokenizer.set_last(NEWLINE); tokenizer.set_last(NEWLINE);
tokenizer.rollBackToken(); tokenizer.rollBackToken();
/* if (tokenizer.getToken().type != NEWLINE) */ /* if (tokenizer.getToken().type != NEWLINE) */
@@ -339,7 +339,7 @@ namespace config
else else
{ {
std::string key = current.value; std::string key = current.value;
std::cerr << key << std::endl; /* std::cerr << key << std::endl; */
if (tokenizer.getToken().type != ASSIGN) if (tokenizer.getToken().type != ASSIGN)
throw std::logic_error("EXPECTED assign!"); throw std::logic_error("EXPECTED assign!");
current = tokenizer.getToken(); current = tokenizer.getToken();
@@ -405,15 +405,14 @@ namespace config
dot = name.find('.'); dot = name.find('.');
if (dot == std::string::npos) if (dot == std::string::npos)
break; break;
/* std::cout << dot << std::endl; */
full_name.push_back(name.substr(0, dot)); full_name.push_back(name.substr(0, dot));
name.erase(0, dot + 1); name.erase(0, dot + 1);
} }
full_name.push_back(name); full_name.push_back(name);
for (size_t i = 0; i < full_name.size(); i++) /* for (size_t i = 0; i < full_name.size(); i++) */
std::cout << full_name[i] << ", "; /* std::cout << full_name[i] << ", "; */
std::cout << std::endl; /* std::cout << std::endl; */
return (full_name); return (full_name);
} }

2
src/config/parse.cpp
View File

@@ -43,6 +43,6 @@ TOMLMap *parse(void)
std::string filename = "config/simple.toml"; std::string filename = "config/simple.toml";
config::TOMLParser parser(filename); config::TOMLParser parser(filename);
TOMLMap *root = parser.parse(); TOMLMap *root = parser.parse();
config::display(root); /* config::display(root); */
return (root); return (root);
} }