Changeset 798 in webkit for trunk/JavaScriptCore/kjs/regexp.cpp

Timestamp:

Mar 21, 2002, 4:31:57 PM (23 years ago)

Author:

mjs

Message:

Merged changes from LABYRINTH_KDE_3_MERGE branch.

File:

• trunk/JavaScriptCore/kjs/regexp.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/regexp.cpp

@@ +1 @@
+// -*- c-basic-offset: 2 -*-
 /*
  *  This file is part of the KDE libraries
@@ -16 +17 @@
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "object.h"
 #include "regexp.h"
 
@@ -26 +30 @@
 
 RegExp::RegExp(const UString &p, int f)
- : pattern(p), flags(f)
+  : pattern(p), flags(f)
 {
-#ifdef REG_EXTENDED    
-  regcomp(&preg, p.ascii(), REG_EXTENDED);
-#else
-  regcomp(&preg, p.ascii(), 0);  
-#endif  
-  /* TODO use flags, check for errors */
+
+#ifdef HAVE_PCREPOSIX
+  int pcreflags = 0;
+  const char *perrormsg;
+  int errorOffset;
+
+  if (flags & IgnoreCase)
+    pcreflags |= PCRE_CASELESS;
+
+  if (flags & Multiline)
+    pcreflags |= PCRE_MULTILINE;
+
+  pcregex = pcre_compile(p.ascii(), pcreflags,
+                         &perrormsg, &errorOffset, NULL);
+
+#ifdef PCRE_INFO_CAPTURECOUNT
+  // Get number of subpatterns that will be returned
+  int rc = pcre_fullinfo( pcregex, NULL, PCRE_INFO_CAPTURECOUNT, &nrSubPatterns);
+  if (rc != 0)
+#endif
+    nrSubPatterns = 0; // fallback. We always need the first pair of offsets.
+
+#else /* HAVE_PCREPOSIX */
+
+  nrSubPatterns = 0; // not implemented with POSIX regex.
+  int regflags = 0;
+#ifdef REG_EXTENDED
+  regflags |= REG_EXTENDED;
+#endif
+#ifdef REG_ICASE
+  if ( f & IgnoreCase )
+    regflags |= REG_ICASE;
+#endif
+
+  //NOTE: Multiline is not feasible with POSIX regex.
+  //if ( f & Multiline )
+  //    ;
+  // Note: the Global flag is already handled by RegExpProtoFunc::execute
+
+  regcomp(&preg, p.ascii(), regflags);
+  /* TODO check for errors */
+#endif
+
 }
 
 RegExp::~RegExp()
 {
+#ifdef HAVE_PCREPOSIX
+  pcre_free(pcregex);
+
+#else
   /* TODO: is this really okay after an error ? */
   regfree(&preg);
+#endif
 }
 
-UString RegExp::match(const UString &s, int i, int *pos)
+UString RegExp::match(const UString &s, int i, int *pos, int **ovector)
 {
+
+#ifdef HAVE_PCREPOSIX
+  CString buffer(s.cstring());
+  int ovecsize = (nrSubPatterns+1)*3; // see pcre docu
+  if (ovector) *ovector = new int[ovecsize];
+
+  if (i < 0)
+    i = 0;
+
+  if (i > s.size() || s.isNull() ||
+      pcre_exec(pcregex, NULL, buffer.c_str(), buffer.size(), i,
+                0, ovector ? *ovector : 0L, ovecsize) == PCRE_ERROR_NOMATCH) {
+
+    if (pos)
+       *pos = -1;
+    return UString::null;
+  }
+
+  if (!ovector)
+    return UString::null; // don't rely on the return value if you pass ovector==0
+  if (pos)
+     *pos = (*ovector)[0];
+  return s.substr((*ovector)[0], (*ovector)[1] - (*ovector)[0]);
+
+#else
   regmatch_t rmatch[10];
 
@@ -49 +120 @@
     i = 0;
 
+  char *str = strdup(s.ascii());
   if (i > s.size() || s.isNull() ||
-      regexec(&preg, s.ascii() + i, 10, rmatch, 0)) {
+      regexec(&preg, str + i, 10, rmatch, 0)) {
     if (pos)
-      *pos = -1;
+       *pos = -1;
     return UString::null;
   }
+  free(str);
 
   if (pos)
-    *pos = rmatch[0].rm_so + i;
+     *pos = rmatch[0].rm_so + i;
+  // TODO copy from rmatch to ovector
   return s.substr(rmatch[0].rm_so + i, rmatch[0].rm_eo - rmatch[0].rm_so);
+#endif
 }
 
+#if 0 // unused
 bool RegExp::test(const UString &s, int)
 {
-  int r = regexec(&preg, s.ascii(), 0, 0, 0);
+#ifdef HAVE_PCREPOSIX
+  int ovector[300];
+  CString buffer(s.cstring());
+
+  if (s.isNull() ||
+      pcre_exec(pcregex, NULL, buffer.c_str(), buffer.size(), 0,
+                0, ovector, 300) == PCRE_ERROR_NOMATCH)
+    return false;
+  else
+    return true;
+
+#else
+
+  char *str = strdup(s.ascii());
+  int r = regexec(&preg, str, 0, 0, 0);
+  free(str);
 
   return r == 0;
+#endif
 }
+#endif