Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 22:14:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Migrate run_block_statement to tnode_t

Browse source
This commit is contained in:
ridiculousfish 2018-01-14 01:42:58 -08:00
parent cdc0167ba1
commit b23c6ebcba
3 changed files with 22 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/parse_execution.cpp
View file

@ -392,42 +392,24 @@ parse_execution_result_t parse_execution_context_t::run_function_statement(
} }
parse_execution_result_t parse_execution_context_t::run_block_statement( parse_execution_result_t parse_execution_context_t::run_block_statement(
const parse_node_t &statement) { tnode_t<g::block_statement> statement) {
assert(statement.type == symbol_block_statement); tnode_t<g::block_header> bheader = statement.child<0>();
tnode_t<g::job_list> contents = statement.child<1>();
const parse_node_t &block_header =
*get_child(statement, 0, symbol_block_header); // block header
const parse_node_t &header =
*get_child(block_header, 0); // specific header type (e.g. for loop)
const parse_node_t &contents = *get_child(statement, 1, symbol_job_list); // block contents
parse_execution_result_t ret = parse_execution_success; parse_execution_result_t ret = parse_execution_success;
switch (header.type) { if (auto header = bheader.try_get_child<g::for_header, 0>()) {
case symbol_for_header: { ret = run_for_statement(header, contents);
ret = run_for_statement(header, contents); } else if (auto header = bheader.try_get_child<g::while_header, 0>()) {
break; ret = run_while_statement(header, contents);
} } else if (auto header = bheader.try_get_child<g::function_header, 0>()) {
case symbol_while_header: { tnode_t<g::end_command> func_end = statement.child<2>();
ret = run_while_statement(header, contents); ret = run_function_statement(header, func_end);
break; } else if (auto header = bheader.try_get_child<g::begin_header, 0>()) {
} ret = run_begin_statement(header, contents);
case symbol_function_header: { } else {
const parse_node_t &function_end = *get_child( debug(0, L"Unexpected block header: %ls\n", bheader.node()->describe().c_str());
statement, 2, symbol_end_command); // the 'end' associated with the block PARSER_DIE();
ret = run_function_statement(header, function_end);
break;
}
case symbol_begin_header: {
ret = run_begin_statement(header, contents);
break;
}
default: {
debug(0, L"Unexpected block header: %ls\n", header.describe().c_str());
PARSER_DIE();
break;
}
} }
return ret; return ret;
} }
@ -1233,7 +1215,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(const parse_node_t
assert(specific_statement_type_is_redirectable_block(specific_statement)); assert(specific_statement_type_is_redirectable_block(specific_statement));
switch (specific_statement.type) { switch (specific_statement.type) {
case symbol_block_statement: { case symbol_block_statement: {
result = this->run_block_statement(specific_statement); result = this->run_block_statement({&tree(), &specific_statement});
break; break;
} }
case symbol_if_statement: { case symbol_if_statement: {
@ -1394,7 +1376,7 @@ parse_execution_result_t parse_execution_context_t::eval_node_at_offset(
break; break;
} }
case symbol_block_statement: { case symbol_block_statement: {
status = this->run_block_statement(node); status = this->run_block_statement({&tree(), &node});
break; break;
} }
case symbol_if_statement: { case symbol_if_statement: {

2
src/parse_execution.h
View file

@ -94,7 +94,7 @@ class parse_execution_context_t {
const parse_node_t &statement_node); const parse_node_t &statement_node);
// These encapsulate the actual logic of various (block) statements. // These encapsulate the actual logic of various (block) statements.
parse_execution_result_t run_block_statement(const parse_node_t &statement); parse_execution_result_t run_block_statement(tnode_t<grammar::block_statement> statement);
parse_execution_result_t run_for_statement(const parse_node_t &header, parse_execution_result_t run_for_statement(const parse_node_t &header,
const parse_node_t &contents); const parse_node_t &contents);
parse_execution_result_t run_if_statement(const parse_node_t &statement); parse_execution_result_t run_if_statement(const parse_node_t &statement);

6
src/parse_grammar.h
View file

@ -248,7 +248,8 @@ DEF(case_item) produces_sequence<keyword<parse_keyword_case>, argument_list, tok
}; };
DEF(block_statement) DEF(block_statement)
produces_sequence<block_header, job_list, end_command, arguments_or_redirections_list>{}; produces_sequence<block_header, job_list, end_command, arguments_or_redirections_list>{
BODY(block_statement)};
DEF_ALT(block_header) { DEF_ALT(block_header) {
using forh = single<for_header>; using forh = single<for_header>;
@ -271,7 +272,8 @@ DEF(begin_header) produces_single<keyword<parse_keyword_begin>>{BODY(begin_heade
// Functions take arguments, and require at least one (the name). No redirections allowed. // Functions take arguments, and require at least one (the name). No redirections allowed.
DEF(function_header) DEF(function_header)
produces_sequence<keyword<parse_keyword_function>, argument, argument_list, tok_end>{}; produces_sequence<keyword<parse_keyword_function>, argument, argument_list, tok_end>{
BODY(function_header)};
// A boolean statement is AND or OR or NOT // A boolean statement is AND or OR or NOT
DEF_ALT(boolean_statement) { DEF_ALT(boolean_statement) {