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

Simplify the parser_t::eval() return type to void

Browse source 
The return value was unused.
This commit is contained in:
ridiculousfish 2018-02-11 23:13:06 -08:00
parent 4eb73862fc
commit d536b152f7
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/parser.cpp
View file

@ -644,22 +644,18 @@ int parser_t::eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_t
fwprintf(stderr, L"%ls\n", backtrace_and_desc.c_str()); fwprintf(stderr, L"%ls\n", backtrace_and_desc.c_str());
return 1; return 1;
} }
return this->eval(ps, io, block_type); this->eval(ps, io, block_type);
return 0;
} }
int parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type) { void parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type) {
CHECK_BLOCK(1); CHECK_BLOCK(1);
assert(block_type == TOP || block_type == SUBST); assert(block_type == TOP || block_type == SUBST);
if (!ps->tree.empty()) {
if (ps->tree.empty()) { // Execute the first node.
return 0; tnode_t<grammar::job_list> start{&ps->tree, &ps->tree.front()};
this->eval_node(ps, start, io, block_type);
} }
// Execute the first node.
tnode_t<grammar::job_list> start{&ps->tree, &ps->tree.front()};
this->eval_node(ps, start, io, block_type);
return 0;
} }
template <typename T> template <typename T>

4
src/parser.h
View file

@ -238,11 +238,11 @@ class parser_t {
/// \param io io redirections to perform on all started jobs /// \param io io redirections to perform on all started jobs
/// \param block_type The type of block to push on the block stack /// \param block_type The type of block to push on the block stack
/// ///
/// \return 0 on success, 1 otherwise /// \return 0 on success, 1 on a parse error.
int eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type); int eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type);
/// Evaluate the parsed source ps. /// Evaluate the parsed source ps.
int eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type); void eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type);
/// Evaluates a node. /// Evaluates a node.
/// The node type must be grammar::statement or grammar::job_list. /// The node type must be grammar::statement or grammar::job_list.