h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-07 18:21:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

More work towards instanced parser. First successful compilation

Browse Source
This commit is contained in:
ridiculousfish
2012-01-22 21:40:08 -08:00
parent da85bdc401
commit b43c8da66b
13 changed files with 89 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
expand.cpp
View File

@@ -1766,8 +1766,9 @@ static void remove_internal_separator2( wcstring &s, int conv )
}
int expand_string2( parser_t &parser, const wcstring &input, std::vector<wcstring> &output, int flags )
int expand_string2( const wcstring &input, std::vector<wcstring> &output, int flags )
{
parser_t &parser = parser_t::principal_parser();
std::vector<wcstring> list1, list2;
std::vector<wcstring> *in, *out;
@@ -1985,14 +1986,14 @@ int expand_string2( parser_t &parser, const wcstring &input, std::vector<wcstrin
/**
The real expansion function. expand_one is just a wrapper around this one.
*/
int expand_string( parser_t &parser,
void *context,
int expand_string( void *context,
wchar_t *str,
array_list_t *end_out,
int flags )
{
array_list_t list1, list2;
array_list_t *in, *out;
parser_t &parser = parser_t::principal_parser();
int i;
int cmdsubst_ok = 1;