Additional code tweak in command_manager.cc

This commit is contained in:
Maxime Coste 2015-08-29 21:39:23 +01:00
parent ac78cfa11c
commit 64c21b93a5

View File

@ -242,9 +242,9 @@ Token parse_percent_token(Reader& reader)
}; };
char opening_delimiter = *reader; char opening_delimiter = *reader;
auto coord = reader.coord;
++reader; ++reader;
auto start = reader.pos; auto start = reader.pos;
auto coord = reader.coord;
auto it = find_if(matching_pairs, [opening_delimiter](const CharPair& cp) auto it = find_if(matching_pairs, [opening_delimiter](const CharPair& cp)
{ return opening_delimiter == cp.opening; }); { return opening_delimiter == cp.opening; });
@ -456,8 +456,8 @@ void CommandManager::execute(StringView command_line,
shell_params, shell_params,
env_vars)); env_vars));
it = tokens.erase(it); it = tokens.erase(it);
for (auto& token : shell_tokens) for (Token& token : shell_tokens)
it = ++tokens.insert(it, std::move(token)); it = ++tokens.emplace(it, std::move(token));
if (tokens.empty()) if (tokens.empty())
break; break;