Changeset 11527 in webkit for trunk/JavaScriptCore/kjs/value.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/value.h (modified) (15 diffs)

trunk/JavaScriptCore/kjs/value.h

@@ -43 +43 @@
 class ClassInfo;
 class ExecState;
-class ObjectImp;
+class JSObject;
 
 /**
@@ -59 +59 @@
 
 /**
- * ValueImp is the base type for all primitives (Undefined, Null, Boolean,
+ * JSValue is the base type for all primitives (Undefined, Null, Boolean,
  * String, Number) and objects in ECMAScript.
  *
- * Note: you should never inherit from ValueImp as it is for primitive types
+ * Note: you should never inherit from JSValue as it is for primitive types
  * only (all of which are provided internally by KJS). Instead, inherit from
- * ObjectImp.
+ * JSObject.
  */
-class ValueImp {
-    friend class AllocatedValueImp; // so it can derive from this class
+class JSValue {
+    friend class JSCell; // so it can derive from this class
     friend class ProtectedValues; // so it can call downcast()
 
 private:
-    ValueImp();
-    virtual ~ValueImp();
+    JSValue();
+    virtual ~JSValue();
 
 public:
@@ -92 +92 @@
     bool getString(UString&) const;
     UString getString() const; // null string if not a string
-    ObjectImp *getObject(); // NULL if not an object
-    const ObjectImp *getObject() const; // NULL if not an object
+    JSObject *getObject(); // NULL if not an object
+    const JSObject *getObject() const; // NULL if not an object
 
     // Extracting integer values.
@@ -99 +99 @@
 
     // Basic conversions.
-    ValueImp *toPrimitive(ExecState *exec, Type preferredType = UnspecifiedType) const;
+    JSValue *toPrimitive(ExecState *exec, Type preferredType = UnspecifiedType) const;
     bool toBoolean(ExecState *exec) const;
     double toNumber(ExecState *exec) const;
     UString toString(ExecState *exec) const;
-    ObjectImp *toObject(ExecState *exec) const;
+    JSObject *toObject(ExecState *exec) const;
 
     // Integer conversions.
@@ -117 +117 @@
 private:
     // Implementation details.
-    AllocatedValueImp *downcast();
-    const AllocatedValueImp *downcast() const;
+    JSCell *downcast();
+    const JSCell *downcast() const;
 
     // Give a compile time error if we try to copy one of these.
-    ValueImp(const ValueImp&);
-    ValueImp& operator=(const ValueImp&);
+    JSValue(const JSValue&);
+    JSValue& operator=(const JSValue&);
 };
 
-class AllocatedValueImp : public ValueImp {
+class JSCell : public JSValue {
     friend class Collector;
     friend class UndefinedImp;
@@ -132 +132 @@
     friend class NumberImp;
     friend class StringImp;
-    friend class ObjectImp;
+    friend class JSObject;
 private:
-    AllocatedValueImp();
-    virtual ~AllocatedValueImp();
+    JSCell();
+    virtual ~JSCell();
 public:
     // Querying the type.
@@ -151 +151 @@
     bool getString(UString&) const;
     UString getString() const; // null string if not a string
-    ObjectImp *getObject(); // NULL if not an object
-    const ObjectImp *getObject() const; // NULL if not an object
+    JSObject *getObject(); // NULL if not an object
+    const JSObject *getObject() const; // NULL if not an object
 
     // Extracting integer values.
@@ -158 +158 @@
 
     // Basic conversions.
-    virtual ValueImp *toPrimitive(ExecState *exec, Type preferredType = UnspecifiedType) const = 0;
+    virtual JSValue *toPrimitive(ExecState *exec, Type preferredType = UnspecifiedType) const = 0;
     virtual bool toBoolean(ExecState *exec) const = 0;
     virtual double toNumber(ExecState *exec) const = 0;
     virtual UString toString(ExecState *exec) const = 0;
-    virtual ObjectImp *toObject(ExecState *exec) const = 0;
+    virtual JSObject *toObject(ExecState *exec) const = 0;
 
     // Garbage collection.
@@ -173 +173 @@
 };
 
-AllocatedValueImp *jsUndefined();
-AllocatedValueImp *jsNull();
-
-AllocatedValueImp *jsBoolean(bool);
-
-ValueImp *jsNumber(double);
-ValueImp *jsNaN();
-
-AllocatedValueImp *jsString(const UString &); // returns empty string if passed null string
-AllocatedValueImp *jsString(const char * = ""); // returns empty string if passed 0
+JSCell *jsUndefined();
+JSCell *jsNull();
+
+JSCell *jsBoolean(bool);
+
+JSValue *jsNumber(double);
+JSValue *jsNaN();
+
+JSCell *jsString(const UString &); // returns empty string if passed null string
+JSCell *jsString(const char * = ""); // returns empty string if passed 0
 
 extern const double NaN;
@@ -189 +189 @@
 class ConstantValues {
 public:
-    static AllocatedValueImp *undefined;
-    static AllocatedValueImp *null;
-    static AllocatedValueImp *jsFalse;
-    static AllocatedValueImp *jsTrue;
+    static JSCell *undefined;
+    static JSCell *null;
+    static JSCell *jsFalse;
+    static JSCell *jsTrue;
 
     static void initIfNeeded();
@@ -198 +198 @@
 };
 
-inline AllocatedValueImp *jsUndefined()
+inline JSCell *jsUndefined()
 {
     return ConstantValues::undefined;
 }
 
-inline AllocatedValueImp *jsNull()
+inline JSCell *jsNull()
 {
     return ConstantValues::null;
 }
 
-inline AllocatedValueImp *jsBoolean(bool b)
+inline JSCell *jsBoolean(bool b)
 {
     return b ? ConstantValues::jsTrue : ConstantValues::jsFalse;
 }
 
-inline ValueImp *jsNaN()
+inline JSValue *jsNaN()
 {
     return SimpleNumber::make(NaN);
 }
 
-inline ValueImp::ValueImp()
-{
-}
-
-inline ValueImp::~ValueImp()
-{
-}
-
-inline AllocatedValueImp::AllocatedValueImp()
+inline JSValue::JSValue()
+{
+}
+
+inline JSValue::~JSValue()
+{
+}
+
+inline JSCell::JSCell()
     : m_marked(false)
 {
 }
 
-inline AllocatedValueImp::~AllocatedValueImp()
-{
-}
-
-inline bool AllocatedValueImp::isBoolean() const
+inline JSCell::~JSCell()
+{
+}
+
+inline bool JSCell::isBoolean() const
 {
     return type() == BooleanType;
 }
 
-inline bool AllocatedValueImp::isNumber() const
+inline bool JSCell::isNumber() const
 {
     return type() == NumberType;
 }
 
-inline bool AllocatedValueImp::isString() const
+inline bool JSCell::isString() const
 {
     return type() == StringType;
 }
 
-inline bool AllocatedValueImp::isObject() const
+inline bool JSCell::isObject() const
 {
     return type() == ObjectType;
 }
 
-inline bool AllocatedValueImp::marked() const
+inline bool JSCell::marked() const
 {
     return m_marked;
 }
 
-inline void AllocatedValueImp::mark()
+inline void JSCell::mark()
 {
     m_marked = true;
 }
 
-inline AllocatedValueImp *ValueImp::downcast()
+inline JSCell *JSValue::downcast()
 {
     assert(!SimpleNumber::is(this));
-    return static_cast<AllocatedValueImp *>(this);
-}
-
-inline const AllocatedValueImp *ValueImp::downcast() const
+    return static_cast<JSCell *>(this);
+}
+
+inline const JSCell *JSValue::downcast() const
 {
     assert(!SimpleNumber::is(this));
-    return static_cast<const AllocatedValueImp *>(this);
-}
-
-inline bool ValueImp::isUndefined() const
+    return static_cast<const JSCell *>(this);
+}
+
+inline bool JSValue::isUndefined() const
 {
     return this == jsUndefined();
 }
 
