Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Migrated function.cpp to use the new function_get() call. Lots of nice short code now.

Browse source
This commit is contained in:
ridiculousfish 2012-01-23 20:43:39 -08:00
parent 378fd60756
commit 0d1c2a3b2a
1 changed files with 22 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
function.cpp
View file

@ -240,56 +240,32 @@ shared_ptr<function_info_t> function_get(const wcstring &name)
const wchar_t *function_get_definition( const wchar_t *name ) const wchar_t *function_get_definition( const wchar_t *name )
{ {
const wchar_t *result = NULL; shared_ptr<function_info_t> func = function_get(name);
CHECK( name, 0 ); return func ? func->definition.c_str() : NULL;
scoped_lock lock(functions_lock);
load( name );
function_map_t::iterator iter = loaded_functions.find(name);
if (iter != loaded_functions.end())
result = iter->second->definition.c_str();
return result;
} }
wcstring_list_t function_get_named_arguments( const wchar_t *name ) wcstring_list_t function_get_named_arguments( const wchar_t *name )
{ {
wcstring_list_t result; shared_ptr<function_info_t> func = function_get(name);
CHECK( name, result ); return func ? func->named_arguments : wcstring_list_t();
scoped_lock lock(functions_lock);
load( name );
function_map_t::iterator iter = loaded_functions.find(name);
if (iter != loaded_functions.end())
result = iter->second->named_arguments;
return result;
} }
int function_get_shadows( const wchar_t *name ) int function_get_shadows( const wchar_t *name )
{ {
bool result = false; shared_ptr<function_info_t> func = function_get(name);
CHECK( name, 0 ); return func ? func->shadows : false;
scoped_lock lock(functions_lock);
load( name );
function_map_t::const_iterator iter = loaded_functions.find(name);
if (iter != loaded_functions.end())
result = iter->second->shadows;
return result;
} }
const wchar_t *function_get_desc( const wchar_t *name ) const wchar_t *function_get_desc( const wchar_t *name )
{ {
const wchar_t *result = NULL;
CHECK( name, 0 );
scoped_lock lock(functions_lock);
load( name );
function_map_t::const_iterator iter = loaded_functions.find(name);
if (iter != loaded_functions.end())
result = iter->second->description.c_str();
/* Empty length string goes to NULL */ /* Empty length string goes to NULL */
if (result && ! result[0]) shared_ptr<function_info_t> func = function_get(name);
result = NULL; if (func && func->description.size()) {
return _(func->description.c_str());
return result ? _(result) : NULL; } else {
return NULL;
}
} }
void function_set_desc( const wchar_t *name, const wchar_t *desc ) void function_set_desc( const wchar_t *name, const wchar_t *desc )
@ -298,10 +274,8 @@ void function_set_desc( const wchar_t *name, const wchar_t *desc )
CHECK( desc, ); CHECK( desc, );
load( name ); load( name );
scoped_lock lock(functions_lock); shared_ptr<function_info_t> func = function_get(name);
function_map_t::iterator iter = loaded_functions.find(name); if (func) func->description = desc;
if (iter != loaded_functions.end())
iter->second->description = desc;
} }
int function_copy( const wchar_t *name, const wchar_t *new_name ) int function_copy( const wchar_t *name, const wchar_t *new_name )
@ -310,13 +284,13 @@ int function_copy( const wchar_t *name, const wchar_t *new_name )
scoped_lock lock(functions_lock); scoped_lock lock(functions_lock);
function_map_t::const_iterator iter = loaded_functions.find(name); function_map_t::const_iterator iter = loaded_functions.find(name);
if (iter != loaded_functions.end()) { if (iter != loaded_functions.end()) {
function_info_t &new_info = *loaded_functions[new_name]; shared_ptr<function_info_t> &new_info = loaded_functions[new_name];
new_info = *iter->second; new_info.reset(new function_info_t(*iter->second));
// This new instance of the function shouldn't be tied to the def // This new instance of the function shouldn't be tied to the def
// file of the original. // file of the original.
new_info.definition_file = 0; new_info->definition_file = 0;
new_info.is_autoload = 0; new_info->is_autoload = 0;
result = 1; result = 1;
} }
@ -346,26 +320,14 @@ wcstring_list_t function_get_names( int get_hidden )
const wchar_t *function_get_definition_file( const wchar_t *name ) const wchar_t *function_get_definition_file( const wchar_t *name )
{ {
const wchar_t *result = NULL; shared_ptr<function_info_t> func = function_get(name);
return func ? func->definition_file : NULL;
CHECK( name, 0 );
scoped_lock lock(functions_lock);
function_map_t::const_iterator iter = loaded_functions.find(name);
if (iter != loaded_functions.end())
result = iter->second->definition_file;
return result;
} }
int function_get_definition_offset( const wchar_t *name ) int function_get_definition_offset( const wchar_t *name )
{ {
int result = -1; shared_ptr<function_info_t> func = function_get(name);
return func ? func->definition_offset : -1;
CHECK( name, -1 );
scoped_lock lock(functions_lock);
function_map_t::const_iterator iter = loaded_functions.find(name);
if (iter != loaded_functions.end())
result = iter->second->definition_offset;
return result;
} }