Changeset 34659 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Jun 19, 2008, 10:29:29 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Prepare JavaScript heap for being per-thread.

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (51 diffs)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -41 +41 @@
 const ClassInfo StringObject::info = { "String", 0, 0, 0 };
 
-StringObject::StringObject(JSObject *proto)
+StringObject::StringObject(ExecState* exec, JSObject* proto)
   : JSWrapperObject(proto)
 {
-  setInternalValue(jsString(""));
-}
-
-StringObject::StringObject(JSObject *proto, JSString* string)
+  setInternalValue(jsString(exec, ""));
+}
+
+StringObject::StringObject(JSObject* proto, JSString* string)
   : JSWrapperObject(proto)
 {
@@ -53 +53 @@
 }
 
-StringObject::StringObject(JSObject *proto, const UString &string)
+StringObject::StringObject(ExecState* exec, JSObject* proto, const UString& string)
   : JSWrapperObject(proto)
 {
-  setInternalValue(jsString(string));
+  setInternalValue(jsString(exec, string));
 }
 
@@ -136 +136 @@
 // ECMA 15.5.4
 StringPrototype::StringPrototype(ExecState* exec, ObjectPrototype* objProto)
-  : StringObject(objProto)
+  : StringObject(exec, objProto)
 {
   // The constructor will be added later, after StringConstructor has been built
-  putDirect(exec->propertyNames().length, jsNumber(0), DontDelete | ReadOnly | DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(exec, 0), DontDelete | ReadOnly | DontEnum);
 }
 
@@ -315 +315 @@
                 args.append(jsUndefined());
               else
-                args.append(jsString(source.substr(matchStart, matchLen)));
+                args.append(jsString(exec, source.substr(matchStart, matchLen)));
           }
           
-          args.append(jsNumber(completeMatchStart));
+          args.append(jsNumber(exec, completeMatchStart));
           args.append(sourceVal);
 
@@ -352 +352 @@
       return sourceVal;
 
-    return jsString(result);
+    return jsString(exec, result);
   }
   
@@ -366 +366 @@
       ArgList args;
       
-      args.append(jsString(source.substr(matchPos, matchLen)));
-      args.append(jsNumber(matchPos));
+      args.append(jsString(exec, source.substr(matchPos, matchLen)));
+      args.append(jsNumber(exec, matchPos));
       args.append(sourceVal);
       
@@ -373 +373 @@
   }
 
-  return jsString(source.substr(0, matchPos) + replacementString + source.substr(matchPos + matchLen));
+  return jsString(exec, source.substr(0, matchPos) + replacementString + source.substr(matchPos + matchLen));
 }
 
@@ -405 +405 @@
     else
       u = "";
-    return jsString(u);
+    return jsString(exec, u);
 }
 
@@ -419 +419 @@
     double dpos = a0->toInteger(exec);
     if (dpos >= 0 && dpos < len)
-      result = jsNumber(s[static_cast<int>(dpos)]);
+      result = jsNumber(exec, s[static_cast<int>(dpos)]);
     else
-      result = jsNaN();
+      result = jsNaN(exec);
     return result;
 }
@@ -434 +434 @@
         s += (*it)->toString(exec);
     }
-    return jsString(s);
+    return jsString(exec, s);
 }
 
@@ -451 +451 @@
     else if (dpos > len)
         dpos = len;
-    return jsNumber(s.find(u2, static_cast<int>(dpos)));
+    return jsNumber(exec, s.find(u2, static_cast<int>(dpos)));
 }
 
@@ -469 +469 @@
     else if (!(dpos <= len)) // true for NaN
         dpos = len;
-    return jsNumber(s.rfind(u2, static_cast<int>(dpos)));
+    return jsNumber(exec, s.rfind(u2, static_cast<int>(dpos)));
 }
 
@@ -508 +508 @@
       int lastIndex = 0;
       while (pos >= 0) {
-        list.append(jsString(u.substr(pos, matchLength)));
+        list.append(jsString(exec, u.substr(pos, matchLength)));
         lastIndex = pos;
         pos += matchLength == 0 ? 1 : matchLength;
@@ -550 +550 @@
     int matchLength;
     regExpObj->performMatch(reg.get(), u, 0, pos, matchLength);
-    return jsNumber(pos);
+    return jsNumber(exec, pos);
 }
 
@@ -560 +560 @@
     JSString* sVal = thisObj->inherits(&StringObject::info) ?
       static_cast<StringObject*>(thisObj)->internalValue() :
-      static_cast<JSString*>(jsString(s));
+      static_cast<JSString*>(jsString(exec, s));
 
     JSValue* a0 = args[0];
@@ -587 +587 @@
         if (to > len)
             to = len;
-        return jsString(s.substr(static_cast<int>(from), static_cast<int>(to - from)));
-    }
-
-    return jsString("");
+        return jsString(exec, s.substr(static_cast<int>(from), static_cast<int>(to - from)));
+    }
+
+    return jsString(exec, "");
 }
 
