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

Shell: Allow commands in variables, and properly substitute them on use

Browse source 
This allows the below interaction to work:
```
$ silence=(2>&1 >/dev/null)
$ do_noisy_thing with these args $silence
<nothing here lol>
```
This commit is contained in:
AnotherTest 2020-06-22 15:37:20 +04:30 • committed by Andreas Kling
parent 42304d7bf1
commit c5d0aa9a44
5 changed files with 161 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Shell/Parser.cpp
View file

@ -200,7 +200,19 @@ RefPtr<AST::Node> Parser::parse_variable_decls()
auto name_expr = create<AST::BarewordLiteral>(move(var_name));
auto start = push_start();
auto expression = parse_expression();
if (!expression || expression->is_syntax_error()) {
m_offset = start->offset;
if (peek() == '(') {
consume();
auto command = parse_pipe_sequence();
expect(')');
if (!command)
m_offset = start->offset;
expression = command;
}
}
if (!expression) {
if (is_whitespace(peek())) {
auto string_start = push_start();
@ -432,10 +444,10 @@ RefPtr<AST::Node> Parser::parse_expression()
if (starting_char == '(') {
consume();
auto list = parse_list_expression();
if (!list)
list = create<AST::SyntaxError>();
if (!expect(')'))
return read_concat(create<AST::SyntaxError>());
if (!expect(')')) {
m_offset = rule_start->offset;
return nullptr;
}
return read_concat(create<AST::CastToList>(move(list))); // Cast To List
}