Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

[wxWidgets.git] / src / common / regex.cpp

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index db11e97cec0cde16f08437dc22cda8cc67aa8198..072ea9df0fb7244dc60bfbd38d5c48eeaed718fe 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "regex.h"
 #endif
 
     #pragma implementation "regex.h"
 #endif
 


@@ -38,15 +38,25 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 

-// FreeBSD requires this, it probably doesn't hurt for others
-#ifdef __UNIX__
-    #include <sys/types.h>
+// FreeBSD, Watcom and DMars require this, CW doesn't have nor need it.
+// Others also don't seem to need it. If you have an error related to
+// (not) including <sys/types.h> please report details to
+// wx-dev@lists.wxwindows.org
+#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
+#   include <sys/types.h>

 #endif
 
 #endif
 

+#ifndef __WXWINCE__

 #include <regex.h>
 #include <regex.h>

+#endif

 
 #include "wx/regex.h"
 
 
 #include "wx/regex.h"
 

+#ifdef wx_wchar
+    #define regerror wx_regerror
+    #define regfree wx_regfree
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -73,17 +83,33 @@ private:
     // return the string containing the error message for the given err code
     wxString GetErrorMsg(int errorcode) const;
 
     // return the string containing the error message for the given err code
     wxString GetErrorMsg(int errorcode) const;
 

+    // init the members
+    void Init()
+    {
+        m_isCompiled = FALSE;
+        m_Matches = NULL;
+        m_nMatches = 0;
+    }
+

     // free the RE if compiled
     void Free()
     {
         if ( IsValid() )
         {
             regfree(&m_RegEx);
     // free the RE if compiled
     void Free()
     {
         if ( IsValid() )
         {
             regfree(&m_RegEx);

-
-            m_isCompiled = FALSE;

         }
         }

+
+        delete [] m_Matches;
+    }
+
+    // free the RE if any and reinit the members
+    void Reinit()
+    {
+        Free();
+        Init();

     }
 
     }
 

+

     // compiled RE
     regex_t     m_RegEx;
 
     // compiled RE
     regex_t     m_RegEx;
 


@@ -105,15 +131,12 @@ private:
 
 wxRegExImpl::wxRegExImpl()
 {
 
 wxRegExImpl::wxRegExImpl()
 {

-    m_isCompiled = FALSE;
-    m_Matches = NULL;
+    Init();

 }
 
 wxRegExImpl::~wxRegExImpl()
 {
     Free();
 }
 
 wxRegExImpl::~wxRegExImpl()
 {
     Free();

-
-    delete [] m_Matches;

 }
 
 wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 }
 
 wxString wxRegExImpl::GetErrorMsg(int errorcode) const