@@ -613 +613 @@
       if (u.isEmpty() && reg->match(u, 0) >= 0) {
         // empty string matched by regexp -> empty array
-        res->put(exec, exec->propertyNames().length, jsNumber(0));
+        res->put(exec, exec->propertyNames().length, jsNumber(exec, 0));
         return result;
       }
@@ -625 +625 @@
         pos = mpos + (mlen == 0 ? 1 : mlen);
         if (mpos != p0 || mlen) {
-          res->put(exec,i, jsString(u.substr(p0, mpos-p0)));
+          res->put(exec,i, jsString(exec, u.substr(p0, mpos-p0)));
           p0 = mpos + mlen;
           i++;
@@ -634 +634 @@
             res->put(exec, i++, jsUndefined());
           else
-            res->put(exec, i++, jsString(u.substr(spos, ovector[si * 2 + 1] - spos)));
+            res->put(exec, i++, jsString(exec, u.substr(spos, ovector[si * 2 + 1] - spos)));
         }
       }
@@ -642 +642 @@
         if (u.isEmpty()) {
           // empty separator matches empty string -> empty array
-          res->put(exec, exec->propertyNames().length, jsNumber(0));
+          res->put(exec, exec->propertyNames().length, jsNumber(exec, 0));
           return result;
         } else {
           while (static_cast<uint32_t>(i) != limit && i < u.size()-1)
-            res->put(exec, i++, jsString(u.substr(p0++, 1)));
+            res->put(exec, i++, jsString(exec, u.substr(p0++, 1)));
         }
       } else {
         while (static_cast<uint32_t>(i) != limit && (pos = u.find(u2, p0)) >= 0) {
-          res->put(exec, i, jsString(u.substr(p0, pos-p0)));
+          res->put(exec, i, jsString(exec, u.substr(p0, pos - p0)));
           p0 = pos + u2.size();
           i++;
@@ -658 +658 @@
     // add remaining string, if any
     if (static_cast<uint32_t>(i) != limit)
-      res->put(exec, i++, jsString(u.substr(p0)));
-    res->put(exec, exec->propertyNames().length, jsNumber(i));
+      res->put(exec, i++, jsString(exec, u.substr(p0)));
+    res->put(exec, exec->propertyNames().length, jsNumber(exec, i));
     return result;
 }
@@ -675 +675 @@
     double length = a1->isUndefined() ? len : a1->toInteger(exec);
     if (start >= len)
-      return jsString("");
+      return jsString(exec, "");
     if (length < 0)
-      return jsString("");
+      return jsString(exec, "");
     if (start < 0) {
       start += len;
@@ -685 +685 @@
     if (length > len)
       length = len;
-    return jsString(s.substr(static_cast<int>(start), static_cast<int>(length)));
+    return jsString(exec, s.substr(static_cast<int>(start), static_cast<int>(length)));
 }
 
@@ -718 +718 @@
       start = temp;
     }
-    return jsString(s.substr((int)start, (int)end-(int)start));
+    return jsString(exec, s.substr((int)start, (int)end-(int)start));
 }
 
@@ -728 +728 @@
     JSString* sVal = thisObj->inherits(&StringObject::info)
         ? static_cast<StringObject*>(thisObj)->internalValue()
-        : static_cast<JSString*>(jsString(s));
+        : static_cast<JSString*>(jsString(exec, s));
     int ssize = s.size();
     if (!ssize)
@@ -743 +743 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(UString(buffer.releaseBuffer(), length, false));
+    return jsString(exec, UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -753 +753 @@
     JSString* sVal = thisObj->inherits(&StringObject::info)
         ? static_cast<StringObject*>(thisObj)->internalValue()
-        : static_cast<JSString*>(jsString(s));
+        : static_cast<JSString*>(jsString(exec, s));
     int ssize = s.size();
     if (!ssize)
@@ -768 +768 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(UString(buffer.releaseBuffer(), length, false));
+    return jsString(exec, UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -779 +779 @@
     JSString* sVal = thisObj->inherits(&StringObject::info)
         ? static_cast<StringObject*>(thisObj)->internalValue()
-        : static_cast<JSString*>(jsString(s));
+        : static_cast<JSString*>(jsString(exec, s));
     int ssize = s.size();
     if (!ssize)
@@ -794 +794 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(UString(buffer.releaseBuffer(), length, false));
+    return jsString(exec, UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -804 +804 @@
     JSString* sVal = thisObj->inherits(&StringObject::info)
         ? static_cast<StringObject*>(thisObj)->internalValue()
-        : static_cast<JSString*>(jsString(s));
+        : static_cast<JSString*>(jsString(exec, s));
     int ssize = s.size();
     if (!ssize)
@@ -819 +819 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(UString(buffer.releaseBuffer(), length, false));
+    return jsString(exec, UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -825 +825 @@
 {
     if (args.size() < 1)
-      return jsNumber(0);
-
-    // This optimizes the common case that thisObj is a StringObject
-    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    JSValue* a0 = args[0];
-    return jsNumber(localeCompare(s, a0->toString(exec)));
+      return jsNumber(exec, 0);
+
+    // This optimizes the common case that thisObj is a StringObject
+    UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
+    JSValue* a0 = args[0];
+    return jsNumber(exec, localeCompare(s, a0->toString(exec)));
 }
 
@@ -837 +837 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<big>" + s + "</big>");
+    return jsString(exec, "<big>" + s + "</big>");
 }
 
@@ -844 +844 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<small>" + s + "</small>");
+    return jsString(exec, "<small>" + s + "</small>");
 }
 
@@ -851 +851 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<blink>" + s + "</blink>");
+    return jsString(exec, "<blink>" + s + "</blink>");
 }
 
@@ -858 +858 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<b>" + s + "</b>");
+    return jsString(exec, "<b>" + s + "</b>");
 }
 
