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

Use vector instead of deque in input_function_push_args

Browse source 
deque is a memory hog last I checked
This commit is contained in:
ridiculousfish 2016-02-02 18:13:40 -08:00
parent 1b8face1a3
commit df8c4ce835
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/input.cpp
View file

@ -42,7 +42,6 @@
#include "output.h" #include "output.h"
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <deque>
#define DEFAULT_TERM L"ansi" #define DEFAULT_TERM L"ansi"
#define MAX_INPUT_FUNCTION_ARGS 20 #define MAX_INPUT_FUNCTION_ARGS 20
@ -539,23 +538,28 @@ wchar_t input_function_pop_arg()
void input_function_push_args(int code) void input_function_push_args(int code)
{ {
int arity = input_function_arity(code); int arity = input_function_arity(code);
std::deque<wchar_t> skipped; std::vector<wchar_t> skipped;
for (int i = 0; i < arity; i++) for (int i = 0; i < arity; i++)
{ {
wchar_t arg; wchar_t arg;
// skip and queue up any function codes // skip and queue up any function codes
// See #2357
while(((arg = input_common_readch(0)) >= R_MIN) && (arg <= R_MAX)) while(((arg = input_common_readch(0)) >= R_MIN) && (arg <= R_MAX))
{ {
skipped.push_front(arg); skipped.push_back(arg);
} }
input_function_push_arg(arg); input_function_push_arg(arg);
} }
// push the function codes back into the input stream // push the function codes back into the input stream
std::for_each(skipped.begin(), skipped.end(), input_common_next_ch); size_t idx = skipped.size();
while (idx--)
{
input_common_next_ch(skipped.at(idx));
}
} }
/** /**