Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

accept "--opt val" and "--opt:val" syntax in addition to "--opt=val" as

Browse Source 
documented (patch 1786465)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-20 21:08:38 +00:00
parent ee17111a41
commit bdee3769af
1 changed files with 33 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/common/cmdline.cpp
View File

@@ -716,58 +716,44 @@ int wxCmdLineParser::Parse(bool showUsage)
}
else // it's an option. not a switch
{
// get the value
if ( isLong )
switch ( (*p).GetValue() )
{
if ( *p++ != _T('=') )
{
errorMsg << wxString::Format(_("Option '%s' requires a value, '=' expected."), name.c_str())
<< _T('\n');
case _T('='):
case _T(':'):
// the value follows
++p;
break;
ok = false;
}
}
else // short option
{
switch ( (*p).GetValue() )
{
case _T('='):
case _T(':'):
// the value follows
++p;
break;
case 0:
// the value is in the next argument
if ( ++n == count )
{
// ... but there is none
errorMsg << wxString::Format(_("Option '%s' requires a value."),
name.c_str())
<< _T('\n');
case 0:
// the value is in the next argument
if ( ++n == count )
{
// ... but there is none
errorMsg << wxString::Format(_("Option '%s' requires a value."),
name.c_str())
<< _T('\n');
ok = false;
}
else
{
// ... take it from there
p = m_data->m_arguments[n].begin();
end = m_data->m_arguments[n].end();
}
break;
ok = false;
}
else
{
// ... take it from there
p = m_data->m_arguments[n].begin();
end = m_data->m_arguments[n].end();
}
break;
default:
// the value is right here: this may be legal or
// not depending on the option style
if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
{
errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
name.c_str())
<< _T('\n');
default:
// the value is right here: this may be legal or
// not depending on the option style
if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
{
errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
name.c_str())
<< _T('\n');
ok = false;
}
}
ok = false;
}
}
if ( ok )