Changeset 10818 in webkit for trunk/JavaScriptCore/kjs/regexp_object.h

Timestamp:

Oct 11, 2005, 1:43:49 PM (20 years ago)

Author:

ggaren

Message:

• Implemented caching of match state inside the global RegExp object (lastParen, leftContext, rightContext, lastMatch, input).

exec(), test(), match(), search(), and replace() now dipatch regular
expression matching through the RegExp object's performMatch function,
to facilitate caching. This replaces registerRegexp and
setSubPatterns.

• Implemented the special '$' aliases (e.g. RegExp.input aliases to RegExp.$_).

• Moved support for backreferences into the new static hash table used for other special RegExp properties. Truncated backreferences at $9 to match IE, FF, and the "What's New in Netscape 1.2?" doc. (String.replace still supports double-digit backreferences.)

• Tweaked RegExp.prototype.exec to handle ginormous values in lastIndex.

Fixes 11 -- count em, 11 -- JavaScriptCore tests.

Reviewed by NOBODY (OOPS!).

• JavaScriptCore.xcodeproj/project.pbxproj: Added regexp_object.lut.h
• kjs/create_hash_table: Tweaked to allow for more exotic characters.

We now rely on the compiler to catch illegal
identifiers.

• kjs/regexp.cpp: (KJS::RegExp::RegExp):
• kjs/regexp_object.cpp: (RegExpProtoFuncImp::callAsFunction): (RegExpObjectImp::RegExpObjectImp): (RegExpObjectImp::performMatch): (RegExpObjectImp::arrayOfMatches): (RegExpObjectImp::backrefGetter): (RegExpObjectImp::getLastMatch): (RegExpObjectImp::getLastParen): (RegExpObjectImp::getLeftContext): (RegExpObjectImp::getRightContext): (RegExpObjectImp::getOwnPropertySlot): (RegExpObjectImp::getValueProperty): (RegExpObjectImp::put): (RegExpObjectImp::putValueProperty):
• kjs/regexp_object.h: (KJS::RegExpObjectImp::):
• kjs/string_object.cpp: (substituteBackreferences): (replace): (StringProtoFuncImp::callAsFunction):

File:

• trunk/JavaScriptCore/kjs/regexp_object.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/regexp_object.h

@@ -66 +66 @@
   class RegExpObjectImp : public InternalFunctionImp {
   public:
+    enum { Dollar1, Dollar2, Dollar3, Dollar4, Dollar5, Dollar6, Dollar7, Dollar8, Dollar9, 
+           Input, Multiline, LastMatch, LastParen, LeftContext, RightContext };
+    
     RegExpObjectImp(ExecState *exec,
                     FunctionPrototypeImp *funcProto,
@@ -75 +78 @@
     virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args);
 
+    virtual void put(ExecState *, const Identifier &, ValueImp *, int attr = None);
+    void putValueProperty(ExecState *, int token, ValueImp *, int attr);
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
-    int ** registerRegexp( const RegExp* re, const UString& s );
-    void setSubPatterns(int num) { lastNrSubPatterns = num; }
+    ValueImp *getValueProperty(ExecState *, int token) const;
+    UString performMatch(RegExp *, const UString&, int startOffset = 0, int *endOffset = 0, int **ovector = 0);
     ObjectImp *arrayOfMatches(ExecState *exec, const UString &result) const;
+    
+    virtual const ClassInfo *classInfo() const { return &info; }
   private:
-    static ValueImp *backrefGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
-  
-    UString lastString;
+    ValueImp *getBackref(unsigned) const;
+    ValueImp *getLastMatch() const;
+    ValueImp *getLastParen() const;
+    ValueImp *getLeftContext() const;
+    ValueImp *getRightContext() const;
+
+    // Global search cache / settings
+    bool multiline;
+    UString lastInput;
     int *lastOvector;
-    unsigned lastNrSubPatterns;
+    unsigned lastNumSubPatterns;
+    
+    static const ClassInfo info;
   };