source: webkit/trunk/JavaScriptCore/kjs/JSNumberCell.h@ 35900

Last change on this file since 35900 was 35830, checked in by Darin Adler, 17 years ago

JavaScriptCore:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

  • eliminate JSValue::type()

This will make it slightly easier to change the JSImmediate design without
having to touch so many call sites.

SunSpider says this change is a wash (looked like a slight speedup, but not
statistically significant).

  • API/JSStringRef.cpp: Removed include of JSType.h.
  • API/JSValueRef.cpp: Removed include of JSType.h. (JSValueGetType): Replaced use of JSValue::type() with JSValue::is functions.
  • VM/JSPropertyNameIterator.cpp: Removed type() implementation. (KJS::JSPropertyNameIterator::toPrimitive): Changed to take PreferredPrimitiveType argument instead of JSType.
  • VM/JSPropertyNameIterator.h: Ditto.
  • VM/Machine.cpp: (KJS::fastIsNumber): Updated for name change. (KJS::fastToInt32): Ditto. (KJS::fastToUInt32): Ditto. (KJS::jsAddSlowCase): Updated toPrimitive caller for change from JSType to PreferredPrimitiveType. (KJS::jsAdd): Replaced calls to JSValue::type() with calls to JSValue::isString(). (KJS::jsTypeStringForValue): Replaced calls to JSValue::type() with multiple calls to JSValue::is -- we could make this a virtual function instead if we want to have faster performance. (KJS::Machine::privateExecute): Renamed JSImmediate::toTruncatedUInt32 to JSImmediate::getTruncatedUInt32 for consistency with other functions. Changed two calls of JSValue::type() to JSValue::isString().
  • kjs/GetterSetter.cpp: (KJS::GetterSetter::toPrimitive): Changed to take PreferredPrimitiveType argument instead of JSType. (KJS::GetterSetter::isGetterSetter): Added.
  • kjs/GetterSetter.h:
  • kjs/JSCell.cpp: (KJS::JSCell::isString): Added. (KJS::JSCell::isGetterSetter): Added. (KJS::JSCell::isObject): Added.
  • kjs/JSCell.h: Eliminated type function. Added isGetterSetter. Made isString and isObject virtual. Changed toPrimitive to take PreferredPrimitiveType argument instead of JSType. (KJS::JSCell::isNumber): Use Heap::isNumber for faster performance. (KJS::JSValue::isGetterSetter): Added. (KJS::JSValue::toPrimitive): Changed to take PreferredPrimitiveType argument instead of JSType.
  • kjs/JSImmediate.h: Removed JSValue::type() and replaced JSValue::toTruncatedUInt32 with JSValue::getTruncatedUInt32. (KJS::JSImmediate::isEitherImmediate): Added.
  • kjs/JSNotAnObject.cpp: (KJS::JSNotAnObject::toPrimitive): Changed to take PreferredPrimitiveType argument instead of JSType.
  • kjs/JSNotAnObject.h: Ditto.
  • kjs/JSNumberCell.cpp: (KJS::JSNumberCell::toPrimitive): Ditto.
  • kjs/JSNumberCell.h: (KJS::JSNumberCell::toInt32): Renamed from fastToInt32. There's no other "slow" version of this once you have a JSNumberCell, so there's no need for "fast" in the name. It's a feature that this hides the base class toInt32, which does the same job less efficiently (and has an additional ExecState argument). (KJS::JSNumberCell::toUInt32): Ditto.
  • kjs/JSObject.cpp: (KJS::callDefaultValueFunction): Use isGetterSetter instead of type. (KJS::JSObject::getPrimitiveNumber): Use PreferredPrimitiveType. (KJS::JSObject::defaultValue): Ditto. (KJS::JSObject::defineGetter): Use isGetterSetter. (KJS::JSObject::defineSetter): Ditto. (KJS::JSObject::lookupGetter): Ditto. (KJS::JSObject::lookupSetter): Ditto. (KJS::JSObject::toNumber): Use PreferredPrimitiveType. (KJS::JSObject::toString): Ditto. (KJS::JSObject::isObject): Added.
  • kjs/JSObject.h: (KJS::JSObject::inherits): Call the isObject from JSCell; it's now hidden by our override of isObject. (KJS::JSObject::getOwnPropertySlotForWrite): Use isGetterSetter instead of type. (KJS::JSObject::getOwnPropertySlot): Ditto. (KJS::JSObject::toPrimitive): Use PreferredPrimitiveType.
  • kjs/JSString.cpp: (KJS::JSString::toPrimitive): Use PreferredPrimitiveType. (KJS::JSString::isString): Added.
  • kjs/JSString.h: Ditto.
  • kjs/JSValue.h: Removed type(), added isGetterSetter(). Added PreferredPrimitiveType enum and used it as the argument for the toPrimitive function. (KJS::JSValue::getBoolean): Simplified a bit an removed a branch.
  • kjs/collector.cpp: (KJS::typeName): Changed to use JSCell::is functions instead of calling JSCell::type.
  • kjs/collector.h: (KJS::Heap::isNumber): Renamed from fastIsNumber.
  • kjs/nodes.h: Added now-needed include of JSType, since the type is used here to record types of values in the tree.
  • kjs/operations.cpp: (KJS::equal): Rewrote to no longer depend on type(). (KJS::strictEqual): Ditto.

