JavaScriptCore-554.1.tar.gz

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

diff --git a/runtime/StringConstructor.cpp b/runtime/StringConstructor.cpp
index dc1d60fee62590c65e17027d6cd9fa5243badfc7..638044587437a1d3c45873efa33cda09c41d8337 100644 (file)
--- a/runtime/StringConstructor.cpp
+++ b/runtime/StringConstructor.cpp
@@ -21,26 +21,27 @@
 #include "config.h"
 #include "StringConstructor.h"
 
 #include "config.h"
 #include "StringConstructor.h"
 

+#include "JSFunction.h"

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

-static NEVER_INLINE JSValuePtr stringFromCharCodeSlowCase(ExecState* exec, const ArgList& args)
+static NEVER_INLINE JSValue stringFromCharCodeSlowCase(ExecState* exec, const ArgList& args)

 {
     UChar* buf = static_cast<UChar*>(fastMalloc(args.size() * sizeof(UChar)));
     UChar* p = buf;
     ArgList::const_iterator end = args.end();
     for (ArgList::const_iterator it = args.begin(); it != end; ++it)
 {
     UChar* buf = static_cast<UChar*>(fastMalloc(args.size() * sizeof(UChar)));
     UChar* p = buf;
     ArgList::const_iterator end = args.end();
     for (ArgList::const_iterator it = args.begin(); it != end; ++it)

-        *p++ = static_cast<UChar>((*it).jsValue(exec).toUInt32(exec));
+        *p++ = static_cast<UChar>((*it).toUInt32(exec));

     return jsString(exec, UString(buf, p - buf, false));
 }
 
     return jsString(exec, UString(buf, p - buf, false));
 }
 

-static JSValuePtr stringFromCharCode(ExecState* exec, JSObject*, JSValuePtr, const ArgList& args)
+static JSValue JSC_HOST_CALL stringFromCharCode(ExecState* exec, JSObject*, JSValue, const ArgList& args)

 {
     if (LIKELY(args.size() == 1))
 {
     if (LIKELY(args.size() == 1))

-        return jsSingleCharacterString(exec, args.at(exec, 0).toUInt32(exec));
+        return jsSingleCharacterString(exec, args.at(0).toUInt32(exec));

     return stringFromCharCodeSlowCase(exec, args);
 }
 
     return stringFromCharCodeSlowCase(exec, args);
 }
 


@@ -53,7 +54,7 @@ StringConstructor::StringConstructor(ExecState* exec, PassRefPtr<Structure> stru
     putDirectWithoutTransition(exec->propertyNames().prototype, stringPrototype, ReadOnly | DontEnum | DontDelete);
 
     // ECMA 15.5.3.2 fromCharCode()
     putDirectWithoutTransition(exec->propertyNames().prototype, stringPrototype, ReadOnly | DontEnum | DontDelete);
 
     // ECMA 15.5.3.2 fromCharCode()

-    putDirectFunctionWithoutTransition(exec, new (exec) PrototypeFunction(exec, prototypeFunctionStructure, 1, exec->propertyNames().fromCharCode, stringFromCharCode), DontEnum);
+    putDirectFunctionWithoutTransition(exec, new (exec) NativeFunctionWrapper(exec, prototypeFunctionStructure, 1, exec->propertyNames().fromCharCode, stringFromCharCode), DontEnum);

 
     // no. of arguments for constructor
     putDirectWithoutTransition(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly | DontEnum | DontDelete);
 
     // no. of arguments for constructor
     putDirectWithoutTransition(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly | DontEnum | DontDelete);


@@ -64,7 +65,7 @@ static JSObject* constructWithStringConstructor(ExecState* exec, JSObject*, cons
 {
     if (args.isEmpty())
         return new (exec) StringObject(exec, exec->lexicalGlobalObject()->stringObjectStructure());
 {
     if (args.isEmpty())
         return new (exec) StringObject(exec, exec->lexicalGlobalObject()->stringObjectStructure());

-    return new (exec) StringObject(exec, exec->lexicalGlobalObject()->stringObjectStructure(), args.at(exec, 0).toString(exec));
+    return new (exec) StringObject(exec, exec->lexicalGlobalObject()->stringObjectStructure(), args.at(0).toString(exec));

 }
 
 ConstructType StringConstructor::getConstructData(ConstructData& constructData)
 }
 
 ConstructType StringConstructor::getConstructData(ConstructData& constructData)


@@ -74,11 +75,11 @@ ConstructType StringConstructor::getConstructData(ConstructData& constructData)
 }
 
 // ECMA 15.5.1
 }
 
 // ECMA 15.5.1

-static JSValuePtr callStringConstructor(ExecState* exec, JSObject*, JSValuePtr, const ArgList& args)
+static JSValue JSC_HOST_CALL callStringConstructor(ExecState* exec, JSObject*, JSValue, const ArgList& args)

 {
     if (args.isEmpty())
         return jsEmptyString(exec);
 {
     if (args.isEmpty())
         return jsEmptyString(exec);

-    return jsString(exec, args.at(exec, 0).toString(exec));
+    return jsString(exec, args.at(0).toString(exec));

 }
 
 CallType StringConstructor::getCallData(CallData& callData)
 }
 
 CallType StringConstructor::getCallData(CallData& callData)