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

intermediate changes

Browse Source
This commit is contained in:
3lswear
2022-01-13 09:25:04 +03:00
parent 7c6d0783f1
commit ebd09bbcdc
5 changed files with 115 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
src/config/TOMLParser.hpp
View File

@@ -101,10 +101,10 @@ namespace config
std::cerr << "Parsing MapArray" << std::endl;
toml_node *node = new toml_node;
TOMLMapArray *servers = new TOMLMapArray;
s_token current;
while (tokenizer.hasMoreTokens())
{
s_token current;
try { current = tokenizer.getToken(); }
catch (std::logic_error e)
{
@@ -112,9 +112,21 @@ namespace config
break;
}
if (current.type == MAPARRAY_DECL)
servers->push_back(parseMap()->getMap());
{
if (tokenizer.getToken().type != NEWLINE)
throw std::logic_error("no newline after map_array declaration");
servers->second->push_back(parseMap()->getMap());
}
else
throw std::logic_error("unexpected token in parseMapArray");
if (tokenizer.hasMoreTokens())
current = tokenizer.getToken();
else
break;
if (current.type != NEWLINE)
{
throw std::logic_error("EXPECTED newline");
}
}
node->setMapArray(servers);
return (node);
@@ -245,72 +257,73 @@ namespace config
std::string key;
key = "";
root = parseMap();
/* root = parseMap(); */
root = parseMapArray();
return (root);
while (tokenizer.hasMoreTokens())
{
s_token token;
try
{
token = tokenizer.getToken();
/* std::cout << token.to_string() << std::endl; */
switch (token.type)
{
case KEY:
{
toml_node *parsedObject = parseString();
if (!root)
root = parsedObject;
}
/* while (tokenizer.hasMoreTokens()) */
/* { */
/* s_token token; */
/* try */
/* { */
/* token = tokenizer.getToken(); */
/* /1* std::cout << token.to_string() << std::endl; *1/ */
/* switch (token.type) */
/* { */
/* case KEY: */
/* { */
/* toml_node *parsedObject = parseString(); */
/* if (!root) */
/* root = parsedObject; */
/* } */
case ARR_OPEN:
{
toml_node *parsedObject = parseMap();
/* parsedObject->printNode(0); */
if (!root)
root = parsedObject;
}
break;
case NUMBER:
{
tokenizer.rollBackToken();
toml_node *parsedNumber = parseNumber();
if (!root)
root = parsedNumber;
}
break;
case STRING:
{
tokenizer.rollBackToken();
toml_node *parsedString = parseString();
if (!root)
root = parsedString;
}
break;
case BOOL:
{
tokenizer.rollBackToken();
toml_node *parsedBool = parseBool();
if (!root)
root = parsedBool;
}
break;
case MAPARRAY_DECL:
{
/* case ARR_OPEN: */
/* { */
/* toml_node *parsedObject = parseMap(); */
/* /1* parsedObject->printNode(0); *1/ */
/* if (!root) */
/* root = parsedObject; */
/* } */
/* break; */
/* case NUMBER: */
/* { */
/* tokenizer.rollBackToken(); */
/* toml_node *parsedNumber = parseNumber(); */
/* if (!root) */
/* root = parsedNumber; */
/* } */
/* break; */
/* case STRING: */
/* { */
/* tokenizer.rollBackToken(); */
/* toml_node *parsedString = parseString(); */
/* if (!root) */
/* root = parsedString; */
/* } */
/* break; */
/* case BOOL: */
/* { */
/* tokenizer.rollBackToken(); */
/* toml_node *parsedBool = parseBool(); */
/* if (!root) */
/* root = parsedBool; */
/* } */
/* break; */
/* case MAPARRAY_DECL: */
/* { */
}
default:
{
throw std::logic_error("JOPA :(");
}
}
}
catch (std::logic_error err)
{
break;
}
}
/* } */
/* default: */
/* { */
/* throw std::logic_error("JOPA :("); */
/* } */
/* } */
/* } */
/* catch (std::logic_error err) */
/* { */
/* break; */
/* } */
/* } */
return (root);
}
}