Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 13:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use unique_ptr in a parser's execution_context list

Browse source 
Avoids requiring manual calls to delete
This commit is contained in:
ridiculousfish 2017-01-21 14:53:10 -08:00
parent 16bc7b48b5
commit f2884343b3
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/parser.cpp
View file

@ -101,6 +101,8 @@ static wcstring user_presentable_path(const wcstring &path) {
parser_t::parser_t() : cancellation_requested(false), is_within_fish_initialization(false) {} parser_t::parser_t() : cancellation_requested(false), is_within_fish_initialization(false) {}
// Out of line destructor to enable forward declaration of parse_execution_context_t
parser_t::~parser_t() {}
static parser_t s_principal_parser; static parser_t s_principal_parser;
@ -481,7 +483,7 @@ wcstring parser_t::current_line() {
if (execution_contexts.empty()) { if (execution_contexts.empty()) {
return wcstring(); return wcstring();
} }
const parse_execution_context_t *context = execution_contexts.back(); const parse_execution_context_t *context = execution_contexts.back().get();
assert(context != NULL); assert(context != NULL);
int source_offset = context->get_current_source_offset(); int source_offset = context->get_current_source_offset();
@ -610,17 +612,16 @@ int parser_t::eval_acquiring_tree(const wcstring &cmd, const io_chain_t &io,
(execution_contexts.empty() ? -1 : execution_contexts.back()->current_eval_level()); (execution_contexts.empty() ? -1 : execution_contexts.back()->current_eval_level());
// Append to the execution context stack. // Append to the execution context stack.
parse_execution_context_t *ctx = // Note usage of unique_ptr, so we don't have to delete
new parse_execution_context_t(tree, cmd, this, exec_eval_level); execution_contexts.emplace_back(new parse_execution_context_t(tree, cmd, this, exec_eval_level));
execution_contexts.push_back(ctx); const parse_execution_context_t *ctx = execution_contexts.back().get();
// Execute the first node. // Execute the first node.
this->eval_block_node(0, io, block_type); this->eval_block_node(0, io, block_type);
// Clean up the execution context stack. // Clean up the execution context stack.
assert(!execution_contexts.empty() && execution_contexts.back() == ctx); assert(!execution_contexts.empty() && execution_contexts.back().get() == ctx);
execution_contexts.pop_back(); execution_contexts.pop_back();
delete ctx;
return 0; return 0;
} }
@ -631,7 +632,7 @@ int parser_t::eval_block_node(node_offset_t node_idx, const io_chain_t &io,
// the topmost execution context's tree. What happens if two trees were to be interleaved? // the topmost execution context's tree. What happens if two trees were to be interleaved?
// Fortunately that cannot happen (yet); in the future we probably want some sort of reference // Fortunately that cannot happen (yet); in the future we probably want some sort of reference
// counted trees. // counted trees.
parse_execution_context_t *ctx = execution_contexts.back(); parse_execution_context_t *ctx = execution_contexts.back().get();
assert(ctx != NULL); assert(ctx != NULL);
CHECK_BLOCK(1); CHECK_BLOCK(1);
@ -655,7 +656,7 @@ int parser_t::eval_block_node(node_offset_t node_idx, const io_chain_t &io,
job_reap(0); // not sure why we reap jobs here job_reap(0); // not sure why we reap jobs here
/* Start it up */ // Start it up
const block_t *const start_current_block = current_block(); const block_t *const start_current_block = current_block();
block_t *scope_block = new scope_block_t(block_type); block_t *scope_block = new scope_block_t(block_type);
this->push_block(scope_block); this->push_block(scope_block);

6
src/parser.h
View file

@ -181,8 +181,8 @@ class parser_t {
volatile sig_atomic_t cancellation_requested; volatile sig_atomic_t cancellation_requested;
/// Indicates that we are within the process of initializing fish. /// Indicates that we are within the process of initializing fish.
bool is_within_fish_initialization; bool is_within_fish_initialization;
/// Stack of execution contexts. We own these pointers and must delete them. /// Stack of execution contexts.
std::vector<parse_execution_context_t *> execution_contexts; std::vector<std::unique_ptr<parse_execution_context_t>> execution_contexts;
/// List of called functions, used to help prevent infinite recursion. /// List of called functions, used to help prevent infinite recursion.
wcstring_list_t forbidden_function; wcstring_list_t forbidden_function;
/// The jobs associated with this parser. /// The jobs associated with this parser.
@ -337,6 +337,8 @@ class parser_t {
/// Return a string representing the current stack trace. /// Return a string representing the current stack trace.
wcstring stack_trace() const; wcstring stack_trace() const;
~parser_t();
}; };
#endif #endif