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

fixed bug in wxString::Matches() - backtrack now if \* mismatched

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-02 12:42:46 +00:00
parent 0fd734af37
commit 9a4232dcb7
2 changed files with 102 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
samples/console/console.cpp
View File

@@ -35,38 +35,38 @@
// what to test (in alphabetic order)? // what to test (in alphabetic order)?
#define TEST_ARRAYS //#define TEST_ARRAYS
#define TEST_CHARSET //#define TEST_CHARSET
#define TEST_CMDLINE //#define TEST_CMDLINE
#define TEST_DATETIME //#define TEST_DATETIME
#define TEST_DIR //#define TEST_DIR
#define TEST_DLLLOADER //#define TEST_DLLLOADER
#define TEST_ENVIRON //#define TEST_ENVIRON
#define TEST_EXECUTE //#define TEST_EXECUTE
#define TEST_FILE //#define TEST_FILE
#define TEST_FILECONF //#define TEST_FILECONF
#define TEST_FILENAME //#define TEST_FILENAME
#define TEST_FTP //#define TEST_FTP
#define TEST_HASH //#define TEST_HASH
#define TEST_INFO_FUNCTIONS //#define TEST_INFO_FUNCTIONS
#define TEST_LIST //#define TEST_LIST
#define TEST_LOCALE //#define TEST_LOCALE
#define TEST_LOG //#define TEST_LOG
#define TEST_LONGLONG //#define TEST_LONGLONG
#define TEST_MIME //#define TEST_MIME
#define TEST_PATHLIST //#define TEST_PATHLIST
#define TEST_REGCONF //#define TEST_REGCONF
#define TEST_REGISTRY //#define TEST_REGISTRY
#define TEST_SNGLINST //#define TEST_SNGLINST
#define TEST_SOCKETS //#define TEST_SOCKETS
#define TEST_STREAMS //#define TEST_STREAMS
#define TEST_STRINGS #define TEST_STRINGS
#define TEST_THREADS //#define TEST_THREADS
#define TEST_TIMER //#define TEST_TIMER
//#define TEST_VCARD -- don't enable this (VZ) //#define TEST_VCARD -- don't enable this (VZ)
#define TEST_WCHAR //#define TEST_WCHAR
#define TEST_ZIP //#define TEST_ZIP
#define TEST_ZLIB //#define TEST_ZLIB
#ifdef TEST_SNGLINST #ifdef TEST_SNGLINST
#include <wx/snglinst.h> #include <wx/snglinst.h>
@@ -4547,6 +4547,44 @@ static void TestStringReplace()
puts(""); puts("");
} }
static void TestStringMatch()
{
wxPuts(_T("*** Testing wxString::Matches() ***"));
static const struct StringMatchTestData
{
const wxChar *text;
const wxChar *wildcard;
bool matches;
} stringMatchTestData[] =
{
{ _T("foobar"), _T("foo*"), 1 },
{ _T("foobar"), _T("*oo*"), 1 },
{ _T("foobar"), _T("*bar"), 1 },
{ _T("foobar"), _T("??????"), 1 },
{ _T("foobar"), _T("f??b*"), 1 },
{ _T("foobar"), _T("f?b*"), 0 },
{ _T("foobar"), _T("*goo*"), 0 },
{ _T("foobar"), _T("*foo"), 0 },
{ _T("foobarfoo"), _T("*foo"), 1 },
{ _T(""), _T("*"), 1 },
{ _T(""), _T("?"), 0 },
};
for ( size_t n = 0; n < WXSIZEOF(stringMatchTestData); n++ )
{
const StringMatchTestData& data = stringMatchTestData[n];
bool matches = wxString(data.text).Matches(data.wildcard);
wxPrintf(_T("'%s' %s '%s' (%s)\n"),
data.wildcard,
matches ? _T("matches") : _T("doesn't match"),
data.text,
matches == data.matches ? _T("ok") : _T("ERROR"));
}
wxPuts(_T(""));
}
#endif // TEST_STRINGS #endif // TEST_STRINGS
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -4632,16 +4670,14 @@ int main(int argc, char **argv)
{ {
TestPChar(); TestPChar();
TestString(); TestString();
}
TestStringSub(); TestStringSub();
if ( 0 )
{
TestStringConstruction(); TestStringConstruction();
TestStringFormat(); TestStringFormat();
TestStringFind(); TestStringFind();
TestStringTokenizer(); TestStringTokenizer();
TestStringReplace(); TestStringReplace();
} }
TestStringMatch();
#endif // TEST_STRINGS #endif // TEST_STRINGS
#ifdef TEST_ARRAYS #ifdef TEST_ARRAYS

38
src/common/string.cpp
View File

@@ -1456,21 +1456,34 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
// of them) // of them)
bool wxString::Matches(const wxChar *pszMask) const bool wxString::Matches(const wxChar *pszMask) const
{ {
// check char by char // TODO: this is, of course, awfully inefficient...
const wxChar *pszTxt;
for ( pszTxt = c_str(); *pszMask != wxT('\0'); pszMask++, pszTxt++ ) { // the char currently being checked
const wxChar *pszTxt = c_str();
// the last location where '*' matched
const wxChar *pszLastStarInText = NULL;
const wxChar *pszLastStarInMask = NULL;
match:
for ( ; *pszMask != wxT('\0'); pszMask++, pszTxt++ ) {
switch ( *pszMask ) { switch ( *pszMask ) {
case wxT('?'): case wxT('?'):
if ( *pszTxt == wxT('\0') ) if ( *pszTxt == wxT('\0') )
return FALSE; return FALSE;
// pszText and pszMask will be incremented in the loop statement // pszTxt and pszMask will be incremented in the loop statement
break; break;
case wxT('*'): case wxT('*'):
{ {
// remember where we started to be able to backtrack later
pszLastStarInText = pszTxt;
pszLastStarInMask = pszMask;
// ignore special chars immediately following this one // ignore special chars immediately following this one
// (should this be an error?)
while ( *pszMask == wxT('*') || *pszMask == wxT('?') ) while ( *pszMask == wxT('*') || *pszMask == wxT('?') )
pszMask++; pszMask++;
@@ -1510,7 +1523,22 @@ bool wxString::Matches(const wxChar *pszMask) const
} }
// match only if nothing left // match only if nothing left
return *pszTxt == wxT('\0'); if ( *pszTxt == wxT('\0') )
return TRUE;
// if we failed to match, backtrack if we can
if ( pszLastStarInText ) {
pszTxt = pszLastStarInText + 1;
pszMask = pszLastStarInMask;
pszLastStarInText = NULL;
// don't bother resetting pszLastStarInMask, it's unnecessary
goto match;
}
return FALSE;
} }
// Count the number of chars // Count the number of chars