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

Timestamp:

Dec 12, 2006, 12:09:58 PM (18 years ago)

Author:

ap

Message:

Reviewed by Geoff. Based on a patch by Maks Orlovich.

​http://bugs.webkit.org/show_bug.cgi?id=6257
Throw errors on invalid expressions (KJS merge)

JavaScriptCore:

• kjs/regexp.cpp: (KJS::RegExp::RegExp): (KJS::RegExp::~RegExp): (KJS::RegExp::match):
• kjs/regexp.h: (KJS::RegExp::flags): (KJS::RegExp::isValid): (KJS::RegExp::errorMessage): (KJS::RegExp::subPatterns): Remember and report RegExp construction failures. Renamed data members not to start with underscores.

• kjs/regexp_object.cpp: (RegExpObjectImp::construct): Raise an exception if RegExp construction fails. (RegExpObjectImp::callAsFunction): Removed an obsolete comment.

• tests/mozilla/ecma_3/RegExp/regress-119909.js: Reduced the number of nested parentheses to a value supported by PCRE.

LayoutTests:

• fast/js/kde/RegExp-expected.txt: One more test passes.

File:

• trunk/JavaScriptCore/kjs/regexp.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/regexp.h

@@ -46 +46 @@
     ~RegExp();
 
-    int flags() const { return _flags; }
+    int flags() const { return m_flags; }
+    bool isValid() const { return !m_constructionError; }
+    const char* errorMessage() const { return m_constructionError; }
 
     UString match(const UString &s, int i, int *pos = 0, int **ovector = 0);
-    unsigned subPatterns() const { return _numSubPatterns; }
+    unsigned subPatterns() const { return m_numSubPatterns; }
 
   private:
 #if HAVE(PCREPOSIX)
-    pcre *_regex;
+    pcre *m_regex;
 #else
-    regex_t _regex;
+    regex_t m_regex;
 #endif
-    int _flags;
-    unsigned _numSubPatterns;
+    int m_flags;
+    char* m_constructionError;
+    unsigned m_numSubPatterns;
 
     RegExp(const RegExp &);