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

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.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/regexp.h

@@ +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$
  */
 
@@ -27 +30 @@
 #ifdef HAVE_PCREPOSIX
 #include <pcreposix.h>
+#include <pcre.h>
 #else  // POSIX regex - not so good...
 extern "C" { // bug with some libc5 distributions
@@ -39 +43 @@
   class RegExp {
   public:
-    enum { None, Global, IgnoreCase, Multiline };
+    enum { None = 0, Global = 1, IgnoreCase = 2, Multiline = 4 };
     RegExp(const UString &p, int f = None);
     ~RegExp();
-    UString match(const UString &s, int i = -1, int *pos = 0L);
-    bool test(const UString &s, int i = -1);
+    UString match(const UString &s, int i = -1, int *pos = 0L, int **ovector = 0L);
+    // test is unused. The JS spec says that RegExp.test should use
+    // RegExp.exec, so it has to store $1 etc.
+    // bool test(const UString &s, int i = -1);
+    uint subPatterns() const { return nrSubPatterns; }
   private:
     const UString &pattern;
     int flags;
+
+#ifndef HAVE_PCREPOSIX
     regex_t preg;
+#else
+    pcre *pcregex;
+#endif
+    uint nrSubPatterns;
 
     RegExp();