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

Fix non-zero arity functions followed by other functions

Browse source 
Temporarily skip any queued function code characters when reading
the current function's arguments.

Fixes #2357.
This commit is contained in:
Chris Pick 2015-09-03 15:12:56 -04:00
parent ab6d9ad521
commit 8cc154bc48
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/input.cpp
View file

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