h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-27 12:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Add && and || support to the conditions of if and while

Browse Source 
This updates the "boolean tail" feature of the if and while conditions
to know about job_conjunction, thereby respecting && and ||
This commit is contained in:
ridiculousfish
2018-03-02 10:23:57 -08:00
parent 8e9670ccd5
commit e1dafeab01
7 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/parse_execution.cpp
View File

@@ -244,12 +244,12 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
}
// An if condition has a job and a "tail" of andor jobs, e.g. "foo ; and bar; or baz".
tnode_t<g::job> condition_head = if_clause.child<1>();
tnode_t<g::job_conjunction> condition_head = if_clause.child<1>();
tnode_t<g::andor_job_list> condition_boolean_tail = if_clause.child<3>();
// Check the condition and the tail. We treat parse_execution_errored here as failure, in
// accordance with historic behavior.
parse_execution_result_t cond_ret = run_1_job(condition_head, ib);
parse_execution_result_t cond_ret = run_job_conjunction(condition_head, ib);
if (cond_ret == parse_execution_success) {
cond_ret = run_job_list(condition_boolean_tail, ib);
}
@@ -527,13 +527,13 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
parse_execution_result_t ret = parse_execution_success;
// The conditions of the while loop.
tnode_t<g::job> condition_head = header.child<1>();
tnode_t<g::job_conjunction> condition_head = header.child<1>();
tnode_t<g::andor_job_list> condition_boolean_tail = header.child<3>();
// Run while the condition is true.
for (;;) {
// Check the condition.
parse_execution_result_t cond_ret = this->run_1_job(condition_head, wb);
parse_execution_result_t cond_ret = this->run_job_conjunction(condition_head, wb);
if (cond_ret == parse_execution_success) {
cond_ret = run_job_list(condition_boolean_tail, wb);
}