Changeset 11527 in webkit for trunk/JavaScriptCore/kjs/string_object.h

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/string_object.h (modified) (6 diffs)

trunk/JavaScriptCore/kjs/string_object.h

@@ -28 +28 @@
 namespace KJS {
 
-  class StringInstanceImp : public ObjectImp {
+  class StringInstance : public JSObject {
   public:
-    StringInstanceImp(ObjectImp *proto);
-    StringInstanceImp(ObjectImp *proto, const UString &string);
+    StringInstance(JSObject *proto);
+    StringInstance(JSObject *proto, const UString &string);
 
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
-    virtual void put(ExecState *exec, const Identifier &propertyName, ValueImp *value, int attr = None);
+    virtual void put(ExecState *exec, const Identifier &propertyName, JSValue *value, int attr = None);
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
 
@@ -40 +40 @@
     static const ClassInfo info;
   private:
-    static ValueImp *lengthGetter(ExecState *exec, const Identifier&, const PropertySlot &slot);
-    static ValueImp *indexGetter(ExecState *exec, const Identifier&, const PropertySlot &slot);
+    static JSValue *lengthGetter(ExecState *exec, const Identifier&, const PropertySlot &slot);
+    static JSValue *indexGetter(ExecState *exec, const Identifier&, const PropertySlot &slot);
   };
 
@@ -50 +50 @@
    * with the String constructor
    */
-  class StringPrototypeImp : public StringInstanceImp {
+  class StringPrototype : public StringInstance {
   public:
-    StringPrototypeImp(ExecState *exec,
-                       ObjectPrototypeImp *objProto);
+    StringPrototype(ExecState *exec,
+                       ObjectPrototype *objProto);
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
     virtual const ClassInfo *classInfo() const { return &info; }
@@ -65 +65 @@
    * String.prototype object
    */
-  class StringProtoFuncImp : public InternalFunctionImp {
+  class StringProtoFunc : public InternalFunctionImp {
   public:
-    StringProtoFuncImp(ExecState *exec, int i, int len);
+    StringProtoFunc(ExecState *exec, int i, int len);
 
     virtual bool implementsCall() const;
-    virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args);
+    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
 
     enum { ToString, ValueOf, CharAt, CharCodeAt, Concat, IndexOf, LastIndexOf,
@@ -93 +93 @@
   public:
     StringObjectImp(ExecState *exec,
-                    FunctionPrototypeImp *funcProto,
-                    StringPrototypeImp *stringProto);
+                    FunctionPrototype *funcProto,
+                    StringPrototype *stringProto);
 
     virtual bool implementsConstruct() const;
-    virtual ObjectImp *construct(ExecState *exec, const List &args);
+    virtual JSObject *construct(ExecState *exec, const List &args);
     virtual bool implementsCall() const;
-    virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args);
+    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
   };
 
@@ -110 +110 @@
   class StringObjectFuncImp : public InternalFunctionImp {
   public:
-    StringObjectFuncImp(ExecState *exec, FunctionPrototypeImp *funcProto);
+    StringObjectFuncImp(ExecState *exec, FunctionPrototype *funcProto);
     virtual bool implementsCall() const;
-    virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args);
+    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
   };