Changeset 11527 in webkit for trunk/JavaScriptCore/kjs/testkjs.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/testkjs.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -36 +36 @@
 using namespace KJS;
 
-class TestFunctionImp : public ObjectImp {
+class TestFunctionImp : public JSObject {
 public:
   TestFunctionImp(int i, int length);
   virtual bool implementsCall() const { return true; }
-  virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args);
+  virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
 
   enum { Print, Debug, Quit, GC };
@@ -48 +48 @@
 };
 
-TestFunctionImp::TestFunctionImp(int i, int length) : ObjectImp(), id(i)
+TestFunctionImp::TestFunctionImp(int i, int length) : JSObject(), id(i)
 {
   putDirect(lengthPropertyName,length,DontDelete|ReadOnly|DontEnum);
 }
 
-ValueImp *TestFunctionImp::callAsFunction(ExecState *exec, ObjectImp */*thisObj*/, const List &args)
+JSValue *TestFunctionImp::callAsFunction(ExecState *exec, JSObject */*thisObj*/, const List &args)
 {
   switch (id) {
@@ -76 +76 @@
 }
 
-class VersionFunctionImp : public ObjectImp {
+class VersionFunctionImp : public JSObject {
 public:
-  VersionFunctionImp() : ObjectImp() {}
+  VersionFunctionImp() : JSObject() {}
   virtual bool implementsCall() const { return true; }
-  virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args);
+  virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
 };
 
-ValueImp *VersionFunctionImp::callAsFunction(ExecState */*exec*/, ObjectImp */*thisObj*/, const List &/*args*/)
+JSValue *VersionFunctionImp::callAsFunction(ExecState */*exec*/, JSObject */*thisObj*/, const List &/*args*/)
 {
   // We need this function for compatibility with the Mozilla JS tests but for now
@@ -90 +90 @@
 }
 
-class GlobalImp : public ObjectImp {
+class GlobalImp : public JSObject {
 public:
   virtual UString className() const { return "global"; }
@@ -107 +107 @@
     JSLock lock;
 
-    ObjectImp *global(new GlobalImp());
+    JSObject *global(new GlobalImp());
 
     // create interpreter
@@ -154 +154 @@
       if (comp.complType() == Throw) {
         ExecState *exec = interp.globalExec();
-        ValueImp *exVal = comp.value();
+        JSValue *exVal = comp.value();
         char *msg = exVal->toString(exec).ascii();
         int lineno = -1;
         if (exVal->isObject()) {
-          ValueImp *lineVal = static_cast<ObjectImp *>(exVal)->get(exec,"line");
+          JSValue *lineVal = static_cast<JSObject *>(exVal)->get(exec,"line");
           if (lineVal->isNumber())
             lineno = int(lineVal->toNumber(exec));