Changeset 27086 in webkit for trunk/JavaScriptCore/kjs/internal.cpp

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/internal.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -56 +56 @@
 // ------------------------------ StringImp ------------------------------------
 
-JSValue *StringImp::toPrimitive(ExecState *, JSType) const
-{
-  return const_cast<StringImp *>(this);
+JSValue* StringImp::toPrimitive(ExecState*, JSType) const
+{
+  return const_cast<StringImp*>(this);
+}
+
+bool StringImp::getPrimitiveNumber(ExecState*, double& number) const
+{
+    number = val.toDouble();
+    return false;
 }
 
@@ -83 +89 @@
 // ------------------------------ NumberImp ------------------------------------
 
-JSValue *NumberImp::toPrimitive(ExecState *, JSType) const
-{
-  return const_cast<NumberImp *>(this);
+JSValue* NumberImp::toPrimitive(ExecState*, JSType) const
+{
+    return const_cast<NumberImp*>(this);
+}
+
+bool NumberImp::getPrimitiveNumber(ExecState*, double& number) const
+{
+    number = val;
+    return true;
 }
 
@@ -145 +157 @@
 }
 
-JSValue *GetterSetterImp::toPrimitive(ExecState*, JSType) const
+JSValue* GetterSetterImp::toPrimitive(ExecState*, JSType) const
 {
     ASSERT(false);
     return jsNull();
+}
+
+bool GetterSetterImp::getPrimitiveNumber(ExecState*, double& number) const
+{
+    ASSERT(false);
+    number = 0;
+    return true;
 }