Changeset 11527 in webkit for trunk/JavaScriptCore/kjs/function_object.cpp

Timestamp:

Dec 10, 2005, 6:06:17 PM (19 years ago)

Author:

darin

Message:

JavaScriptCore:

Rubber stamped by Maciej.

• did long-promised KJS renaming:

ValueImp -> JSValue
ObjectImp -> JSObject
AllocatedValueImp -> JSCell

A renaming to get a class out of the way

KJS::Bindings::JSObject -> JavaJSObject

and some other "imp-reduction" renaming

*InstanceImp -> *Instance
*ProtoFuncImp -> *ProtoFunc
*PrototypeImp -> *Prototype
ArgumentsImp -> Arguments
RuntimeArrayImp -> RuntimeArray
RuntimeMethodImp -> RuntimeMethod

• most files and functions

WebCore:

Rubber stamped by Maciej.

• updated for KJS class renaming

• many files and functions

File:

• trunk/JavaScriptCore/kjs/function_object.cpp (modified) (12 diffs)

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -37 +37 @@
 using namespace KJS;
 
-// ------------------------------ FunctionPrototypeImp -------------------------
-
-FunctionPrototypeImp::FunctionPrototypeImp(ExecState *exec)
+// ------------------------------ FunctionPrototype -------------------------
+
+FunctionPrototype::FunctionPrototype(ExecState *exec)
 {
   putDirect(lengthPropertyName,   jsNumber(0),                                                       DontDelete|ReadOnly|DontEnum);
-  putDirect(toStringPropertyName, new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::ToString, 0), DontEnum);
+  putDirect(toStringPropertyName, new FunctionProtoFunc(exec, this, FunctionProtoFunc::ToString, 0), DontEnum);
   static const Identifier applyPropertyName("apply");
-  putDirect(applyPropertyName,    new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::Apply,    2), DontEnum);
+  putDirect(applyPropertyName,    new FunctionProtoFunc(exec, this, FunctionProtoFunc::Apply,    2), DontEnum);
   static const Identifier callPropertyName("call");
