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

More work to excise halloc

Browse source
This commit is contained in:
ridiculousfish 2012-01-30 02:45:55 -08:00
parent 79e0405f6a
commit 143091edad
2 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
expand.cpp
View file

@ -2626,16 +2626,20 @@ wchar_t *expand_one( void *context, const wchar_t *string, int flags )
return one; return one;
} }
bool expand_one( wcstring &in, int flag ) { bool expand_one(wcstring &string, int flags) {
std::vector<completion_t> completions;
bool result = false; bool result = false;
wchar_t *res = expand_one(NULL, in.c_str(), flag);
if (res) { if( (!(flags & ACCEPT_INCOMPLETE)) && expand_is_clean( string.c_str() ) )
in = res; {
free(res); return true;
}
if (expand_string2(string, completions, flags)) {
if (completions.size() == 1) {
string = completions.at(0).completion;
result = true; result = true;
} }
}
return result; return result;
} }

34
highlight.cpp
View file

@ -519,7 +519,7 @@ static void highlight_param( const wchar_t * buff,
} }
} }
static int has_expand_reserved( wchar_t *str ) static int has_expand_reserved( const wchar_t *str )
{ {
while( *str ) while( *str )
{ {
@ -539,12 +539,12 @@ static int has_expand_reserved( wchar_t *str )
void tokenize( const wchar_t * const buff, int * const color, const int pos, array_list_t *error, void *context, const env_vars &vars) { void tokenize( const wchar_t * const buff, int * const color, const int pos, array_list_t *error, void *context, const env_vars &vars) {
ASSERT_IS_BACKGROUND_THREAD(); ASSERT_IS_BACKGROUND_THREAD();
wcstring cmd;
int had_cmd=0; int had_cmd=0;
int i; int i;
wchar_t *last_cmd=0; wcstring last_cmd;
int len; int len;
wchar_t *cmd=0;
int accept_switches = 1; int accept_switches = 1;
int use_function = 1; int use_function = 1;
@ -588,7 +588,7 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr
} }
else if( accept_switches ) else if( accept_switches )
{ {
if( complete_is_valid_option( last_cmd, param, error, false /* no autoload */ ) ) if( complete_is_valid_option( last_cmd.c_str(), param, error, false /* no autoload */ ) )
color[ tok_get_pos( &tok ) ] = HIGHLIGHT_PARAM; color[ tok_get_pos( &tok ) ] = HIGHLIGHT_PARAM;
else else
color[ tok_get_pos( &tok ) ] = HIGHLIGHT_ERROR; color[ tok_get_pos( &tok ) ] = HIGHLIGHT_ERROR;
@ -603,7 +603,7 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr
color[ tok_get_pos( &tok ) ] = HIGHLIGHT_PARAM; color[ tok_get_pos( &tok ) ] = HIGHLIGHT_PARAM;
} }
if( cmd && (wcscmp( cmd, L"cd" ) == 0) ) if( cmd == L"cd" )
{ {
wcstring dir_str = tok_last( &tok ); wcstring dir_str = tok_last( &tok );
if (expand_one(dir_str, EXPAND_SKIP_CMDSUBST)) if (expand_one(dir_str, EXPAND_SKIP_CMDSUBST))
@ -633,11 +633,9 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr
/* /*
Command. First check that the command actually exists. Command. First check that the command actually exists.
*/ */
cmd = expand_one( context, cmd = tok_last( &tok );
wcsdup(tok_last( &tok )), bool expanded = expand_one(cmd, EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_VARIABLES);
EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_VARIABLES); if (! expanded || has_expand_reserved(cmd.c_str()))
if( (cmd == 0) || has_expand_reserved( cmd ) )
{ {
color[ tok_get_pos( &tok ) ] = HIGHLIGHT_ERROR; color[ tok_get_pos( &tok ) ] = HIGHLIGHT_ERROR;
} }
@ -648,18 +646,18 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr
int mark = tok_get_pos( &tok ); int mark = tok_get_pos( &tok );
color[ tok_get_pos( &tok ) ] = HIGHLIGHT_COMMAND; color[ tok_get_pos( &tok ) ] = HIGHLIGHT_COMMAND;
if( parser_keywords_is_subcommand( cmd ) ) if( parser_keywords_is_subcommand( cmd.c_str() ) )
{ {
int sw; int sw;
if( wcscmp( cmd, L"builtin" )==0) if( cmd == L"builtin")
{ {
use_function = 0; use_function = 0;
use_command = 0; use_command = 0;
use_builtin = 1; use_builtin = 1;
} }
else if( wcscmp( cmd, L"command" )==0) else if( cmd == L"command")
{ {
use_command = 1; use_command = 1;
use_function = 0; use_function = 0;
@ -670,7 +668,7 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr
sw = parser_keywords_is_switch( tok_last( &tok ) ); sw = parser_keywords_is_switch( tok_last( &tok ) );
if( !parser_keywords_is_block( cmd ) && if( !parser_keywords_is_block( cmd.c_str() ) &&
sw == ARG_SWITCH ) sw == ARG_SWITCH )
{ {
/* /*
@ -712,10 +710,10 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr
any files for that any files for that
*/ */
if( use_builtin ) if( use_builtin )
is_cmd |= builtin_exists( cmd ); is_cmd |= builtin_exists( cmd.c_str() );
if( use_function ) if( use_function )
is_cmd |= function_exists_no_autoload( cmd, vars ); is_cmd |= function_exists_no_autoload( cmd.c_str(), vars );
/* /*
Moving on to expensive tests Moving on to expensive tests
@ -747,7 +745,7 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr
else else
{ {
if( error ) if( error )
al_push( error, wcsdupcat ( L"Unknown command \'", cmd, L"\'" )); al_push( error, wcsdupcat ( L"Unknown command \'", cmd.c_str(), L"\'" ));
color[ tok_get_pos( &tok ) ] = (HIGHLIGHT_ERROR); color[ tok_get_pos( &tok ) ] = (HIGHLIGHT_ERROR);
} }
had_cmd = 1; had_cmd = 1;
@ -755,7 +753,7 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr
if( had_cmd ) if( had_cmd )
{ {
last_cmd = halloc_wcsdup( context, tok_last( &tok ) ); last_cmd = tok_last( &tok );
} }
} }