ambiguous operator[] access

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

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 6f041f7680d08136547ff9fd7f322da40374a738..44160b0ff7c9d4de6505f98577b34175b960d9c0 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,12 +38,17 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 

-// FreeBSD & Watcom require this, it probably doesn't hurt for others
+// 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__)
 #if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)

-    #include <sys/types.h>
+#   include <sys/types.h>

 #endif
 
 #endif
 

+#ifndef __WXWINCE__

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

+#endif

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


@@ -73,17 +78,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,51 +126,40 @@ private:
 
 wxRegExImpl::wxRegExImpl()
 {
 
 wxRegExImpl::wxRegExImpl()
 {

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

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

-
-    delete [] m_Matches;

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

-    wxString msg;
+    wxString szError;

 
     // first get the string length needed
     int len = regerror(errorcode, &m_RegEx, NULL, 0);
     if ( len > 0 )
     {
 
     // first get the string length needed
     int len = regerror(errorcode, &m_RegEx, NULL, 0);
     if ( len > 0 )
     {

-        len++;
+        char* szcmbError = new char[++len];

 
 

-#if wxUSE_UNICODE
-        wxCharBuffer buf(len);
+        (void)regerror(errorcode, &m_RegEx, szcmbError, len);

 
 

-        (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
-
-        msg = wxString(buf.data(), wxConvLibc);
-#else // !Unicode
-        (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
-
-        msg.UngetWriteBuf();
-#endif // Unicode/!Unicode
+        szError = wxConvertMB2WX(szcmbError);
+        delete [] szcmbError;

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

-        msg = _("unknown error");
+        szError = _("unknown error");

     }
 
     }
 

-    return msg;
+    return szError;

 }
 
 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 &


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

-    // compile it
-    int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
-    if ( errorcode )
+
+
+    int errorcode = regcomp(&m_RegEx, expr, flagsRE);
+
+     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());


@@ -192,21 +204,24 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
             m_nMatches = 1;
 
             // and some more for bracketed subexperessions
             m_nMatches = 1;
 
             // and some more for bracketed subexperessions

-            const wxChar *cptr = expr.c_str();
-            wxChar prev = _T('\0');
-            while ( *cptr != _T('\0') )
+            for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ )

             {
             {

-                // is this a subexpr start, i.e. "(" for extended regex or
-                // "\(" for a basic one?
-                if ( *cptr == _T('(') &&
-                     (flags & wxRE_BASIC ? prev == _T('\\')
-                                         : prev != _T('\\')) )
+                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_nMatches++;
                 }

-
-                prev = *cptr;
-                cptr++;

             }
         }
 
             }
         }
 


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

-    int rc = regexec(&self->m_RegEx, wxConvertWX2MB(str), m_nMatches, m_Matches, flagsRE);
+    int rc = regexec(&self->m_RegEx, str, m_nMatches, m_Matches, flagsRE);

 
     switch ( rc )
     {
 
     switch ( rc )
     {