@@ -865 +865 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<tt>" + s + "</tt>");
+    return jsString(exec, "<tt>" + s + "</tt>");
 }
 
@@ -872 +872 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<i>" + s + "</i>");
+    return jsString(exec, "<i>" + s + "</i>");
 }
 
@@ -879 +879 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<strike>" + s + "</strike>");
+    return jsString(exec, "<strike>" + s + "</strike>");
 }
 
@@ -886 +886 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<sub>" + s + "</sub>");
+    return jsString(exec, "<sub>" + s + "</sub>");
 }
 
@@ -893 +893 @@
     // This optimizes the common case that thisObj is a StringObject
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
-    return jsString("<sup>" + s + "</sup>");
+    return jsString(exec, "<sup>" + s + "</sup>");
 }
 
@@ -901 +901 @@
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
     JSValue* a0 = args[0];
-    return jsString("<font color=\"" + a0->toString(exec) + "\">" + s + "</font>");
+    return jsString(exec, "<font color=\"" + a0->toString(exec) + "\">" + s + "</font>");
 }
 
@@ -909 +909 @@
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
     JSValue* a0 = args[0];
-    return jsString("<font size=\"" + a0->toString(exec) + "\">" + s + "</font>");
+    return jsString(exec, "<font size=\"" + a0->toString(exec) + "\">" + s + "</font>");
 }
 
@@ -917 +917 @@
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
     JSValue* a0 = args[0];
-    return jsString("<a name=\"" + a0->toString(exec) + "\">" + s + "</a>");
+    return jsString(exec, "<a name=\"" + a0->toString(exec) + "\">" + s + "</a>");
 }
 
@@ -925 +925 @@
     UString s = thisObj->inherits(&StringObject::info) ? static_cast<StringObject*>(thisObj)->internalValue()->value() : thisObj->toString(exec);
     JSValue* a0 = args[0];
-    return jsString("<a href=\"" + a0->toString(exec) + "\">" + s + "</a>");
+    return jsString(exec, "<a href=\"" + a0->toString(exec) + "\">" + s + "</a>");
 }
 
@@ -936 +936 @@
   putDirect(exec->propertyNames().prototype, stringProto, DontEnum|DontDelete|ReadOnly);
 
-  putDirectFunction(new StringConstructorFunction(exec, funcProto, exec->propertyNames().fromCharCode), DontEnum);
+  putDirectFunction(new (exec) StringConstructorFunction(exec, funcProto, exec->propertyNames().fromCharCode), DontEnum);
 
   // no. of arguments for constructor
-  putDirect(exec->propertyNames().length, jsNumber(1), ReadOnly|DontDelete|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -949 +949 @@
 
 // ECMA 15.5.2
-JSObject *StringConstructor::construct(ExecState *exec, const ArgList &args)
-{
-  JSObject *proto = exec->lexicalGlobalObject()->stringPrototype();
-  if (args.size() == 0)
-    return new StringObject(proto);
-  return new StringObject(proto, args[0]->toString(exec));
+JSObject* StringConstructor::construct(ExecState* exec, const ArgList& args)
+{
+  JSObject* proto = exec->lexicalGlobalObject()->stringPrototype();
+  if (!args.size())
+    return new (exec) StringObject(exec, proto);
+  return new (exec) StringObject(exec, proto, args[0]->toString(exec));
 }
 
@@ -961 +961 @@
 {
   if (args.isEmpty())
-    return jsString("");
+    return jsString(exec, "");
   else {
     JSValue *v = args[0];
-    return jsString(v->toString(exec));
+    return jsString(exec, v->toString(exec));
   }
 }
@@ -974 +974 @@
   : InternalFunction(funcProto, name)
 {
-  putDirect(exec->propertyNames().length, jsNumber(1), DontDelete|ReadOnly|DontEnum);
+  putDirect(exec->propertyNames().length, jsNumber(exec, 1), DontDelete|ReadOnly|DontEnum);
 }
 
@@ -992 +992 @@
     s = "";
 
-  return jsString(s);
+  return jsString(exec, s);
 }