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

feat: rewrite more to own exceptions + handle put_to_subtable error

Browse Source
This commit is contained in:
3lswear
2022-02-20 20:03:27 +03:00
parent be0d34b8d5
commit 41b2cdb90e
2 changed files with 83 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/config/TOMLParser.cpp
View File

@@ -33,8 +33,7 @@ namespace config
void TOMLParser::processMap(void)
{
/* std::cerr << "Processing map" << std::endl; */
// toml_node *map_node;
std::auto_ptr<toml_node> map_node(new toml_node);
toml_node *map_node;
s_token current;
try { current = tokenizer.getToken(); }
@@ -46,13 +45,11 @@ namespace config
if (current.type == MAP_DECL)
{
if (tokenizer.getToken().type != NEWLINE)
throw ExpectedToken("newline", current.value);
// throw std::logic_error("no newline after MAP_DECL");
map_node.reset(parseMap());
throw ExpectedToken("newline", "after " + current.value);
map_node = parseMap();
}
else
// throw std::logic_error("unexpected token in processMap");
throw UnexpectedToken("", current.value);
throw UnexpectedToken("", "near " + current.value);
/* std::cout << current.value << std::endl; */
@@ -60,14 +57,22 @@ namespace config
full_name = split_name(current.value);
put_to_subtable(root, full_name, map_node.release(), toml_node::MAP);;
try
{
put_to_subtable(root, full_name, map_node, toml_node::MAP);;
}
catch (std::domain_error &e)
{
config::display(root);
DBOUT << "CAUGHT in process Map" <<ENDL;
config::clean_generic(map_node);;
throw;
}
}
toml_node *TOMLParser::parseMap(void)
{
/* std::cerr << "Parsing map" << std::endl; */
// std::auto_ptr<TOMLMap> mapObject(new TOMLMap);
toml_node *node = new toml_node;
TOMLMap *mapObject = new TOMLMap;
bool completed = false;
@@ -103,7 +108,6 @@ namespace config
/* std::cerr << key << std::endl; */
if (tokenizer.getToken().type != ASSIGN)
throw ExpectedToken("assign", "after " + key);
// throw std::logic_error("EXPECTED assign! 1");
nextToken = tokenizer.getToken();
switch (nextToken.type)
@@ -146,8 +150,7 @@ namespace config
break;
if (nextToken.type != NEWLINE)
{
// throw std::logic_error("EXPECTED newline");
throw ExpectedToken("newline", "parsing Hash Table");
throw ExpectedToken("newline", "at parsing Hash Table");
}
}
}
@@ -168,8 +171,7 @@ namespace config
{
/* std::cerr << "Parsing MapArray" << std::endl; */
// toml_node *map_node;
std::auto_ptr<toml_node> map_node(new toml_node);
toml_node *map_node;
s_token current;
try { current = tokenizer.getToken(); }
@@ -181,21 +183,11 @@ namespace config
if (current.type == MAPARRAY_DECL)
{
if (tokenizer.getToken().type != NEWLINE)
throw std::logic_error("no newline after map_array declaration");
try
{
map_node.reset(parseMap());
}
catch (std::exception &e)
{
// DBOUT << "map_node is " << map_node->getMap() << ENDL;
// for (TOMLMap::iterator it = map->begin();)
throw;
}
throw ExpectedToken("newline", "after " + current.value);
map_node = parseMap();
}
else
throw std::logic_error("unexpected token in process Map Array");
throw UnexpectedToken(current.value, "when expected array of map declaration");
/* std::cout << current.value << std::endl; */
@@ -203,7 +195,15 @@ namespace config
full_name = split_name(current.value);
put_to_subtable(root, full_name, map_node.release(), toml_node::MAPARRAY);
try
{
put_to_subtable(root, full_name, map_node, toml_node::MAPARRAY);
}
catch (std::domain_error &e)
{
config::clean_generic(map_node);
throw;
}
}
@@ -246,21 +246,11 @@ namespace config
try
{
while (!completed)
{
// if (!tokenizer.hasMoreTokens())
// throw std::logic_error("No more tokens");
// else
// {
current = tokenizer.getToken();
switch (current.type)
{
// case OPEN_BRACKET:
// {
// node = parseArray();
// break;
// }
case STRING:
{
tokenizer.rollBackToken();
@@ -286,11 +276,9 @@ namespace config
}
default:
{
// throw std::logic_error("unkown token in parseArray");
throw UnexpectedToken("entry " + current.value,
"in Array");
"in array");
}
}
array->push_back(node);
current = tokenizer.getToken();
@@ -300,8 +288,6 @@ namespace config
completed = true;
else
throw UnexpectedToken(current.value, ", when expected COMMA, or CLOSE_BRACKET");
// throw std::invalid_argument("Unexpected token in array!");
// }
}
}
catch (std::domain_error &e)
@@ -323,10 +309,8 @@ namespace config
s_token token = tokenizer.getToken();
if (token.value == "true")
value = true;
else if (token.value == "false")
value = false;
else
throw std::invalid_argument("Unexpected bool value");
value = false;
toml_node *node = new toml_node;
node->setBool(value);
@@ -346,7 +330,6 @@ namespace config
void TOMLParser::parse(void)
{
/* std::cerr << "Parsing ROOT" << std::endl; */
root = new TOMLMap;
bool completed = false;
while (!completed)
{
@@ -371,62 +354,11 @@ namespace config
tokenizer.set_last(NEWLINE);
tokenizer.rollBackToken();
processMap();
continue;
// continue;
}
}
else
{
std::string key = current.value;
/* std::cerr << key << std::endl; */
if (tokenizer.getToken().type != ASSIGN)
throw std::logic_error("EXPECTED assign!");
current = tokenizer.getToken();
switch (current.type)
{
case STRING:
{
tokenizer.rollBackToken();
(*root)[key] = parseString();
break;
}
case OPEN_BRACKET:
{
(*root)[key] = parseArray();
break;
}
case NUMBER:
{
tokenizer.rollBackToken();
(*root)[key] = parseNumber();
break;
}
case BOOL:
{
tokenizer.rollBackToken();
(*root)[key] = parseBool();
break;
}
default:
{
std::cerr << "Unknown token, marking as complete" << std::endl;
completed = true;
break;
}
}
if (tokenizer.hasMoreTokens())
current = tokenizer.getToken();
else
break;
if (current.type != NEWLINE)
{
throw std::logic_error("EXPECTED newline");
}
}
}
else
{
completed = true;
break;
}
}
}
@@ -445,10 +377,6 @@ namespace config
}
full_name.push_back(name);
/* for (size_t i = 0; i < full_name.size(); i++) */
/* std::cout << full_name[i] << ", "; */
/* std::cout << std::endl; */
return (full_name);
}
@@ -488,7 +416,7 @@ namespace config
(*local_root)[*subname] = map_node;
}
else
throw std::logic_error("map already in subtable!");
throw std::domain_error("Config file: Map " + *subname + " already exists in subtable!");
}
break;
}

