h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 20:31:19 -03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up uses of completion_t

Browse Source
This commit is contained in:
ridiculousfish
2012-02-01 16:27:14 -08:00
parent 0b4b6c498d
commit 62f49c55ce
10 changed files with 91 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
parser.cpp
View File

@@ -1872,9 +1872,7 @@ int parser_t::parse_job( process_t *p,
}
}
}
completion_t data_to_push;
data_to_push.completion = nxt;
args.push_back( data_to_push );
args.push_back(completion_t(nxt));
}
if( error_code == 0 )
@@ -1922,12 +1920,8 @@ int parser_t::parse_job( process_t *p,
// al_truncate( args, 0 );
args.clear();
// al_push( args, halloc_wcsdup( j, L"cd" ) );
completion_t comp;
comp.completion = L"cd";
args.push_back(comp);
completion_t comp2;
comp2.completion = tmp;
args.push_back( comp2 );
args.push_back(completion_t(L"cd"));
args.push_back(completion_t(tmp));
/*
If we have defined a wrapper around cd, use it,
otherwise use the cd builtin
@@ -2108,9 +2102,7 @@ int parser_t::parse_job( process_t *p,
const wcstring sub_block(tok_string( tok ) + current_tokenizer_pos, end_pos - current_tokenizer_pos);
p->type = INTERNAL_BLOCK;
completion_t data_to_push;
data_to_push.completion = sub_block;
args.at( 0 ) = data_to_push;
args.at( 0 ) = completion_t(sub_block);
tok_set_pos( tok,
end_pos );