preparing for functions

This commit is contained in:
2021-07-14 23:18:54 +02:00
parent eebfaacde4
commit 24d4fb2567
9 changed files with 535 additions and 467 deletions

View File

@@ -82,8 +82,7 @@ namespace usql {
lexer.nextToken();
}
cols_def.push_back(
ColDefNode(column_name, column_type, column_order++, column_len, column_nullable));
cols_def.push_back( ColDefNode(column_name, column_type, column_order++, column_len, column_nullable));
lexer.skipTokenOptional(TokenType::comma);
@@ -99,7 +98,7 @@ namespace usql {
std::unique_ptr<Node> Parser::parse_insert_into_table() {
std::vector<Node> exec_code{};
std::vector<ColNameNode> cols_names{};
std::vector<ColValueNode> cols_values{};
std::vector<std::unique_ptr<Node>> cols_values{};
lexer.skipToken(TokenType::keyword_insert);
lexer.skipToken(TokenType::keyword_into);
@@ -123,15 +122,44 @@ namespace usql {
// column values
lexer.skipToken(TokenType::open_paren);
do {
cols_values.push_back(lexer.consumeCurrentToken().token_string);
// cols_values.push_back(lexer.consumeCurrentToken().token_string);
auto col_value = parse_value();
cols_values.push_back(std::move(col_value));
lexer.skipTokenOptional(TokenType::comma);
} while (lexer.tokenType() != TokenType::close_paren);
lexer.skipToken(TokenType::close_paren);
return std::make_unique<InsertIntoTableNode>(table_name, cols_names, cols_values);
return std::make_unique<InsertIntoTableNode>(table_name, cols_names, std::move(cols_values));
}
std::unique_ptr<Node> Parser::parse_value() {
if (lexer.tokenType() == TokenType::int_number) {
return std::make_unique<IntValueNode>(std::stoi(lexer.consumeCurrentToken().token_string));
}
if (lexer.tokenType() == TokenType::double_number) {
return std::make_unique<FloatValueNode>(std::stof(lexer.consumeCurrentToken().token_string));
}
if (lexer.tokenType() == TokenType::string_literal) {
if (lexer.nextTokenType() != TokenType::open_paren) {
return std::make_unique<StringValueNode>(lexer.consumeCurrentToken().token_string);
} else {
// function
std::string func_name = lexer.consumeCurrentToken().token_string;
std::vector<std::unique_ptr<Node>> pars;
lexer.skipToken(TokenType::open_paren);
while (lexer.tokenType() != TokenType::close_paren) { // TODO handle errors
auto par = parse_value();
lexer.skipTokenOptional(TokenType::comma);
}
lexer.skipToken(TokenType::close_paren);
return std::make_unique<FunctionNode>(func_name, std::move(pars));
}
}
throw Exception("Syntax error");
}
std::unique_ptr<Node> Parser::parse_select_from_table() {
std::vector<ColNameNode> cols_names{};