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

Shell: Mark AST::Background as would_execute if its subnode does

Browse source
This commit is contained in:
AnotherTest 2020-08-22 13:48:02 +04:30 • committed by Andreas Kling
parent 2fd9e72264
commit 0676bd4afc
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Shell/AST.cpp
View file

@ -336,7 +336,19 @@ void Background::dump(int level) const
RefPtr<Value> Background::run(RefPtr<Shell> shell)
{
auto commands = m_command->run(shell)->resolve_as_commands(shell);
// FIXME: Currently this does not work correctly if `m_command.would_execute()',
// as it runs the node, which means nodes likes And and Or will evaluate
// all but their last subnode before yielding to this, causing a command
// like `foo && bar&` to effectively be `foo && (bar&)`.
auto value = m_command->run(shell)->resolve_without_cast(shell);
if (value->is_job()) {
auto job = static_cast<JobValue*>(value.ptr())->job();
job->set_running_in_background(true);
job->set_should_announce_exit(true);
return value;
}
auto commands = value->resolve_as_commands(shell);
auto& last = commands.last();
last.should_wait = false;
@ -1021,6 +1033,9 @@ void Execute::for_each_entry(RefPtr<Shell> shell, Function<IterationDecision(Ref
RefPtr<Value> Execute::run(RefPtr<Shell> shell)
{
if (m_command->would_execute())
return m_command->run(shell);
NonnullRefPtrVector<Value> values;
for_each_entry(shell, [&](auto value) {
values.append(*value);