RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-25 22:35:07 +00:00
Code Issues Activity Actions

LibSQL: Properly parse ESCAPE expressions

Browse source 
The evaluation order of method parameters is unspecified in C++, and
so we couldn't rely on parse_statement() being called before
parse_escape() when building a MatchExpression.

With this patch, we explicitly parse what we need in the right order,
before building the MatchExpression object.
This commit is contained in:
Guilherme Gonçalves 2021-12-29 11:48:09 -03:00 • committed by Ali Mohammad Pur
parent d1e3470438
commit e957c078d5
2 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibSQL/AST/Parser.cpp
View file

@ -739,22 +739,35 @@ RefPtr<Expression> Parser::parse_match_expression(NonnullRefPtr<Expression> lhs,
{
auto parse_escape = [this]() {
RefPtr<Expression> escape;
if (consume_if(TokenType::Escape))
if (consume_if(TokenType::Escape)) {
escape = parse_expression();
}
return escape;
};
if (consume_if(TokenType::Like))
return create_ast_node<MatchExpression>(MatchOperator::Like, move(lhs), parse_expression(), parse_escape(), invert_expression);
if (consume_if(TokenType::Like)) {
NonnullRefPtr<Expression> rhs = parse_expression();
RefPtr<Expression> escape = parse_escape();
return create_ast_node<MatchExpression>(MatchOperator::Like, move(lhs), move(rhs), move(escape), invert_expression);
}
if (consume_if(TokenType::Glob))
return create_ast_node<MatchExpression>(MatchOperator::Glob, move(lhs), parse_expression(), parse_escape(), invert_expression);
if (consume_if(TokenType::Glob)) {
NonnullRefPtr<Expression> rhs = parse_expression();
RefPtr<Expression> escape = parse_escape();
return create_ast_node<MatchExpression>(MatchOperator::Glob, move(lhs), move(rhs), move(escape), invert_expression);
}
if (consume_if(TokenType::Match))
return create_ast_node<MatchExpression>(MatchOperator::Match, move(lhs), parse_expression(), parse_escape(), invert_expression);
if (consume_if(TokenType::Match)) {
NonnullRefPtr<Expression> rhs = parse_expression();
RefPtr<Expression> escape = parse_escape();
return create_ast_node<MatchExpression>(MatchOperator::Match, move(lhs), move(rhs), move(escape), invert_expression);
}
if (consume_if(TokenType::Regexp))
return create_ast_node<MatchExpression>(MatchOperator::Regexp, move(lhs), parse_expression(), parse_escape(), invert_expression);
if (consume_if(TokenType::Regexp)) {
NonnullRefPtr<Expression> rhs = parse_expression();
RefPtr<Expression> escape = parse_escape();
return create_ast_node<MatchExpression>(MatchOperator::Regexp, move(lhs), move(rhs), move(escape), invert_expression);
}
return {};
}