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

Timestamp:

Nov 3, 2007, 9:28:51 AM (18 years ago)

Author:

Darin Adler

Message:

Reviewed by Maciej.

• ​http://bugs.webkit.org/show_bug.cgi?id=15812 some JavaScript tests (from the Mozilla test suite) are failing

Two or three fixes get 7 more of the Mozilla tests passing.
This gets us down from 61 failing tests to 54.

• kjs/interpreter.h: (KJS::Interpreter::builtinRegExp): Made this inline and gave it a more specific type. Some day we should probably do that for all of these -- might even get a bit of a speed boost from it.
• kjs/interpreter.cpp: Removed Interpreter::builtinRegExp now that it's inline in the header.

• kjs/regexp_object.h:
• kjs/regexp_object.cpp: (KJS::RegExpProtoFunc::callAsFunction): Moved test and exec out of the switch statement into the RegExpImp object, so they can be shared with RegExpImp::callAsFunction. (KJS::RegExpImp::match): Added. Common code used by both test and exec. (KJS::RegExpImp::test): Added. (KJS::RegExpImp::exec): Added. (KJS::RegExpImp::implementsCall): Added. (KJS::RegExpImp::callAsFunction): Added. (KJS::RegExpObjectImpPrivate::RegExpObjectImpPrivate): Initialize lastInput to null rather than empty string -- we take advantage of the difference in RegExpImp::match. (KJS::RegExpObjectImp::input): Added. No reason to go through hash tables just to get at a field like this.

• pcre/pcre_compile.c: (check_escape): Changed the \u handling to match the JavaScript specification. If there are not 4 hex digits after the \u, then it's processed as if it wasn't an escape sequence at all.

• pcre/pcre_internal.h: Added IS_NEWLINE, with the appropriate definition for JavaScript (4 specific Unicode values).
• pcre/pcre_exec.c: (match): Changed all call sites to use IS_NEWLINE. (pcre_exec): Ditto.

• tests/mozilla/expected.html: Updated to expect 7 more successful tests.

File:

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

trunk/JavaScriptCore/kjs/regexp_object.h

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
- *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
+ *  Copyright (C) 2003, 2007 Apple Inc. All Rights Reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -27 +26 @@
 
 namespace KJS {
-  class ExecState;
-  class RegExpPrototype : public JSObject {
-  public:
-    RegExpPrototype(ExecState *exec,
-                       ObjectPrototype *objProto,
-                       FunctionPrototype *funcProto);
-    virtual const ClassInfo *classInfo() const { return &info; }
-    static const ClassInfo info;
-  };
 
-  class RegExpProtoFunc : public InternalFunctionImp {
-  public:
-    RegExpProtoFunc(ExecState*, FunctionPrototype*, int i, int len, const Identifier&);
+    struct RegExpObjectImpPrivate;
 
-    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
+    class RegExpPrototype : public JSObject {
+    public:
+        RegExpPrototype(ExecState*, ObjectPrototype*, FunctionPrototype*);
+        virtual const ClassInfo* classInfo() const { return &info; }
+        static const ClassInfo info;
+    };
 
-    enum { Compile, Exec, Test, ToString };
-  private:
-    int id;
-  };
+    class RegExpProtoFunc : public InternalFunctionImp {
+    public:
+        enum { Compile, Exec, Test, ToString };
 
-  class RegExpImp : public JSObject {
-  public:
-    RegExpImp(RegExpPrototype* regexpProto);
-    virtual ~RegExpImp();
-    void setRegExp(RegExp* r) { m_regExp.set(r); }
-    RegExp* regExp() const { return m_regExp.get(); }
+        RegExpProtoFunc(ExecState*, FunctionPrototype*, int id, int len, const Identifier&);
+        virtual JSValue* callAsFunction(ExecState*, JSObject*, const List&);
 
-    virtual const ClassInfo* classInfo() const { return &info; }
-    static const ClassInfo info;
-  private:
-    OwnPtr<RegExp> m_regExp;
-  };
+    private:
+        int id;
+    };
 
-  struct RegExpObjectImpPrivate;
+    class RegExpImp : public JSObject {
+    public:
+        RegExpImp(RegExpPrototype*, RegExp*);
+        virtual ~RegExpImp();
 
-  class RegExpObjectImp : public InternalFunctionImp {
-  public:
-    enum { Dollar1, Dollar2, Dollar3, Dollar4, Dollar5, Dollar6, Dollar7, Dollar8, Dollar9, 
-           Input, Multiline, LastMatch, LastParen, LeftContext, RightContext };
-    
-    RegExpObjectImp(ExecState *exec,
-                    FunctionPrototype *funcProto,
-                    RegExpPrototype *regProto);
-    virtual bool implementsConstruct() const;
-    virtual JSObject *construct(ExecState *exec, const List &args);
-    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
+        void setRegExp(RegExp* r) { m_regExp.set(r); }
+        RegExp* regExp() const { return m_regExp.get(); }
 
-    virtual void put(ExecState *, const Identifier &, JSValue *, int attr = None);
-    void putValueProperty(ExecState *, int token, JSValue *, int attr);
-    virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
-    JSValue *getValueProperty(ExecState *, int token) const;
-    void performMatch(RegExp*, const UString&, int startOffset, int& position, int& length, int** ovector = 0);
-    JSObject* arrayOfMatches(ExecState*) const;
-    
-    virtual const ClassInfo *classInfo() const { return &info; }
-  private:
-    JSValue *getBackref(unsigned) const;
-    JSValue *getLastParen() const;
-    JSValue *getLeftContext() const;
-    JSValue *getRightContext() const;
+        JSValue* test(ExecState*, const List& args);
+        JSValue* exec(ExecState*, const List& args);
 
-    OwnPtr<RegExpObjectImpPrivate> d;
-    
-    static const ClassInfo info;
-  };
+        virtual bool implementsCall() const;
+        virtual JSValue* callAsFunction(ExecState*, JSObject*, const List&);
+        virtual const ClassInfo* classInfo() const { return &info; }
+        static const ClassInfo info;
+
+    private:
+        bool match(ExecState*, const List& args);
+
+        OwnPtr<RegExp> m_regExp;
+    };
+
+    class RegExpObjectImp : public InternalFunctionImp {
+    public:
+        enum { Dollar1, Dollar2, Dollar3, Dollar4, Dollar5, Dollar6, Dollar7, Dollar8, Dollar9, 
+               Input, Multiline, LastMatch, LastParen, LeftContext, RightContext };
+
+        RegExpObjectImp(ExecState*, FunctionPrototype*, RegExpPrototype*);
+
+        virtual bool implementsConstruct() const;
+        virtual JSObject* construct(ExecState*, const List&);
+        virtual JSValue* callAsFunction(ExecState*, JSObject*, const List&);
+        virtual void put(ExecState*, const Identifier&, JSValue*, int attributes = None);
+        void putValueProperty(ExecState*, int token, JSValue*, int attributes);
+        virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
+        JSValue* getValueProperty(ExecState*, int token) const;
+        virtual const ClassInfo* classInfo() const { return &info; }
+
+        void performMatch(RegExp*, const UString&, int startOffset, int& position, int& length, int** ovector = 0);
+        JSObject* arrayOfMatches(ExecState*) const;
+        const UString& input() const;
+
+    private:
+        JSValue* getBackref(unsigned) const;
+        JSValue* getLastParen() const;
+        JSValue* getLeftContext() const;
+        JSValue* getRightContext() const;
+
+        OwnPtr<RegExpObjectImpPrivate> d;
+
+        static const ClassInfo info;
+    };
 
 } // namespace