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

Migrate some al_list to std::vector

Browse source
This commit is contained in:
ridiculousfish 2012-02-02 14:27:13 -08:00
parent cdd5b1ed26
commit 6afc06b97e
3 changed files with 14 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
reader.cpp
View file

@ -210,7 +210,7 @@ class reader_data_t
/**
List for storing previous search results. Used to avoid duplicates.
*/
array_list_t search_prev;
wcstring_list_t search_prev;
/**
The current position in search_prev
@ -1746,7 +1746,7 @@ void reader_sanity_check()
}
}
void reader_replace_current_token( wchar_t *new_token )
void reader_replace_current_token( const wchar_t *new_token )
{
wchar_t *begin, *end;
@ -1795,23 +1795,6 @@ static void handle_history( const wchar_t *new_str )
}
}
/**
Check if the specified string is contained in the list, using
wcscmp as a comparison function
*/
static int contains_al( const wchar_t *needle,
array_list_t *haystack )
{
int i;
for( i=0; i<al_get_count( haystack ); i++ )
{
if( !wcscmp( needle, (const wchar_t *)al_get( haystack, i ) ) )
return 1;
}
return 0;
}
/**
Reset the data structures associated with the token search
*/
@ -1829,9 +1812,8 @@ static void reset_token_history()
data->token_history_pos = -1;
data->search_pos=0;
al_foreach( &data->search_prev, &free );
al_truncate( &data->search_prev, 0 );
al_push( &data->search_prev, wcsdup( (wchar_t *)data->search_buff.buff ) );
data->search_prev.resize(0);
data->search_prev.push_back(reinterpret_cast<const wchar_t *>(data->search_buff.buff));
}
@ -1843,7 +1825,7 @@ static void reset_token_history()
*/
static void handle_token_history( int forward, int reset )
{
wchar_t *str=0;
const wchar_t *str=0;
int current_pos;
tokenizer tok;
@ -1859,7 +1841,7 @@ static void handle_token_history( int forward, int reset )
current_pos = data->token_history_pos;
if( forward || data->search_pos < (al_get_count( &data->search_prev )-1) )
if( forward || data->search_pos + 1 < (long)data->search_prev.size() )
{
if( forward )
{
@ -1867,12 +1849,12 @@ static void handle_token_history( int forward, int reset )
{
data->search_pos--;
}
str = (wchar_t *)al_get( &data->search_prev, data->search_pos );
str = data->search_prev.at(data->search_pos).c_str();
}
else
{
data->search_pos++;
str = (wchar_t *)al_get( &data->search_prev, data->search_pos );
str = data->search_prev.at(data->search_pos).c_str();
}
reader_replace_current_token( str );
@ -1918,7 +1900,7 @@ static void handle_token_history( int forward, int reset )
return, otherwise add it.
*/
const wchar_t *last = (const wchar_t *)al_get( &data->search_prev, al_get_count( &data->search_prev ) -1 );
const wchar_t *last = data->search_prev.back().c_str();
if( wcscmp( last, (wchar_t *)data->search_buff.buff ) )
{
str = wcsdup( (wchar_t *)data->search_buff.buff );
@ -1950,9 +1932,8 @@ static void handle_token_history( int forward, int reset )
}
//debug( 3, L"ok pos" );
if( !contains_al( tok_last( &tok ), &data->search_prev ) )
{
free(str);
const wcstring last_tok = tok_last( &tok );
if (find(data->search_prev.begin(), data->search_prev.end(), last_tok) != data->search_prev.end()) {
data->token_history_pos = tok_get_pos( &tok );
str = wcsdup(tok_last( &tok ));
}
@ -1970,8 +1951,8 @@ static void handle_token_history( int forward, int reset )
reader_replace_current_token( str );
reader_super_highlight_me_plenty( data->buff_pos, 0 );
reader_repaint();
al_push( &data->search_prev, str );
data->search_pos = al_get_count( &data->search_prev )-1;
data->search_prev.push_back(str);
data->search_pos = data->search_prev.size() - 1;
}
else if( ! reader_interrupted() )
{
@ -2302,9 +2283,7 @@ void reader_push( const wchar_t *name )
reader_set_prompt( L"" );
history_set_mode( name );
al_init( &data->search_prev );
data->token_history_buff=0;
}
void reader_pop()
@ -2329,8 +2308,6 @@ void reader_pop()
/*
Clean up after history search
*/
al_foreach( &n->search_prev, &free );
al_destroy( &n->search_prev );
free( (void *)n->token_history_buff);
/* Invoke the destructor to balance our new */

2
reader.h
View file

@ -165,7 +165,7 @@ int exit_status();
/**
Replace the current token with the specified string
*/
void reader_replace_current_token( wchar_t *new_token );
void reader_replace_current_token( const wchar_t *new_token );
/**
The readers interrupt signal handler. Cancels all currently running blocks.

2
wildcard.cpp
View file

@ -1179,7 +1179,6 @@ int wildcard_expand( const wchar_t *wc,
int wildcard_expand_string(const wcstring &wc, const wcstring &base_dir, int flags, std::vector<completion_t> &outputs )
{
std::vector<completion_t> lst;
// al_init(&lst);
int res = wildcard_expand(wc.c_str(), base_dir.c_str(), flags, lst);
@ -1187,6 +1186,5 @@ int wildcard_expand_string(const wcstring &wc, const wcstring &base_dir, int fla
for (i=0; i < max; i++) {
outputs.push_back( lst.at(i));
}
// al_destroy(&lst);
return res;
}