-inline bool ValueImp::isNull() const
+inline bool JSValue::isNull() const
 {
     return this == jsNull();
 }
 
-inline bool ValueImp::isUndefinedOrNull() const
+inline bool JSValue::isUndefinedOrNull() const
 {
     return this == jsUndefined() || this == jsNull();
 }
 
-inline bool ValueImp::isBoolean() const
+inline bool JSValue::isBoolean() const
 {
     return !SimpleNumber::is(this) && downcast()->isBoolean();
 }
 
-inline bool ValueImp::isNumber() const
+inline bool JSValue::isNumber() const
 {
     return SimpleNumber::is(this) || downcast()->isNumber();
 }
 
-inline bool ValueImp::isString() const
+inline bool JSValue::isString() const
 {
     return !SimpleNumber::is(this) && downcast()->isString();
 }
 
-inline bool ValueImp::isObject() const
+inline bool JSValue::isObject() const
 {
     return !SimpleNumber::is(this) && downcast()->isObject();
 }
 
-inline bool ValueImp::isObject(const ClassInfo *c) const
+inline bool JSValue::isObject(const ClassInfo *c) const
 {
     return !SimpleNumber::is(this) && downcast()->isObject(c);
 }
 
-inline bool ValueImp::getBoolean(bool& v) const
+inline bool JSValue::getBoolean(bool& v) const
 {
     return !SimpleNumber::is(this) && downcast()->getBoolean(v);
 }
 
