develop #5

Merged
cromer merged 14 commits from develop into master 2022-11-10 21:31:44 -03:00
Showing only changes of commit 18cd9c5933 - Show all commits

View File

@ -293,7 +293,9 @@ std::unique_ptr<obelisk::ExpressionAST> obelisk::Parser::parseFact()
bool getEntity {true}; bool getEntity {true};
std::vector<std::string> leftEntities; std::vector<std::string> leftEntities;
std::vector<std::string> rightEntities;
std::string entityName {""}; std::string entityName {""};
std::string verb {""};
getNextToken(); getNextToken();
while (true) //left side of fact while (true) //left side of fact
{ {
@ -305,14 +307,24 @@ std::unique_ptr<obelisk::ExpressionAST> obelisk::Parser::parseFact()
{ {
// open a double quote // open a double quote
syntax.push('"'); syntax.push('"');
getNextToken();
} }
else if (syntax.top() == '"') else if (syntax.top() == '"')
{ {
// close a double quote // close a double quote
syntax.pop(); syntax.pop();
if (verb == "")
{
leftEntities.push_back(entityName); leftEntities.push_back(entityName);
}
else
{
rightEntities.push_back(entityName);
}
entityName = ""; entityName = "";
getEntity = false; getEntity = false;
getNextToken();
continue;
} }
} }
@ -328,25 +340,50 @@ std::unique_ptr<obelisk::ExpressionAST> obelisk::Parser::parseFact()
} }
else else
{ {
// and if (getCurrentToken() == ')')
}
/*if (getCurrentToken() == ')') // TODO: break if not string and not "and"
{ {
// TODO: save the verb // TODO: throw an error if verb is empty
// TODO: throw an error if rightEntities has 0 elements
break; break;
}*/ }
if (getCurrentToken() == '"')
{
// TODO: throw and error because there is an unexpected double quote.
break;
}
if (getLexer()->getIdentifier() == "and")
{
getNextToken();
getEntity = true;
continue;
}
else
{
verb = getLexer()->getIdentifier();
getEntity = true;
continue;
}
} }
} }
void handleAction() return nullptr;
}
void obelisk::Parser::handleAction()
{ {
} }
void handleRule() void obelisk::Parser::handleRule()
{ {
} }
void handleFact() void obelisk::Parser::handleFact()
{
parseFact();
}
void obelisk::Parser::insertFact()
{ {
} }