vaclavt/usql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

initial support for aggregate functions

Browse Source
This commit is contained in:
VaclavT
2021-09-11 11:32:05 +02:00
parent 61f3af90af
commit 3abc9184e1
8 changed files with 744 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parser.cpp
View File

@@ -191,8 +191,10 @@ namespace usql {
// column values
m_lexer.skipToken(TokenType::open_paren);
do {
auto col_value = parse_expression();
column_values.push_back(std::move(col_value));
// TODO here it is problem when exception from parse_expression<-parse_value is thrown
// it makes double free
auto value = parse_expression();
column_values.emplace_back(std::move(value));
m_lexer.skipTokenOptional(TokenType::comma);
} while (m_lexer.tokenType() != TokenType::close_paren);
@@ -408,7 +410,6 @@ namespace usql {
// parenthesised expression
if (token_type == TokenType::open_paren) {
m_lexer.skipToken(TokenType::open_paren);
auto left = parse_expression();
do {
left = parse_expression(std::move(left));
@@ -454,6 +455,10 @@ namespace usql {
if (token_type == TokenType::keyword_true || token_type == TokenType::keyword_false)
return std::make_unique<BooleanValueNode>(token_type == TokenType::keyword_true);
// token * for count(*)
if (token_type == TokenType::multiply)
return std::make_unique<StringValueNode>(tokenString);
throw Exception("Unknown operand node " + tokenString);
}