Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clarify the function name deferral in functions_def

Browse source 
Prohibit making a function with an empty name
This commit is contained in:
ridiculousfish 2012-07-01 15:17:46 -07:00
parent fe26284376
commit 7bbc7a61ce
1 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
builtin.cpp
View file

@ -1085,6 +1085,8 @@ static int builtin_generic( parser_t &parser, wchar_t **argv )
*/ */
static void functions_def( const wcstring &name, wcstring &out ) static void functions_def( const wcstring &name, wcstring &out )
{ {
CHECK( ! name.empty(), );
wcstring desc, def; wcstring desc, def;
function_get_desc(name, &desc); function_get_desc(name, &desc);
function_get_definition(name, &def); function_get_definition(name, &def);
@ -1097,7 +1099,11 @@ static void functions_def( const wcstring &name, wcstring &out )
event_get( &search, &ev ); event_get( &search, &ev );
out.append(L"function "); out.append(L"function ");
if ( name[0]!=L'-' ){
/* Typically we prefer to specify the function name first, e.g. "function foo --description bar"
But If the function name starts with a -, we'll need to output it after all the options. */
bool defer_function_name = (name.at(0) == L'-');
if ( ! defer_function_name ){
out.append(name); out.append(name);
} }
@ -1168,7 +1174,8 @@ static void functions_def( const wcstring &name, wcstring &out )
} }
} }
if ( name[0]==L'-' ){ /* Output the function name if we deferred it */
if ( defer_function_name ){
out.append(L" -- "); out.append(L" -- ");
out.append(name); out.append(name);
} }
@ -3317,6 +3324,16 @@ static int builtin_end( parser_t &parser, wchar_t **argv )
if( d ) if( d )
{ {
if (d->name.empty())
{
/* Disallow empty function names */
append_format(stderr_buffer, _( L"%ls: No function name given\n" ), argv[0] );
/* Return an error via a crummy way. Don't just return here, since we need to pop the block. */
proc_set_last_status(STATUS_BUILTIN_ERROR);
}
else
{
/** /**
Copy the text from the beginning of the function Copy the text from the beginning of the function
until the end command and use as the new definition until the end command and use as the new definition
@ -3329,6 +3346,7 @@ static int builtin_end( parser_t &parser, wchar_t **argv )
function_add( *d, parser ); function_add( *d, parser );
free( def ); free( def );
}
} }
else else
{ {