@@ -126,9 +149,17 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
     {
         len++;
 
     {
         len++;
 

+#ifdef wx_wchar
+        wxCharBuffer buf(len);
+
+        (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
+
+        msg = wxString(buf.data(), wxConvLibc);
+#else 

         (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
 
         msg.UngetWriteBuf();
         (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
 
         msg.UngetWriteBuf();

+#endif 

     }
     else // regerror() returned 0
     {
     }
     else // regerror() returned 0
     {


@@ -140,7 +171,7 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 
 bool wxRegExImpl::Compile(const wxString& expr, int flags)
 {
 
 bool wxRegExImpl::Compile(const wxString& expr, int flags)
 {

-    Free();
+    Reinit();

 
     // translate our flags to regcomp() ones
     wxASSERT_MSG( !(flags &
 
     // translate our flags to regcomp() ones
     wxASSERT_MSG( !(flags &


@@ -157,9 +188,15 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
     if ( flags & wxRE_NEWLINE )
         flagsRE |= REG_NEWLINE;
 
     if ( flags & wxRE_NEWLINE )
         flagsRE |= REG_NEWLINE;
 

+

     // compile it
     // compile it

-    int errorcode = regcomp(&m_RegEx, expr, flagsRE);
-    if ( errorcode )
+#ifdef wx_wchar
+    int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE);
+#else
+    int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
+#endif
+
+     if ( errorcode )

     {
         wxLogError(_("Invalid regular expression '%s': %s"),
                    expr.c_str(), GetErrorMsg(errorcode).c_str());
     {
         wxLogError(_("Invalid regular expression '%s': %s"),
                    expr.c_str(), GetErrorMsg(errorcode).c_str());


@@ -176,8 +213,32 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
         }
         else
         {
         }
         else
         {

-            // will alloc later
-            m_nMatches = WX_REGEX_MAXMATCHES;
+            // we will alloc the array later (only if really needed) but count
+            // the number of sub-expressions in the regex right now
+
+            // there is always one for the whole expression
+            m_nMatches = 1;
+
+            // and some more for bracketed subexperessions
+            for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ )
+            {
+                if ( *cptr == _T('\\') )
+                {
+                    // in basic RE syntax groups are inside \(...\)
+                    if ( *++cptr == _T('(') && (flags & wxRE_BASIC) )
+                    {
+                        m_nMatches++;
+                    }
+                }
+                else if ( *cptr == _T('(') && !(flags & wxRE_BASIC) )
+                {
+                    // we know that the previous character is not an unquoted
+                    // backslash because it would have been eaten above, so we
+                    // have a bar '(' and this indicates a group start for the
+                    // extended syntax
+                    m_nMatches++;
+                }
+            }

         }
 
         m_isCompiled = TRUE;
         }
 
         m_isCompiled = TRUE;


@@ -208,7 +269,12 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
     }
 
     // do match it
     }
 
     // do match it

-    int rc = regexec(&self->m_RegEx, str, m_nMatches, m_Matches, flagsRE);
+#ifdef wx_wchar
+       rm_detail_t rd;
+    int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE);
+#else
+    int rc = regexec(&self->m_RegEx, wxConvertWX2MB(str), m_nMatches, m_Matches, flagsRE);
+#endif

 
     switch ( rc )
     {
 
     switch ( rc )
     {


@@ -235,8 +301,6 @@ bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const
     wxCHECK_MSG( index < m_nMatches, FALSE, _T("invalid match index") );
 
     const regmatch_t& match = m_Matches[index];
     wxCHECK_MSG( index < m_nMatches, FALSE, _T("invalid match index") );
 
     const regmatch_t& match = m_Matches[index];

-    if ( match.rm_so == -1 )
-        return FALSE;

 
     if ( start )
         *start = match.rm_so;
 
     if ( start )
         *start = match.rm_so;


@@ -318,17 +382,7 @@ int wxRegExImpl::Replace(wxString *text,
                     size_t start, len;
                     if ( !GetMatch(&start, &len, index) )
                     {
                     size_t start, len;
                     if ( !GetMatch(&start, &len, index) )
                     {

-                        // we can't do it because GetMatch() returns FALSE
-                        // even for a valid back reference index if it didn't
-                        // match for this expression (e.g. it when alternative
-                        // branches were used and the one contained the back
-                        // ref didn't match)
-                        //
-                        // it would be better to distinguish between this case
-                        // and really invalid index, but I don't know how to
-                        // do it
-
-                        //wxFAIL_MSG( _T("invalid back reference") );
+                        wxFAIL_MSG( _T("invalid back reference") );

 
                         // just eat it...
                     }
 
                         // just eat it...
                     }


@@ -433,4 +487,38 @@ int wxRegEx::Replace(wxString *pattern,
     return m_impl->Replace(pattern, replacement, maxMatches);
 }
 
     return m_impl->Replace(pattern, replacement, maxMatches);
 }
 

+#ifdef wx_wchar
+
+/**  Locale functions */
+
+extern "C" {
+
+int wx_isdigit(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsdigit((unsigned char) c));}
+int wx_isalpha(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsalpha((unsigned char) c));}
+int wx_isalnum(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsalnum((unsigned char) c));}
+int wx_isupper(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsupper((unsigned char) c));}
+int wx_islower(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIslower((unsigned char) c));}
+int wx_isgraph(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsgraph((unsigned char) c));}
+int wx_ispunct(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIspunct((unsigned char) c));}
+int wx_isspace(wx_wchar c) {return (c >= 0 && c <= UCHAR_MAX &&  wxIsspace((unsigned char) c));}
+
+wx_wchar wx_toupper(wx_wchar c) 
+{
+       if (c >= 0 && c <= UCHAR_MAX)
+               return wxToupper((unsigned char) c);
+       return c;
+
+}
+
+wx_wchar wx_tolower(wx_wchar c)
+{
+       if (c >= 0 && c <= UCHAR_MAX)
+               return wxTolower((unsigned char) c);
+       return c;
+}
+
+}
+
+#endif
+

 #endif // wxUSE_REGEX
 #endif // wxUSE_REGEX