RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:57:36 +00:00
Code Issues Activity Actions

Shell: Make 'if' expressions return the unevaluated value of blocks

Browse source 
This makes it possible to actually put them in a sequence and cast them
to commands.
This commit is contained in:
AnotherTest 2021-01-18 10:06:13 +03:30 • committed by Andreas Kling
parent 50473003be
commit 5ec139e728
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Shell/AST.cpp
View file

@ -1690,12 +1690,18 @@ IfCond::IfCond(Position position, Optional<Position> else_position, NonnullRefPt
if (m_true_branch) { if (m_true_branch) {
auto true_branch = m_true_branch.release_nonnull(); auto true_branch = m_true_branch.release_nonnull();
m_true_branch = create<AST::Execute>(true_branch->position(), true_branch); if (true_branch->is_execute())
m_true_branch = static_ptr_cast<AST::Execute>(true_branch)->command();
else
m_true_branch = move(true_branch);
} }
if (m_false_branch) { if (m_false_branch) {
auto false_branch = m_false_branch.release_nonnull(); auto false_branch = m_false_branch.release_nonnull();
m_false_branch = create<AST::Execute>(false_branch->position(), false_branch); if (false_branch->is_execute())
m_false_branch = static_ptr_cast<AST::Execute>(false_branch)->command();
else
m_false_branch = move(false_branch);
} }
} }

1
Userland/Shell/AST.h
View file

@ -984,7 +984,6 @@ private:
virtual RefPtr<Value> run(RefPtr<Shell>) override; virtual RefPtr<Value> run(RefPtr<Shell>) override;
virtual void highlight_in_editor(Line::Editor&, Shell&, HighlightMetadata = {}) override; virtual void highlight_in_editor(Line::Editor&, Shell&, HighlightMetadata = {}) override;
virtual HitTestResult hit_test_position(size_t) override; virtual HitTestResult hit_test_position(size_t) override;
virtual bool would_execute() const override { return true; }
virtual bool should_override_execution_in_current_process() const override { return true; } virtual bool should_override_execution_in_current_process() const override { return true; }
NonnullRefPtr<AST::Node> m_condition; NonnullRefPtr<AST::Node> m_condition;

7
Userland/Shell/Shell.cpp
View file

@ -730,7 +730,12 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
} }
} }
if (command.argv.is_empty() && !command.next_chain.is_empty() && command.should_immediately_execute_next && command.next_chain.first().node->should_override_execution_in_current_process()) { if (command.argv.is_empty()
&& !command.next_chain.is_empty()
&& command.should_immediately_execute_next
&& command.redirections.is_empty()
&& command.next_chain.first().node->should_override_execution_in_current_process()) {
for (auto& next_in_chain : command.next_chain) for (auto& next_in_chain : command.next_chain)
run_tail(command, next_in_chain, last_return_code); run_tail(command, next_in_chain, last_return_code);
return nullptr; return nullptr;