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

Implement and use make_unique

Browse source 
Allows avoiding some explicit calls to new(), which can look suspicious
This commit is contained in:
ridiculousfish 2017-01-21 15:02:41 -08:00
parent 5b108efde4
commit ac8b27fcb1
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/builtin_string.cpp
View file

@ -572,9 +572,9 @@ static int string_match(parser_t &parser, io_streams_t &streams, int argc, wchar
std::unique_ptr<string_matcher_t> matcher; std::unique_ptr<string_matcher_t> matcher;
if (regex) { if (regex) {
matcher.reset(new pcre2_matcher_t(argv[0], pattern, opts, streams)); matcher = make_unique<pcre2_matcher_t>(argv[0], pattern, opts, streams);
} else { } else {
matcher.reset(new wildcard_matcher_t(argv[0], pattern, opts, streams)); matcher = make_unique<wildcard_matcher_t>(argv[0], pattern, opts, streams);
} }
const wchar_t *arg; const wchar_t *arg;

6
src/common.h
View file

@ -644,6 +644,12 @@ wcstring vformat_string(const wchar_t *format, va_list va_orig);
void append_format(wcstring &str, const wchar_t *format, ...); void append_format(wcstring &str, const wchar_t *format, ...);
void append_formatv(wcstring &str, const wchar_t *format, va_list ap); void append_formatv(wcstring &str, const wchar_t *format, va_list ap);
/// make_unique implementation
template<typename T, typename... Args>
std::unique_ptr<T> make_unique(Args&&... args) {
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
/// This functions returns the end of the quoted substring beginning at \c in. The type of quoting /// This functions returns the end of the quoted substring beginning at \c in. The type of quoting
/// character is detemrined by examining \c in. Returns 0 on error. /// character is detemrined by examining \c in. Returns 0 on error.
/// ///

5
src/parser.cpp
View file

@ -573,7 +573,7 @@ job_t *parser_t::job_get_from_pid(int pid) {
profile_item_t *parser_t::create_profile_item() { profile_item_t *parser_t::create_profile_item() {
profile_item_t *result = nullptr; profile_item_t *result = nullptr;
if (g_profiling_active) { if (g_profiling_active) {
profile_items.emplace_back(new profile_item_t()); profile_items.push_back(make_unique<profile_item_t>());
result = profile_items.back().get(); result = profile_items.back().get();
} }
return result; return result;
@ -612,8 +612,7 @@ 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.
// Note usage of unique_ptr, so we don't have to delete execution_contexts.push_back(make_unique<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));
const parse_execution_context_t *ctx = execution_contexts.back().get(); const parse_execution_context_t *ctx = execution_contexts.back().get();
// Execute the first node. // Execute the first node.