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

Fix parsing of negated long options in wxCmdLineParser.

Browse Source 
Negated long options were not recognized in wxCmdLineParser::Parse(), do check
for them now.

Also extend the unit test to check for negated options.

Closes #13335.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-07-21 13:49:55 +00:00
parent dd18cc6594
commit 1a63798c5a
3 changed files with 59 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -437,6 +437,10 @@ Major new features in this release
2.9.3:
------
All:
- Fix parsing of negated long options in wxCmdLineParser (roed_bis).
All (GUI):
- Support float, double and file name values in wxGenericValidator (troelsk).

38
src/common/cmdline.cpp
View File

@@ -707,11 +707,45 @@ int wxCmdLineParser::Parse(bool showUsage)
if (longOptionsEnabled)
{
wxString errorOpt;
optInd = m_data->FindOptionByLongName(name);
if ( optInd == wxNOT_FOUND )
{
errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str())
<< wxT('\n');
// Check if this could be a negatable long option.
if ( name.Last() == '-' )
{
name.RemoveLast();
optInd = m_data->FindOptionByLongName(name);
if ( optInd != wxNOT_FOUND )
{
if ( !(m_data->m_options[optInd].flags &
wxCMD_LINE_SWITCH_NEGATABLE) )
{
errorOpt.Printf
(
_("Option '%s' can't be negated"),
name
);
optInd = wxNOT_FOUND;
}
}
}
if ( optInd == wxNOT_FOUND )
{
if ( errorOpt.empty() )
{
errorOpt.Printf
(
_("Unknown long option '%s'"),
name
);
}
errorMsg << errorOpt << wxT('\n');
}
}
}
else

19
tests/cmdline/cmdlinetest.cpp
View File

@@ -139,6 +139,8 @@ void CmdLineTestCase::ParseSwitches()
p.AddSwitch("b");
p.AddSwitch("c");
p.AddSwitch("d");
p.AddSwitch("n", "neg", "Switch that can be negated",
wxCMD_LINE_SWITCH_NEGATABLE);
p.SetCmdLine("");
CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) );
@@ -182,6 +184,23 @@ void CmdLineTestCase::ParseSwitches()
CPPUNIT_ASSERT( !p.Found("b") );
CPPUNIT_ASSERT( !p.Found("c") );
CPPUNIT_ASSERT( p.Found("d") );
p.SetCmdLine("-n");
CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) );
CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_NOT_FOUND, p.FoundSwitch("a") );
CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_ON, p.FoundSwitch("n") );
p.SetCmdLine("-n-");
CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) );
CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_OFF, p.FoundSwitch("neg") );
p.SetCmdLine("--neg");
CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) );
CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_ON, p.FoundSwitch("neg") );
p.SetCmdLine("--neg-");
CPPUNIT_ASSERT_EQUAL(0, p.Parse(false) );
CPPUNIT_ASSERT_EQUAL(wxCMD_SWITCH_OFF, p.FoundSwitch("n") );
}
void CmdLineTestCase::Usage()