mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 04:54:29 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove space and atWord tokens

Browse Source 
`atWord` wasn't used at all and spaces should be eaten by the lexer

And added `unspecified` token
This commit is contained in:
Luis Ángel San Martín
2021-01-14 08:39:16 +01:00
parent ddb140d430
commit f09c5955d8
4 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
YACReaderLibrary/db/query_parser.cpp
View File

@ -136,9 +136,6 @@ bool QueryParser::isEof() const
void QueryParser::advance()
{
currentToken = lexer.next();
if (tokenType() == Token::Type::space)
advance();
}
QueryParser::FieldType QueryParser::fieldType(const std::string &str)
@ -184,7 +181,7 @@ QueryParser::TreeNode QueryParser::andExpression()
return { "and", { lhs, andExpression() } };
}
if ((isIn(tokenType(), { Token::Type::atWord, Token::Type::word, Token::Type::quotedWord }) || token() == "(") && lcaseToken() != "or") {
if ((isIn(tokenType(), { Token::Type::word, Token::Type::quotedWord }) || token() == "(") && lcaseToken() != "or") {
return { "and", { lhs, andExpression() } };
}
@ -210,7 +207,7 @@ QueryParser::TreeNode QueryParser::locationExpression()
}
return res;
}
if (!isIn(tokenType(), { Token::Type::atWord, Token::Type::word, Token::Type::quotedWord })) {
if (!isIn(tokenType(), { Token::Type::word, Token::Type::quotedWord })) {
throw std::invalid_argument("Invalid syntax. Expected a lookup name or a word");
}
return baseToken();