-  putDirect(callPropertyName,     new FunctionProtoFuncImp(exec, this, FunctionProtoFuncImp::Call,     1), DontEnum);
-}
-
-FunctionPrototypeImp::~FunctionPrototypeImp()
-{
-}
-
-bool FunctionPrototypeImp::implementsCall() const
+  putDirect(callPropertyName,     new FunctionProtoFunc(exec, this, FunctionProtoFunc::Call,     1), DontEnum);
+}
+
+FunctionPrototype::~FunctionPrototype()
+{
+}
+
+bool FunctionPrototype::implementsCall() const
 {
   return true;
@@ -59 +59 @@
 
 // ECMA 15.3.4
-ValueImp *FunctionPrototypeImp::callAsFunction(ExecState */*exec*/, ObjectImp */*thisObj*/, const List &/*args*/)
+JSValue *FunctionPrototype::callAsFunction(ExecState */*exec*/, JSObject */*thisObj*/, const List &/*args*/)
 {
   return jsUndefined();
 }
 
-// ------------------------------ FunctionProtoFuncImp -------------------------
-
-FunctionProtoFuncImp::FunctionProtoFuncImp(ExecState *exec,
-                                         FunctionPrototypeImp *funcProto, int i, int len)
+// ------------------------------ FunctionProtoFunc -------------------------
+
+FunctionProtoFunc::FunctionProtoFunc(ExecState *exec,
+                                         FunctionPrototype *funcProto, int i, int len)
   : InternalFunctionImp(funcProto), id(i)
 {
@@ -74 +74 @@
 
 
-bool FunctionProtoFuncImp::implementsCall() const
-{
-  return true;
-}
-
-ValueImp *FunctionProtoFuncImp::callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args)
-{
-  ValueImp *result = NULL;
+bool FunctionProtoFunc::implementsCall() const
+{
+  return true;
+}
+
+JSValue *FunctionProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
+{
+  JSValue *result = NULL;
 
   switch (id) {
@@ -107 +107 @@
     break;
   case Apply: {
-    ValueImp *thisArg = args[0];
-    ValueImp *argArray = args[1];
-    ObjectImp *func = thisObj;
+    JSValue *thisArg = args[0];
+    JSValue *argArray = args[1];
+    JSObject *func = thisObj;
 
     if (!func->implementsCall())
       return throwError(exec, TypeError);
 
-    ObjectImp *applyThis;
+    JSObject *applyThis;
     if (thisArg->isUndefinedOrNull())
       applyThis = exec->dynamicInterpreter()->globalObject();
@@ -123 +123 @@
     if (!argArray->isUndefinedOrNull()) {
       if (argArray->isObject() &&
-           (static_cast<ObjectImp *>(argArray)->inherits(&ArrayInstanceImp::info) ||
-            static_cast<ObjectImp *>(argArray)->inherits(&ArgumentsImp::info))) {
-
-        ObjectImp *argArrayObj = static_cast<ObjectImp *>(argArray);
+           (static_cast<JSObject *>(argArray)->inherits(&ArrayInstance::info) ||
+            static_cast<JSObject *>(argArray)->inherits(&Arguments::info))) {
+
+        JSObject *argArrayObj = static_cast<JSObject *>(argArray);
         unsigned int length = argArrayObj->get(exec,lengthPropertyName)->toUInt32(exec);
         for (unsigned int i = 0; i < length; i++)
@@ -138 +138 @@
     break;
   case Call: {
-    ValueImp *thisArg = args[0];
-    ObjectImp *func = thisObj;
+    JSValue *thisArg = args[0];
+    JSObject *func = thisObj;
 
     if (!func->implementsCall())
       return throwError(exec, TypeError);
 
-    ObjectImp *callThis;
+    JSObject *callThis;
     if (thisArg->isUndefinedOrNull())
       callThis = exec->dynamicInterpreter()->globalObject();
@@ -160 +160 @@
 // ------------------------------ FunctionObjectImp ----------------------------
 
-FunctionObjectImp::FunctionObjectImp(ExecState *exec, FunctionPrototypeImp *funcProto)
+FunctionObjectImp::FunctionObjectImp(ExecState *exec, FunctionPrototype *funcProto)
   : InternalFunctionImp(funcProto)
 {
@@ -179 +179 @@
 
 // ECMA 15.3.2 The Function Constructor
-ObjectImp *FunctionObjectImp::construct(ExecState *exec, const List &args, const UString &sourceURL, int lineNumber)
+JSObject *FunctionObjectImp::construct(ExecState *exec, const List &args, const UString &sourceURL, int lineNumber)
 {
   UString p("");
@@ -208 +208 @@
     if (!cont) {
       dbg->imp()->abort();
-      return new ObjectImp();
+      return new JSObject();
     }
   }
@@ -259 +259 @@
   List consArgs;
 
-  ObjectImp *objCons = exec->lexicalInterpreter()->builtinObject();
-  ObjectImp *prototype = objCons->construct(exec,List::empty());
+  JSObject *objCons = exec->lexicalInterpreter()->builtinObject();
+  JSObject *prototype = objCons->construct(exec,List::empty());
   prototype->put(exec, constructorPropertyName, fimp, DontEnum|DontDelete|ReadOnly);
   fimp->put(exec, prototypePropertyName, prototype, DontEnum|DontDelete|ReadOnly);
@@ -267 +267 @@
 
 // ECMA 15.3.2 The Function Constructor
-ObjectImp *FunctionObjectImp::construct(ExecState *exec, const List &args)
+JSObject *FunctionObjectImp::construct(ExecState *exec, const List &args)
 {
   return FunctionObjectImp::construct(exec, args, UString(), 0);
@@ -279 +279 @@
 
 // ECMA 15.3.1 The Function Constructor Called as a Function
-ValueImp *FunctionObjectImp::callAsFunction(ExecState *exec, ObjectImp */*thisObj*/, const List &args)
+JSValue *FunctionObjectImp::callAsFunction(ExecState *exec, JSObject */*thisObj*/, const List &args)
 {
   return construct(exec,args);