beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibSQL: Add Parser::consume_if helper

Browse source 
The following is a common (and soon to be *very* common) expression:

    if (match(token_type))
        consume();

Using consume_if() makes this a bit simpler and makes it less likely to
forget to invoke consume() after the match().
This commit is contained in:
Timothy Flynn 2021-04-21 09:38:07 -04:00 committed by Andreas Kling
parent 912c9c93e9
commit a11f49f627
Notes: sideshowbarker 2024-07-18 19:17:23 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/a11f49f627d
Pull-request: https://github.com/SerenityOS/serenity/pull/6538
Reviewed-by: https://github.com/awesomekling
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,16 +52,13 @@ NonnullRefPtr<CreateTable> Parser::parse_create_table_statement()
consume(TokenType::Create);
bool is_temporary = false;
if (match(TokenType::Temp) || match(TokenType::Temporary)) {
consume();
if (consume_if(TokenType::Temp) || consume_if(TokenType::Temporary))
is_temporary = true;
}
consume(TokenType::Table);
bool is_error_if_table_exists = true;
if (match(TokenType::If)) {
consume(TokenType::If);
if (consume_if(TokenType::If)) {
consume(TokenType::Not);
consume(TokenType::Exists);
is_error_if_table_exists = false;
@ -71,8 +68,7 @@ NonnullRefPtr<CreateTable> Parser::parse_create_table_statement()
String schema_name;
String table_name;
if (match(TokenType::Period)) {
consume();
if (consume_if(TokenType::Period)) {
schema_name = move(schema_or_table_name);
table_name = consume(TokenType::Identifier).value();
} else {
@ -107,8 +103,7 @@ NonnullRefPtr<DropTable> Parser::parse_drop_table_statement()
consume(TokenType::Table);
bool is_error_if_table_does_not_exist = true;
if (match(TokenType::If)) {
consume(TokenType::If);
if (consume_if(TokenType::If)) {
consume(TokenType::Exists);
is_error_if_table_does_not_exist = false;
}
@ -117,8 +112,7 @@ NonnullRefPtr<DropTable> Parser::parse_drop_table_statement()
String schema_name;
String table_name;
if (match(TokenType::Period)) {
consume();
if (consume_if(TokenType::Period)) {
schema_name = move(schema_or_table_name);
table_name = consume(TokenType::Identifier).value();
} else {
@ -151,14 +145,11 @@ NonnullRefPtr<TypeName> Parser::parse_type_name()
auto name = consume(TokenType::Identifier).value();
NonnullRefPtrVector<SignedNumber> signed_numbers;
if (match(TokenType::ParenOpen)) {
consume();
if (consume_if(TokenType::ParenOpen)) {
signed_numbers.append(parse_signed_number());
if (match(TokenType::Comma)) {
consume();
if (consume_if(TokenType::Comma))
signed_numbers.append(parse_signed_number());
}
consume(TokenType::ParenClose);
}
@ -171,12 +162,10 @@ NonnullRefPtr<SignedNumber> Parser::parse_signed_number()
// https://sqlite.org/syntax/signed-number.html
bool is_positive = true;
if (match(TokenType::Plus)) {
consume();
} else if (match(TokenType::Minus)) {
if (consume_if(TokenType::Plus))
is_positive = true;
else if (consume_if(TokenType::Minus))
is_positive = false;
consume();
}
if (match(TokenType::NumericLiteral)) {
auto number = consume(TokenType::NumericLiteral).double_value();
@ -202,6 +191,15 @@ Token Parser::consume(TokenType expected_type)
return consume();
}
bool Parser::consume_if(TokenType expected_type)
{
if (!match(expected_type))
return false;
consume();
return true;
}
bool Parser::match(TokenType type) const
{
return m_parser_state.m_token.type() == type;

1
Userland/Libraries/LibSQL/Parser.h
View file

@ -75,6 +75,7 @@ private:
Token consume();
Token consume(TokenType type);
bool consume_if(TokenType type);
bool match(TokenType type) const;
void expected(StringView what);