Changeset 43131 in webkit for trunk/JavaScriptCore/runtime/JSValue.h

Timestamp:

May 1, 2009, 5:48:40 PM (16 years ago)

Author:

[email protected]

Message:

2009-05-01 Sam Weinig <​[email protected]>

Reviewed by Geoffrey "Too Far!" Garen.

Move JS number construction into JSValue.

• runtime/JSImmediate.h:
• runtime/JSNumberCell.h: (JSC::JSValue::JSValue):
• runtime/JSValue.h: (JSC::jsNumber):

File:

• trunk/JavaScriptCore/runtime/JSValue.h (modified) (4 diffs)

trunk/JavaScriptCore/runtime/JSValue.h

@@ -29 +29 @@
 #include "CallData.h"
 #include "ConstructData.h"
+#include <wtf/AlwaysInline.h>
 
 namespace JSC {
@@ -34 +35 @@
     class Identifier;
     class JSCell;
+    class JSGlobalData;
     class JSImmediate;
     class JSObject;
@@ -79 +81 @@
         JSValue(JSCell* ptr);
         JSValue(const JSCell* ptr);
+
+        // Numbers
+        JSValue(ExecState*, double);
+        JSValue(ExecState*, int);
+        JSValue(ExecState*, unsigned);
+        JSValue(ExecState*, long);
+        JSValue(ExecState*, unsigned long);
+        JSValue(ExecState*, long long);
+        JSValue(ExecState*, unsigned long long);
+        JSValue(JSGlobalData*, double);
+        JSValue(JSGlobalData*, int);
+        JSValue(JSGlobalData*, unsigned);
+        JSValue(JSGlobalData*, long);
+        JSValue(JSGlobalData*, unsigned long);
+        JSValue(JSGlobalData*, long long);
+        JSValue(JSGlobalData*, unsigned long long);
 
         operator bool() const;
@@ -218 +236 @@
     }
 
+    ALWAYS_INLINE JSValue jsNumber(ExecState* exec, double d)
+    {
+        return JSValue(exec, d);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(ExecState* exec, int i)
+    {
+        return JSValue(exec, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(ExecState* exec, unsigned i)
+    {
+        return JSValue(exec, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(ExecState* exec, long i)
+    {
+        return JSValue(exec, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(ExecState* exec, unsigned long i)
+    {
+        return JSValue(exec, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(ExecState* exec, long long i)
+    {
+        return JSValue(exec, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(ExecState* exec, unsigned long long i)
+    {
+        return JSValue(exec, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(JSGlobalData* globalData, double d)
+    {
+        return JSValue(globalData, d);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(JSGlobalData* globalData, int i)
+    {
+        return JSValue(globalData, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(JSGlobalData* globalData, unsigned i)
+    {
+        return JSValue(globalData, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(JSGlobalData* globalData, long i)
+    {
+        return JSValue(globalData, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(JSGlobalData* globalData, unsigned long i)
+    {
+        return JSValue(globalData, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(JSGlobalData* globalData, long long i)
+    {
+        return JSValue(globalData, i);
+    }
+
+    ALWAYS_INLINE JSValue jsNumber(JSGlobalData* globalData, unsigned long long i)
+    {
+        return JSValue(globalData, i);
+    }
+
     inline bool operator==(const JSValue a, const JSCell* b) { return a == JSValue(b); }
     inline bool operator==(const JSCell* a, const JSValue b) { return JSValue(a) == b; }