Changeset 27086 in webkit for trunk/JavaScriptCore/kjs/value.h

Timestamp:

Oct 25, 2007, 8:58:18 PM (18 years ago)

Author:

mjs

Message:

Reviewed by Oliver.

• fold together toPrimitive() and toNumber() conversions for 0.5% gain on SunSpider

• kjs/nodes.cpp: (KJS::SubNode::evaluate): Subtract directly, since toPrimitive() is not adding any value over toNumber() here. (KJS::valueForReadModifyAssignment): Ditto. (KJS::lessThan): Use new getPrimitiveNumber() method to avoid some virtual calls and branches. (KJS::lessThanEq): Ditto.
• JavaScriptCore.exp: Export new functions as needed.
• kjs/value.h: (KJS::JSValue::toPrimitive): Fixed formatting. (KJS::JSValue::getPrimitiveNumber): New method - this simultaneously converts to number and tells you whether a toPrimitive() conversion with a Number hint would have given a string.
• kjs/internal.cpp: (KJS::StringImp::getPrimitiveNumber): Implemented. (KJS::NumberImp::getPrimitiveNumber): ditto (KJS::GetterSetterImp::getPrimitiveNumber): ditto (KJS::StringImp::toPrimitive): Fixed formatting. (KJS::NumberImp::toPrimitive): ditto (KJS::GetterSetterImp::toPrimitive): ditto
• kjs/internal.h:
• kjs/object.cpp: (KJS::JSObject::getPrimitiveNumber): Implemented.
• kjs/object.h:

File:

• trunk/JavaScriptCore/kjs/value.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/value.h

@@ -82 +82 @@
 
     // Basic conversions.
-    JSValue *toPrimitive(ExecState *exec, JSType preferredType = UnspecifiedType) const;
+    JSValue* toPrimitive(ExecState* exec, JSType preferredType = UnspecifiedType) const;
+    bool getPrimitiveNumber(ExecState* exec, double& number) const;
+
     bool toBoolean(ExecState *exec) const;
     double toNumber(ExecState *exec) const;
@@ -148 +150 @@
     // Basic conversions.
     virtual JSValue *toPrimitive(ExecState *exec, JSType preferredType = UnspecifiedType) const = 0;
+    virtual bool getPrimitiveNumber(ExecState* exec, double& number) const = 0;
     virtual bool toBoolean(ExecState *exec) const = 0;
     virtual double toNumber(ExecState *exec) const = 0;
@@ -366 +369 @@
 }
 
-inline JSValue *JSValue::toPrimitive(ExecState *exec, JSType preferredType) const
-{
-    return JSImmediate::isImmediate(this) ? const_cast<JSValue *>(this) : asCell()->toPrimitive(exec, preferredType);
+inline JSValue* JSValue::toPrimitive(ExecState* exec, JSType preferredType) const
+{
+    return JSImmediate::isImmediate(this) ? const_cast<JSValue*>(this) : asCell()->toPrimitive(exec, preferredType);
+}
+
+inline bool JSValue::getPrimitiveNumber(ExecState* exec, double& number) const
+{
+    if (JSImmediate::isImmediate(this)) {
+        number = JSImmediate::toDouble(this);
+        return true;
+    }
+    return asCell()->getPrimitiveNumber(exec, number);
 }