JavaScriptGlue:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

  • eliminate JSValue::type()
  • JSUtils.cpp: (KJSValueToCFTypeInternal): Replaced uses of JSValue::type() with JSValue::is functions.
  • UserObjectImp.cpp: (UserObjectImp::getOwnPropertySlot): Ditto. (UserObjectImp::toPrimitive): Take PreferredPrimitiveType argument instead of JSType argument.
  • UserObjectImp.h: Ditto.

WebCore:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

  • eliminate JSValue::type()
  • bridge/c/c_instance.cpp: (KJS::Bindings::CInstance::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument. Removed unneeded code to handle boolean, since that's never passed.
  • bridge/c/c_instance.h: Ditto.
  • bridge/c/c_utility.cpp: (KJS::Bindings::convertValueToNPVariant): Use JSValue::is functions instead of JSValue::type(). Removed unneeded code to handle "unspecified".
  • bridge/jni/jni_instance.cpp: (JavaInstance::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument. Removed unneeded code to handle boolean.
  • bridge/jni/jni_instance.h: Ditto.
  • bridge/jni/jni_jsobject.mm: (JavaJSObject::convertValueToJObject): Use JSValue::is functions instead of JSValue::type().
  • bridge/objc/objc_instance.h: Take PreferredPrimitiveType argument instead of JSType argument. Removed unused argument.
  • bridge/objc/objc_instance.mm: (ObjcInstance::getValueOfUndefinedField): Removed unused argument. (ObjcInstance::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument. Removed unneeded code to handle boolean and another dead code path for unknown types.
  • bridge/objc/objc_runtime.h: Take PreferredPrimitiveType argument instead of JSType argument. Removed override of type() that caused the fallback object to return "UndefinedType" when there is no invokeUndefinedMethodFromWebScript:withArguments: method defined. That didn't accomplish much, since most checks for undefined don't ever call type().
  • bridge/objc/objc_runtime.mm: (ObjcFallbackObjectImp::defaultValue): Ditto.
  • bridge/qt/qt_instance.cpp: (KJS::Bindings::QtInstance::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument. Removed unneeded code to handle boolean.
  • bridge/qt/qt_instance.h: Ditto.
  • bridge/runtime.h: (KJS::Bindings::Instance::getValueOfUndefinedField): Removed unsed argument.
  • bridge/runtime_object.cpp: (RuntimeObjectImp::defaultValue): Take PreferredPrimitiveType argument instead of JSType argument.
  • bridge/runtime_object.h: Ditto.

WebKit/mac:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

  • eliminate JSValue::type()
  • WebView/WebView.mm: (aeDescFromJSValue): Rewrite to use the JSValue::is functions instead of a switch on JSValue::type().

LayoutTests:

2008-08-12 Darin Adler <Darin Adler>

Reviewed by Geoff.

  • added a test since I had to rewrite the == and === operators
  • fast/js/equality-expected.txt: Added.
  • fast/js/equality.html: Added.
  • fast/js/resources/equality.js: Added.
  • Property svn:eol-style set to native
File size: 5.2 KB
Line 
1/*
2 * Copyright (C) 1999-2001 Harri Porten ([email protected])
3 * Copyright (C) 2001 Peter Kelly ([email protected])
4 * Copyright (C) 2003, 2004, 2005, 2007, 2008 Apple Inc. All rights reserved.
5 *
6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version.
10 *
11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details.
15 *
16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA.
20 *
21 */
22
23#ifndef JSNumberCell_h
24#define JSNumberCell_h
25
26#include "ExecState.h"
27#include "JSCell.h"
28#include "JSImmediate.h"
29#include "collector.h"
30#include "ustring.h"
31#include <stddef.h> // for size_t
32
33namespace KJS {
34
35 class Identifier;
36 class JSCell;
37 class JSObject;
38 class JSString;
39 class PropertySlot;
40
41 struct ClassInfo;
42 struct Instruction;
43
44 class JSNumberCell : public JSCell {
45 friend JSValue* jsNumberCell(ExecState*, double);
46 public:
47 double value() const { return m_value; }
48
49 virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType) const;
50 virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
51 virtual bool toBoolean(ExecState*) const;
52 virtual double toNumber(ExecState*) const;
53 virtual UString toString(ExecState*) const;
54 virtual JSObject* toObject(ExecState*) const;
55
56 virtual UString toThisString(ExecState*) const;
57 virtual JSObject* toThisObject(ExecState*) const;
58 virtual JSValue* getJSNumber();
59
60 int32_t toInt32() const;
61 uint32_t toUInt32() const;
62
63 void* operator new(size_t size, ExecState* exec)
64 {
65 #ifdef JAVASCRIPTCORE_BUILDING_ALL_IN_ONE_FILE
66 return exec->heap()->inlineAllocateNumber(size);
67 #else
68 return exec->heap()->allocateNumber(size);
69 #endif
70 }
71
72 private:
73 JSNumberCell(double value)
74 : m_value(value)
75 {
76 }
77
78 virtual bool getUInt32(uint32_t&) const;
79 virtual bool getTruncatedInt32(int32_t&) const;
80 virtual bool getTruncatedUInt32(uint32_t&) const;
81
82 double m_value;
83 };
84
85 extern const double NaN;
86 extern const double Inf;
87
88 // Beware marking this function ALWAYS_INLINE: It takes a PIC branch, so
89 // inlining it may not always be a win.
90 inline JSValue* jsNumberCell(ExecState* exec, double d)
91 {
92 return new (exec) JSNumberCell(d);
93 }
94
95 inline JSValue* jsNaN(ExecState* exec)
96 {
97 return jsNumberCell(exec, NaN);
98 }
99
100 ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, double d)
101 {
102 JSValue* v = JSImmediate::from(d);
103 return v ? v : jsNumberCell(exec, d);
104 }
105
106 ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, int i)
107 {
108 JSValue* v = JSImmediate::from(i);
109 return v ? v : jsNumberCell(exec, i);
110 }
111
112 ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, unsigned i)
113 {
114 JSValue* v = JSImmediate::from(i);
115 return v ? v : jsNumberCell(exec, i);
116 }
117
118 ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, long i)
119 {
120 JSValue* v = JSImmediate::from(i);
121 return v ? v : jsNumberCell(exec, i);
122 }
123
124 ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, unsigned long i)
125 {
126 JSValue* v = JSImmediate::from(i);
127 return v ? v : jsNumberCell(exec, i);
128 }
129
130 ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, long long i)
131 {
132 JSValue* v = JSImmediate::from(i);
133 return v ? v : jsNumberCell(exec, static_cast<double>(i));
134 }
135
136 ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, unsigned long long i)
137 {
138 JSValue* v = JSImmediate::from(i);
139 return v ? v : jsNumberCell(exec, static_cast<double>(i));
140 }
141
142 // --- JSValue inlines ----------------------------
143
144 inline double JSValue::uncheckedGetNumber() const
145 {
146 ASSERT(JSImmediate::isImmediate(this) || asCell()->isNumber());
147 return JSImmediate::isImmediate(this) ? JSImmediate::toDouble(this) : static_cast<const JSNumberCell*>(this)->value();
148 }
149
150 inline int32_t JSNumberCell::toInt32() const
151 {
152 if (m_value >= -2147483648.0 && m_value < 2147483648.0)
153 return static_cast<int32_t>(m_value);
154 bool scratch;
155 return JSValue::toInt32SlowCase(m_value, scratch);
156 }
157
158 inline uint32_t JSNumberCell::toUInt32() const
159 {
160 if (m_value >= 0.0 && m_value < 4294967296.0)
161 return static_cast<uint32_t>(m_value);
162 bool scratch;
163 return JSValue::toUInt32SlowCase(m_value, scratch);
164 }
165
166 ALWAYS_INLINE JSValue* JSValue::toJSNumber(ExecState* exec) const
167 {
168 return JSImmediate::isNumber(this) ? const_cast<JSValue*>(this) : jsNumber(exec, this->toNumber(exec));
169 }
170
171} // namespace KJS
172
173#endif // JSNumberCell_h
Note: See TracBrowser for help on using the repository browser.