30
src/config/TOMLParser.hpp
View File

@@ -45,6 +45,7 @@ namespace config
toml_node *parseNil(void);
// Expected + missing + context
class ExpectedToken: public std::domain_error
{
protected:
@@ -54,7 +55,7 @@ namespace config
ExpectedToken(const std::string &missing, const std::string context): std::domain_error("ExpectedToken")
{
msg = std::string("Config file: ");
msg += ("Expected " + missing + " at " + context);
msg += ("Expected " + missing + " " + context);
}
virtual const char *what() const throw()
@@ -63,10 +64,10 @@ namespace config
}
virtual ~ExpectedToken() throw()
{
// delete msg;
}
{}
};
// Unexpected + unexpected + context
class UnexpectedToken: public std::domain_error
{
protected:
@@ -85,10 +86,29 @@ namespace config
}
virtual ~UnexpectedToken() throw()
{}
};
class AlreadyExists: public std::domain_error
{
// delete msg;
protected:
std::string msg;
public:
AlreadyExists(const std::string &token, const std::string context): std::domain_error("ExpectedToken")
{
msg = std::string("Config file: ");
msg += (token + "already exists " + context);
}
virtual const char *what() const throw()
{
return (msg.c_str());
}
virtual ~AlreadyExists() throw()
{}
};
};
/* parse tha root ! */