RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 10:18:13 +00:00
Code Issues Activity Actions

LibSQL: Parse terminating semi-colon in top-level statement parser

Browse source 
Currently, every parse_*_statement method ends by parsing a semi-colon.
This will prevent nested statements, e.g. a SELECT statement may be
nested in a CREATE TABLE statement. Move the semi-colon expectation up
and out of the individual statement parsers.
This commit is contained in:
Timothy Flynn 2021-04-23 13:22:42 -04:00 • committed by Andreas Kling
parent 27685bc799
commit e62e76ca1a
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Userland/Libraries/LibSQL/Parser.cpp
View file

@ -16,12 +16,17 @@ Parser::Parser(Lexer lexer)
NonnullRefPtr<Statement> Parser::next_statement()
{
auto terminate_statement = [this](auto statement) {
consume(TokenType::SemiColon);
return statement;
};
if (match(TokenType::With)) {
auto common_table_expression_list = parse_common_table_expression_list();
return parse_statement_with_expression_list(move(common_table_expression_list));
return terminate_statement(parse_statement_with_expression_list(move(common_table_expression_list)));
}
return parse_statement();
return terminate_statement(parse_statement());
}
NonnullRefPtr<Statement> Parser::parse_statement()
@ -83,8 +88,6 @@ NonnullRefPtr<CreateTable> Parser::parse_create_table_statement()
// FIXME: Parse "table-constraint".
consume(TokenType::SemiColon);
return create_ast_node<CreateTable>(move(schema_name), move(table_name), move(column_definitions), is_temporary, is_error_if_table_exists);
}
@ -104,8 +107,6 @@ NonnullRefPtr<DropTable> Parser::parse_drop_table_statement()
String table_name;
parse_schema_and_table_name(schema_name, table_name);
consume(TokenType::SemiColon);
return create_ast_node<DropTable>(move(schema_name), move(table_name), is_error_if_table_does_not_exist);
}
@ -124,8 +125,6 @@ NonnullRefPtr<Delete> Parser::parse_delete_statement(RefPtr<CommonTableExpressio
if (match(TokenType::Returning))
returning_clause = parse_returning_clause();
consume(TokenType::SemiColon);
return create_ast_node<Delete>(move(common_table_expression_list), move(qualified_table_name), move(where_clause), move(returning_clause));
}
@ -192,8 +191,6 @@ NonnullRefPtr<Select> Parser::parse_select_statement(RefPtr<CommonTableExpressio
limit_clause = create_ast_node<LimitClause>(move(limit_expression), move(offset_expression));
}
consume(TokenType::SemiColon);
return create_ast_node<Select>(move(common_table_expression_list), select_all, move(result_column_list), move(table_or_subquery_list), move(where_clause), move(group_by_clause), move(ordering_term_list), move(limit_clause));
}