generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 02:53:10 +01:00
Code Issues Projects Releases Wiki Activity

integrated changes from main repository for upcoming 1.2.5 release

Browse Source
This commit is contained in:
Guenter Obiltschnig
2006-10-12 15:08:28 +00:00
parent 41ee6e0ffa
commit 89111b52b3
26 changed files with 283 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Util/src/OptionSet.cpp
View File

@@ -1,7 +1,7 @@
//
// OptionSet.cpp
//
// $Id: //poco/1.2/Util/src/OptionSet.cpp#1 $
// $Id: //poco/1.2/Util/src/OptionSet.cpp#2 $
//
// Library: Util
// Package: Options
@@ -70,6 +70,15 @@ OptionSet& OptionSet::operator = (const OptionSet& options)
void OptionSet::addOption(const Option& option)
{
poco_assert (!option.fullName().empty());
OptionVec::const_iterator it = _options.begin();
OptionVec::const_iterator itEnd = _options.end();
for (; it != itEnd; ++it)
{
if (it->fullName() == option.fullName())
{
throw DuplicateOptionException(it->fullName());
}
}
_options.push_back(option);
}
@@ -97,12 +106,20 @@ const Option& OptionSet::getOption(const std::string& name, bool matchShort) con
const Option* pOption = 0;
for (Iterator it = _options.begin(); it != _options.end(); ++it)
{
if (matchShort && it->matchesShort(name) || !matchShort && it->matchesFull(name))
if (matchShort && it->matchesShort(name) || !matchShort && it->matchesPartial(name))
{
if (!pOption)
{
pOption = &*it;
else
throw AmbiguousOptionException(name);
if (!matchShort && it->matchesFull(name))
break;
}
else if (!matchShort && it->matchesFull(name))
{
pOption = &*it;
break;
}
else throw AmbiguousOptionException(name);
}
}
if (pOption)