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

trunk/JavaScriptCore/kjs/value.cpp

@@ -41 +41 @@
 namespace KJS {
 
-AllocatedValueImp *ConstantValues::undefined = NULL;
-AllocatedValueImp *ConstantValues::null = NULL;
-AllocatedValueImp *ConstantValues::jsTrue = NULL;
-AllocatedValueImp *ConstantValues::jsFalse = NULL;
+JSCell *ConstantValues::undefined = NULL;
+JSCell *ConstantValues::null = NULL;
+JSCell *ConstantValues::jsTrue = NULL;
+JSCell *ConstantValues::jsFalse = NULL;
 
 static const double D16 = 65536.0;
 static const double D32 = 4294967296.0;
 
-void *AllocatedValueImp::operator new(size_t size)
+void *JSCell::operator new(size_t size)
 {
     return Collector::allocate(size);
 }
 
-bool AllocatedValueImp::getUInt32(unsigned&) const
+bool JSCell::getUInt32(unsigned&) const
 {
     return false;
@@ -60 +60 @@
 
 // ECMA 9.4
-double ValueImp::toInteger(ExecState *exec) const
-{
-    uint32_t i;
-    if (getUInt32(i))
-        return i;
-    return roundValue(exec, const_cast<ValueImp*>(this));
-}
-
-int32_t ValueImp::toInt32(ExecState *exec) const
-{
-    uint32_t i;
-    if (getUInt32(i))
-        return i;
-
-    double d = roundValue(exec, const_cast<ValueImp*>(this));
+double JSValue::toInteger(ExecState *exec) const
+{
+    uint32_t i;
+    if (getUInt32(i))
+        return i;
+    return roundValue(exec, const_cast<JSValue*>(this));
+}
+
+int32_t JSValue::toInt32(ExecState *exec) const
+{
+    uint32_t i;
+    if (getUInt32(i))
+        return i;
+
+    double d = roundValue(exec, const_cast<JSValue*>(this));
     if (isNaN(d) || isInf(d))
         return 0;
@@ -87 +87 @@
 }
 
-uint32_t ValueImp::toUInt32(ExecState *exec) const
-{
-    uint32_t i;
-    if (getUInt32(i))
-        return i;
-
-    double d = roundValue(exec, const_cast<ValueImp*>(this));
+uint32_t JSValue::toUInt32(ExecState *exec) const
+{
+    uint32_t i;
+    if (getUInt32(i))
+        return i;
+
+    double d = roundValue(exec, const_cast<JSValue*>(this));
     if (isNaN(d) || isInf(d))
         return 0;
@@ -104 +104 @@
 }
 
-uint16_t ValueImp::toUInt16(ExecState *exec) const
-{
-    uint32_t i;
-    if (getUInt32(i))
-        return i;
-
-    double d = roundValue(exec, const_cast<ValueImp*>(this));
+uint16_t JSValue::toUInt16(ExecState *exec) const
+{
+    uint32_t i;
+    if (getUInt32(i))
+        return i;
+
+    double d = roundValue(exec, const_cast<JSValue*>(this));
     if (isNaN(d) || isInf(d))
         return 0;
@@ -121 +121 @@
 }
 
-ObjectImp *ValueImp::toObject(ExecState *exec) const
+JSObject *JSValue::toObject(ExecState *exec) const
 {
     if (SimpleNumber::is(this))
@@ -128 +128 @@
 }
 
-bool AllocatedValueImp::getBoolean(bool &booleanValue) const
+bool JSCell::getBoolean(bool &booleanValue) const
 {
     if (!isBoolean())
@@ -136 +136 @@
 }
 
-bool AllocatedValueImp::getNumber(double &numericValue) const
+bool JSCell::getNumber(double &numericValue) const
 {
     if (!isNumber())
@@ -144 +144 @@
 }
 
-double AllocatedValueImp::getNumber() const
+double JSCell::getNumber() const
 {
     return isNumber() ? static_cast<const NumberImp *>(this)->value() : NaN;
 }
 
-bool AllocatedValueImp::getString(UString &stringValue) const
+bool JSCell::getString(UString &stringValue) const
 {
     if (!isString())
@@ -157 +157 @@
 }
 
-UString AllocatedValueImp::getString() const
+UString JSCell::getString() const
 {
     return isString() ? static_cast<const StringImp *>(this)->value() : UString();
 }
 
-ObjectImp *AllocatedValueImp::getObject()
-{
-    return isObject() ? static_cast<ObjectImp *>(this) : 0;
-}
-
-const ObjectImp *AllocatedValueImp::getObject() const
-{
-    return isObject() ? static_cast<const ObjectImp *>(this) : 0;
-}
-
-AllocatedValueImp *jsString(const char *s)
+JSObject *JSCell::getObject()
+{
+    return isObject() ? static_cast<JSObject *>(this) : 0;
+}
+
+const JSObject *JSCell::getObject() const
+{
+    return isObject() ? static_cast<const JSObject *>(this) : 0;
+}
+
+JSCell *jsString(const char *s)
 {
     return new StringImp(s ? s : "");
 }
 
-AllocatedValueImp *jsString(const UString &s)
+JSCell *jsString(const UString &s)
 {
     return s.isNull() ? new StringImp("") : new StringImp(s);
 }
 
-ValueImp *jsNumber(double d)
-{
-  ValueImp *v = SimpleNumber::make(d);
+JSValue *jsNumber(double d)
+{
+  JSValue *v = SimpleNumber::make(d);
   return v ? v : new NumberImp(d);
 }
@@ -201 +201 @@
 void ConstantValues::mark()
 {
-    if (AllocatedValueImp *v = undefined)
-        if (!v->marked())
-            v->mark();
-    if (AllocatedValueImp *v = null)
-        if (!v->marked())
-            v->mark();
-    if (AllocatedValueImp *v = jsTrue)
-        if (!v->marked())
-            v->mark();
-    if (AllocatedValueImp *v = jsFalse)
-        if (!v->marked())
-            v->mark();
-}
-
-}
+    if (JSCell *v = undefined)
+        if (!v->marked())
+            v->mark();
+    if (JSCell *v = null)
+        if (!v->marked())
+            v->mark();
+    if (JSCell *v = jsTrue)
+        if (!v->marked())
+            v->mark();
+    if (JSCell *v = jsFalse)
+        if (!v->marked())
+            v->mark();
+}
+
+}