github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-28 12:13:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Convert populate_plain_process to tnode_t

Browse Source
This commit is contained in:
ridiculousfish 2018-01-15 12:12:42 -08:00
parent 8a14a4a5ff
commit 298db6e11a
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/parse_execution.cpp
View File

@ -700,9 +700,7 @@ static wcstring reconstruct_orig_str(wcstring tokenized_str) {
/// Handle the case of command not found. /// Handle the case of command not found.
parse_execution_result_t parse_execution_context_t::handle_command_not_found( parse_execution_result_t parse_execution_context_t::handle_command_not_found(
const wcstring &cmd_str, const parse_node_t &statement_node, int err_code) { const wcstring &cmd_str, tnode_t<g::plain_statement> statement_node, int err_code) {
assert(statement_node.type == symbol_plain_statement);
// We couldn't find the specified command. This is a non-fatal error. We want to set the exit // We couldn't find the specified command. This is a non-fatal error. We want to set the exit
// status to 127, which is the standard number used by other shells like bash and zsh. // status to 127, which is the standard number used by other shells like bash and zsh.
@ -771,16 +769,15 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
/// Creates a 'normal' (non-block) process. /// Creates a 'normal' (non-block) process.
parse_execution_result_t parse_execution_context_t::populate_plain_process( parse_execution_result_t parse_execution_context_t::populate_plain_process(
job_t *job, process_t *proc, const parse_node_t &statement) { job_t *job, process_t *proc, tnode_t<grammar::plain_statement> statement) {
assert(job != NULL); assert(job != NULL);
assert(proc != NULL); assert(proc != NULL);
assert(statement.type == symbol_plain_statement);
// We may decide that a command should be an implicit cd. // We may decide that a command should be an implicit cd.
bool use_implicit_cd = false; bool use_implicit_cd = false;
// Get the command. We expect to always get it here. // Get the command. We expect to always get it here.
wcstring cmd = *command_for_plain_statement({&tree(), &statement}, pstree->src); wcstring cmd = *command_for_plain_statement(statement, pstree->src);
// Expand it as a command. Return an error on failure. // Expand it as a command. Return an error on failure.
bool expanded = expand_one(cmd, EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_VARIABLES, NULL); bool expanded = expand_one(cmd, EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_VARIABLES, NULL);
@ -810,12 +807,10 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
const int no_cmd_err_code = errno; const int no_cmd_err_code = errno;
// If the specified command does not exist, and is undecorated, try using an implicit cd. // If the specified command does not exist, and is undecorated, try using an implicit cd.
if (!has_command && if (!has_command && get_decoration(statement) == parse_statement_decoration_none) {
get_decoration({&tree(), &statement}) == parse_statement_decoration_none) {
// Implicit cd requires an empty argument and redirection list. // Implicit cd requires an empty argument and redirection list.
const parse_node_t *args = tnode_t<g::arguments_or_redirections_list> args = statement.child<1>();
get_child(statement, 1, symbol_arguments_or_redirections_list); if (!args.try_get_child<g::argument_or_redirection, 0>()) {
if (args->child_count == 0) {
// Ok, no arguments or redirections; check to see if the first argument is a // Ok, no arguments or redirections; check to see if the first argument is a
// directory. // directory.
wcstring implicit_cd_path; wcstring implicit_cd_path;
@ -1070,8 +1065,8 @@ parse_execution_result_t parse_execution_context_t::populate_job_process(
} }
case symbol_decorated_statement: { case symbol_decorated_statement: {
// Get the plain statement. It will pull out the decoration itself. // Get the plain statement. It will pull out the decoration itself.
const parse_node_t &plain_statement = tnode_t<g::decorated_statement> dec_stat{&tree(), &specific_statement};
tree().find_child(specific_statement, symbol_plain_statement); auto plain_statement = dec_stat.find_child<g::plain_statement>();
result = this->populate_plain_process(job, proc, plain_statement); result = this->populate_plain_process(job, proc, plain_statement);
break; break;
} }

4
src/parse_execution.h
View File

@ -65,7 +65,7 @@ class parse_execution_context_t {
/// Command not found support. /// Command not found support.
parse_execution_result_t handle_command_not_found(const wcstring &cmd, parse_execution_result_t handle_command_not_found(const wcstring &cmd,
const parse_node_t &statement_node, tnode_t<grammar::plain_statement> statement,
int err_code); int err_code);
// Utilities // Utilities
@ -89,7 +89,7 @@ class parse_execution_context_t {
parse_execution_result_t populate_boolean_process( parse_execution_result_t populate_boolean_process(
job_t *job, process_t *proc, tnode_t<grammar::boolean_statement> bool_statement); job_t *job, process_t *proc, tnode_t<grammar::boolean_statement> bool_statement);
parse_execution_result_t populate_plain_process(job_t *job, process_t *proc, parse_execution_result_t populate_plain_process(job_t *job, process_t *proc,
const parse_node_t &statement); tnode_t<grammar::plain_statement> statement);
parse_execution_result_t populate_block_process(job_t *job, process_t *proc, parse_execution_result_t populate_block_process(job_t *job, process_t *proc,
const parse_node_t &statement_node); const parse_node_t &statement_node);

9
src/parse_tree.h
View File

@ -357,6 +357,15 @@ class tnode_t {
return result; return result;
} }
/// Find the first direct child of the given node of the given type. asserts on failure.
template <class ChildType>
tnode_t<ChildType> find_child() const {
assert(nodeptr && "receiver is missing in find_child()");
tnode_t<ChildType> result{tree, &tree->find_child(*nodeptr, ChildType::token)};
assert(result && "cannot find child");
return result;
}
/// Type-safe access to a node's parent. /// Type-safe access to a node's parent.
/// If the parent exists and has type ParentType, return it. /// If the parent exists and has type ParentType, return it.
/// Otherwise return a missing tnode. /// Otherwise return a missing tnode.