Merge branch '2.0.1' of tasktools.org:task into 2.0.1

This commit is contained in:
Paul Beckingham 2012-06-02 12:52:41 -04:00
commit 3e36438597
2 changed files with 7 additions and 3 deletions

View file

@ -676,12 +676,16 @@ bool compare (
}
////////////////////////////////////////////////////////////////////////////////
bool closeEnough (const std::string& reference, const std::string& attempt)
bool closeEnough (
const std::string& reference,
const std::string& attempt,
unsigned int minLength /* = 0 */)
{
if (compare (reference, attempt, false))
return true;
if (attempt.length () < reference.length ())
if (attempt.length () < reference.length () &&
attempt.length () >= minLength)
return compare (reference.substr (0, attempt.length ()), attempt, false);
return false;

View file

@ -64,7 +64,7 @@ bool isWordEnd (const std::string&, std::string::size_type);
bool isTokenEnd (const std::string&, std::string::size_type);
bool isPunctuation (char);
bool compare (const std::string&, const std::string&, bool sensitive = true);
bool closeEnough (const std::string&, const std::string&);
bool closeEnough (const std::string&, const std::string&, unsigned int minLength = 0);
std::string::size_type find (const std::string&, const std::string&, bool sensitive = true);
std::string::size_type find (const std::string&, const std::string&, std::string::size_type, bool sensitive = true);
int strippedLength (const std::string&);