-inline bool ValueImp::getNumber(double& v) const
+inline bool JSValue::getNumber(double& v) const
 {
     if (SimpleNumber::is(this)) {
@@ -331 +331 @@
 }
 
-inline double ValueImp::getNumber() const
+inline double JSValue::getNumber() const
 {
     return SimpleNumber::is(this) ? SimpleNumber::value(this) : downcast()->getNumber();
 }
 
-inline bool ValueImp::getString(UString& s) const
+inline bool JSValue::getString(UString& s) const
 {
     return !SimpleNumber::is(this) && downcast()->getString(s);
 }
 
-inline UString ValueImp::getString() const
+inline UString JSValue::getString() const
 {
     return SimpleNumber::is(this) ? UString() : downcast()->getString();
 }
 
-inline ObjectImp *ValueImp::getObject()
+inline JSObject *JSValue::getObject()
 {
     return SimpleNumber::is(this) ? 0 : downcast()->getObject();
 }
 
-inline const ObjectImp *ValueImp::getObject() const
+inline const JSObject *JSValue::getObject() const
 {
     return SimpleNumber::is(this) ? 0 : downcast()->getObject();
 }
 
-inline bool ValueImp::getUInt32(uint32_t& v) const
+inline bool JSValue::getUInt32(uint32_t& v) const
 {
     if (SimpleNumber::is(this)) {
@@ -368 +368 @@
 }
 
-inline void ValueImp::mark()
+inline void JSValue::mark()
 {
     if (!SimpleNumber::is(this))
@@ -374 +374 @@
 }
 
-inline bool ValueImp::marked() const
+inline bool JSValue::marked() const
 {
     return SimpleNumber::is(this) || downcast()->marked();
 }
 
-inline Type ValueImp::type() const
+inline Type JSValue::type() const
 {
     return SimpleNumber::is(this) ? NumberType : downcast()->type();
 }
 
-inline ValueImp *ValueImp::toPrimitive(ExecState *exec, Type preferredType) const
-{
-    return SimpleNumber::is(this) ? const_cast<ValueImp *>(this) : downcast()->toPrimitive(exec, preferredType);
-}
-
-inline bool ValueImp::toBoolean(ExecState *exec) const
+inline JSValue *JSValue::toPrimitive(ExecState *exec, Type preferredType) const
+{
+    return SimpleNumber::is(this) ? const_cast<JSValue *>(this) : downcast()->toPrimitive(exec, preferredType);
+}
+
+inline bool JSValue::toBoolean(ExecState *exec) const
 {
     if (SimpleNumber::is(this)) {
@@ -399 +399 @@
 }
 
-inline double ValueImp::toNumber(ExecState *exec) const
+inline double JSValue::toNumber(ExecState *exec) const
 {
     return SimpleNumber::is(this) ? SimpleNumber::value(this) : downcast()->toNumber(exec);
 }
 
-inline UString ValueImp::toString(ExecState *exec) const
+inline UString JSValue::toString(ExecState *exec) const
 {
     if (SimpleNumber::is(this)) {