Changeset 35807 in webkit for trunk/JavaScriptCore/kjs/RegExpObject.cpp

Timestamp:

Aug 17, 2008, 1:23:49 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-08-17 Geoffrey Garen <​[email protected]>

Reviewed by Cameron Zwarich.

Made room for a free word in JSCell.

SunSpider says no change.

I changed JSCallbackObjectData, Arguments, JSArray, and RegExpObject to
store auxiliary data in a secondary structure.

I changed InternalFunction to store the function's name in the property
map.

I changed JSGlobalObjectData to use a virtual destructor, so WebCore's
JSDOMWindowBaseData could inherit from it safely. (It's a strange design
for JSDOMWindowBase to allocate an object that JSGlobalObject deletes,
but that's really our only option, given the size constraint.)

I also added a bunch of compile-time ASSERTs, and removed lots of comments
in JSObject.h because they were often out of date, and they got in the
way of reading what was actually going on.

Also renamed JSArray::getLength to JSArray::length, to match our style
guidelines.

WebCore:

2008-08-17 Geoffrey Garen <​[email protected]>

Reviewed by Cameron Zwarich.

Made room for a free word in JSCell.

Changed JSDOMWindowBase to store its auxiliary data in a subclass of
JSGlobalData, so the two could share a pointer.

Added a bunch of ASSERTs, to help catch over-sized objects.

WebKit/mac:

2008-08-17 Geoffrey Garen <​[email protected]>

Reviewed by Cameron Zwarich.

Made room for a free word in JSCell.

(Updated for JavaScriptCore changes.)

File:

• trunk/JavaScriptCore/kjs/RegExpObject.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/RegExpObject.cpp

@@ -31 +31 @@
 namespace KJS {
 
+ASSERT_CLASS_FITS_IN_CELL(RegExpObject);
+
 const ClassInfo RegExpObject::info = { "RegExp", 0, 0, ExecState::regExpTable };
 
@@ -45 +47 @@
 RegExpObject::RegExpObject(RegExpPrototype* regExpPrototype, PassRefPtr<RegExp> regExp)
     : JSObject(regExpPrototype)
-    , m_regExp(regExp)
-    , m_lastIndex(0)
+    , d(new RegExpObjectData(regExp, 0))
 {
 }
@@ -63 +64 @@
     switch (token) {
         case Global:
-            return jsBoolean(m_regExp->global());
+            return jsBoolean(d->regExp->global());
         case IgnoreCase:
-            return jsBoolean(m_regExp->ignoreCase());
+            return jsBoolean(d->regExp->ignoreCase());
         case Multiline:
-            return jsBoolean(m_regExp->multiline());
+            return jsBoolean(d->regExp->multiline());
         case Source:
-            return jsString(exec, m_regExp->pattern());
+            return jsString(exec, d->regExp->pattern());
         case LastIndex:
-            return jsNumber(exec, m_lastIndex);
+            return jsNumber(exec, d->lastIndex);
     }
     
@@ -87 +88 @@
     UNUSED_PARAM(token);
     ASSERT(token == LastIndex);
-    m_lastIndex = value->toInteger(exec);
+    d->lastIndex = value->toInteger(exec);
 }
 
@@ -108 +109 @@
     int lastIndex = 0;
     if (global) {
-        if (m_lastIndex < 0 || m_lastIndex > input.size()) {
-            m_lastIndex = 0;
+        if (d->lastIndex < 0 || d->lastIndex > input.size()) {
+            d->lastIndex = 0;
             return false;
         }
-        lastIndex = static_cast<int>(m_lastIndex);
+        lastIndex = static_cast<int>(d->lastIndex);
     }
 
     int foundIndex;
     int foundLength;
-    regExpObj->performMatch(m_regExp.get(), input, lastIndex, foundIndex, foundLength);
+    regExpObj->performMatch(d->regExp.get(), input, lastIndex, foundIndex, foundLength);
 
     if (global) {
         lastIndex = foundIndex < 0 ? 0 : foundIndex + foundLength;
-        m_lastIndex = lastIndex;
+        d->lastIndex = lastIndex;
     }