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

Shell: Don't skip over the first brace expansion entry if it's empty

Browse source 
Previously we were simply ignoring the empty entry in '{,x}', making it
resolve to a list with a single element '(x)', this commit makes that
work as expected and resolve to '("" x)'.
This commit is contained in:
Ali Mohammad Pur 2021-12-14 17:24:53 +03:30 • committed by Ali Mohammad Pur
parent 7ac8bd44f8
commit 9bf81463f5
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Shell/Parser.cpp
View file

@ -1919,6 +1919,12 @@ RefPtr<AST::Node> Parser::parse_brace_expansion_spec()
m_extra_chars_not_allowed_in_barewords.append(','); m_extra_chars_not_allowed_in_barewords.append(',');
auto rule_start = push_start(); auto rule_start = push_start();
NonnullRefPtrVector<AST::Node> subexpressions;
if (next_is(",")) {
// Note that we don't consume the ',' here.
subexpressions.append(create<AST::StringLiteral>(""));
} else {
auto start_expr = parse_expression(); auto start_expr = parse_expression();
if (start_expr) { if (start_expr) {
if (expect("..")) { if (expect("..")) {
@ -1933,9 +1939,9 @@ RefPtr<AST::Node> Parser::parse_brace_expansion_spec()
} }
} }
NonnullRefPtrVector<AST::Node> subexpressions;
if (start_expr) if (start_expr)
subexpressions.append(start_expr.release_nonnull()); subexpressions.append(start_expr.release_nonnull());
}
while (expect(',')) { while (expect(',')) {
auto expr = parse_expression(); auto expr = parse_expression();