JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / runtime / StringConstructor.cpp

diff --git a/runtime/StringConstructor.cpp b/runtime/StringConstructor.cpp
index ea6e12853e776820cdef9df6fbdb604a50eff564..f8221d7cbcc4933407aa34c95a97b1580c3b3688 100644 (file)
--- a/runtime/StringConstructor.cpp
+++ b/runtime/StringConstructor.cpp
@@ -25,6 +25,7 @@
 #include "JITCode.h"
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
 #include "JITCode.h"
 #include "JSFunction.h"
 #include "JSGlobalObject.h"

+#include "JSCInlines.h"

 #include "StringPrototype.h"
 
 namespace JSC {
 #include "StringPrototype.h"
 
 namespace JSC {


@@ -37,7 +38,7 @@ static EncodedJSValue JSC_HOST_CALL stringFromCharCode(ExecState*);
 
 namespace JSC {
 
 
 namespace JSC {
 

-const ClassInfo StringConstructor::s_info = { "Function", &InternalFunction::s_info, 0, ExecState::stringConstructorTable };
+const ClassInfo StringConstructor::s_info = { "Function", &InternalFunction::s_info, 0, ExecState::stringConstructorTable, CREATE_METHOD_TABLE(StringConstructor) };

 
 /* Source for StringConstructor.lut.h
 @begin stringConstructorTable
 
 /* Source for StringConstructor.lut.h
 @begin stringConstructorTable


@@ -45,23 +46,23 @@ const ClassInfo StringConstructor::s_info = { "Function", &InternalFunction::s_i
 @end
 */
 
 @end
 */
 

-ASSERT_CLASS_FITS_IN_CELL(StringConstructor);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(StringConstructor);

 
 

-StringConstructor::StringConstructor(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, StringPrototype* stringPrototype)
-    : InternalFunction(&exec->globalData(), globalObject, structure, Identifier(exec, stringPrototype->classInfo()->className))
+StringConstructor::StringConstructor(VM& vm, Structure* structure)
+    : InternalFunction(vm, structure)

 {
 {

-    putDirectWithoutTransition(exec->globalData(), exec->propertyNames().prototype, stringPrototype, ReadOnly | DontEnum | DontDelete);
-    putDirectWithoutTransition(exec->globalData(), exec->propertyNames().length, jsNumber(1), ReadOnly | DontEnum | DontDelete);

 }
 
 }
 

-bool StringConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot &slot)
+void StringConstructor::finishCreation(VM& vm, StringPrototype* stringPrototype)

 {
 {

-    return getStaticFunctionSlot<InternalFunction>(exec, ExecState::stringConstructorTable(exec), this, propertyName, slot);
+    Base::finishCreation(vm, stringPrototype->classInfo()->className);
+    putDirectWithoutTransition(vm, vm.propertyNames->prototype, stringPrototype, ReadOnly | DontEnum | DontDelete);
+    putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(1), ReadOnly | DontEnum | DontDelete);

 }
 
 }
 

-bool StringConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+bool StringConstructor::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot &slot)

 {
 {

-    return getStaticFunctionDescriptor<InternalFunction>(exec, ExecState::stringConstructorTable(exec), this, propertyName, descriptor);
+    return getStaticFunctionSlot<InternalFunction>(exec, ExecState::stringConstructorTable(exec->vm()), jsCast<StringConstructor*>(object), propertyName, slot);

 }
 
 // ------------------------------ Functions --------------------------------
 }
 
 // ------------------------------ Functions --------------------------------


@@ -72,26 +73,34 @@ static NEVER_INLINE JSValue stringFromCharCodeSlowCase(ExecState* exec)
     UChar* buf;
     PassRefPtr<StringImpl> impl = StringImpl::createUninitialized(length, buf);
     for (unsigned i = 0; i < length; ++i)
     UChar* buf;
     PassRefPtr<StringImpl> impl = StringImpl::createUninitialized(length, buf);
     for (unsigned i = 0; i < length; ++i)

-        buf[i] = static_cast<UChar>(exec->argument(i).toUInt32(exec));
+        buf[i] = static_cast<UChar>(exec->uncheckedArgument(i).toUInt32(exec));

     return jsString(exec, impl);
 }
 
 static EncodedJSValue JSC_HOST_CALL stringFromCharCode(ExecState* exec)
 {
     if (LIKELY(exec->argumentCount() == 1))
     return jsString(exec, impl);
 }
 
 static EncodedJSValue JSC_HOST_CALL stringFromCharCode(ExecState* exec)
 {
     if (LIKELY(exec->argumentCount() == 1))

-        return JSValue::encode(jsSingleCharacterString(exec, exec->argument(0).toUInt32(exec)));
+        return JSValue::encode(jsSingleCharacterString(exec, exec->uncheckedArgument(0).toUInt32(exec)));

     return JSValue::encode(stringFromCharCodeSlowCase(exec));
 }
 
     return JSValue::encode(stringFromCharCodeSlowCase(exec));
 }
 

+JSCell* JSC_HOST_CALL stringFromCharCode(ExecState* exec, int32_t arg)
+{
+    return jsSingleCharacterString(exec, arg);
+}
+

 static EncodedJSValue JSC_HOST_CALL constructWithStringConstructor(ExecState* exec)
 {
     JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
 static EncodedJSValue JSC_HOST_CALL constructWithStringConstructor(ExecState* exec)
 {
     JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();

+    VM& vm = exec->vm();
+

     if (!exec->argumentCount())
     if (!exec->argumentCount())

-        return JSValue::encode(new (exec) StringObject(exec, globalObject->stringObjectStructure()));
-    return JSValue::encode(new (exec) StringObject(exec, globalObject->stringObjectStructure(), exec->argument(0).toString(exec)));
+        return JSValue::encode(StringObject::create(vm, globalObject->stringObjectStructure()));
+    
+    return JSValue::encode(StringObject::create(vm, globalObject->stringObjectStructure(), exec->uncheckedArgument(0).toString(exec)));

 }
 
 }
 

-ConstructType StringConstructor::getConstructData(ConstructData& constructData)
+ConstructType StringConstructor::getConstructData(JSCell*, ConstructData& constructData)

 {
     constructData.native.function = constructWithStringConstructor;
     return ConstructTypeHost;
 {
     constructData.native.function = constructWithStringConstructor;
     return ConstructTypeHost;


@@ -101,10 +110,10 @@ static EncodedJSValue JSC_HOST_CALL callStringConstructor(ExecState* exec)
 {
     if (!exec->argumentCount())
         return JSValue::encode(jsEmptyString(exec));
 {
     if (!exec->argumentCount())
         return JSValue::encode(jsEmptyString(exec));

-    return JSValue::encode(jsString(exec, exec->argument(0).toString(exec)));
+    return JSValue::encode(exec->uncheckedArgument(0).toString(exec));

 }
 
 }
 

-CallType StringConstructor::getCallData(CallData& callData)
+CallType StringConstructor::getCallData(JSCell*, CallData& callData)

 {
     callData.native.function = callStringConstructor;
     return CallTypeHost;
 {
     callData.native.function = callStringConstructor;
     return CallTypeHost;