X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/regex.h?ds=sidebyside diff --git a/include/wx/regex.h b/include/wx/regex.h index 99197c0bc0..9889d34777 100644 --- a/include/wx/regex.h +++ b/include/wx/regex.h @@ -12,15 +12,11 @@ #ifndef _WX_REGEX_H_ #define _WX_REGEX_H_ -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "regex.h" -#endif - #include "wx/defs.h" #if wxUSE_REGEX -class WXDLLIMPEXP_BASE wxString; +class WXDLLIMPEXP_FWD_BASE wxString; // ---------------------------------------------------------------------------- // constants @@ -29,9 +25,14 @@ class WXDLLIMPEXP_BASE wxString; // flags for regex compilation: these can be used with Compile() enum { - // use extended regex syntax (default) + // use extended regex syntax wxRE_EXTENDED = 0, + // use advanced RE syntax (built-in regex only) +#ifdef wxHAS_REGEX_ADVANCED + wxRE_ADVANCED = 1, +#endif + // use basic RE syntax wxRE_BASIC = 2, @@ -67,7 +68,7 @@ enum // wxRegEx: a regular expression // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxRegExImpl; +class WXDLLIMPEXP_FWD_BASE wxRegExImpl; class WXDLLIMPEXP_BASE wxRegEx { @@ -82,27 +83,30 @@ public: (void)Compile(expr, flags); } - // return TRUE if this is a valid compiled regular expression + // return true if this is a valid compiled regular expression bool IsValid() const { return m_impl != NULL; } - // compile the string into regular expression, return TRUE if ok or FALSE + // compile the string into regular expression, return true if ok or false // if string has a syntax error bool Compile(const wxString& pattern, int flags = wxRE_DEFAULT); // matches the precompiled regular expression against a string, return - // TRUE if matches and FALSE otherwise + // true if matches and false otherwise // // flags may be combination of wxRE_NOTBOL and wxRE_NOTEOL + // len may be the length of text (ignored by most system regex libs) // // may only be called after successful call to Compile() - bool Matches(const wxChar *text, int flags = 0) const; + bool Matches(const wxString& text, int flags = 0) const; + bool Matches(const wxChar *text, int flags, size_t len) const + { return Matches(wxString(text, len), flags); } // get the start index and the length of the match of the expression // (index 0) or a bracketed subexpression (index != 0) // // may only be called after successful call to Matches() // - // return FALSE if no match or on error + // return false if no match or on error bool GetMatch(size_t *start, size_t *len, size_t index = 0) const; // return the part of string corresponding to the match, empty string is @@ -111,6 +115,12 @@ public: // may only be called after successful call to Matches() wxString GetMatch(const wxString& text, size_t index = 0) const; + // return the size of the array of matches, i.e. the number of bracketed + // subexpressions plus one for the expression itself, or 0 on error. + // + // may only be called after successful call to Compile() + size_t GetMatchCount() const; + // replaces the current regular expression in the string pointed to by // pattern, with the text in replacement and return number of matches // replaced (maybe 0 if none found) or -1 on error