ambiguous operator[] access

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

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 46eb372cfb48d852bd2b6e95989c1d1c3639a84b..44160b0ff7c9d4de6505f98577b34175b960d9c0 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "regex.h"
 #endif
 
@@ -38,7 +38,17 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
+// 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
+
+#ifndef __WXWINCE__
 #include <regex.h>
+#endif
 
 #include "wx/regex.h"
 
@@ -68,17 +78,33 @@ private:
     // 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);
-
-            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;
 
@@ -100,42 +126,40 @@ private:
 
 wxRegExImpl::wxRegExImpl()
 {
-    m_isCompiled = FALSE;
-    m_Matches = NULL;
+    Init();
 }
 
 wxRegExImpl::~wxRegExImpl()
 {
     Free();
-
-    delete [] m_Matches;
 }
 
 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 )
     {
-        len++;
+        char* szcmbError = new char[++len];
 
-        (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
+        (void)regerror(errorcode, &m_RegEx, szcmbError, len);
 
-        msg.UngetWriteBuf();
+        szError = wxConvertMB2WX(szcmbError);
+        delete [] szcmbError;
     }
     else // regerror() returned 0
     {
-        msg = _("unknown error");
+        szError = _("unknown error");
     }
 
-    return msg;
+    return szError;
 }
 
 bool wxRegExImpl::Compile(const wxString& expr, int flags)
 {
-    Free();
+    Reinit();
 
     // translate our flags to regcomp() ones
     wxASSERT_MSG( !(flags &
@@ -152,9 +176,11 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
     if ( flags & wxRE_NEWLINE )
         flagsRE |= REG_NEWLINE;
 
-    // compile it
+
+
     int errorcode = regcomp(&m_RegEx, expr, flagsRE);
-    if ( errorcode )
+
+     if ( errorcode )
     {
         wxLogError(_("Invalid regular expression '%s': %s"),
                    expr.c_str(), GetErrorMsg(errorcode).c_str());
@@ -171,8 +197,32 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
         }
         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;
@@ -230,8 +280,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];
-    if ( match.rm_so == -1 )
-        return FALSE;
 
     if ( start )
         *start = match.rm_so;