Ignore:
Timestamp:
Oct 24, 2008, 9:22:51 AM (17 years ago)
Author:
Darin Adler
Message:

JavaScriptCore:

2008-10-24 Darin Adler <Darin Adler>

  • API/APICast.h:
  • API/JSCallbackConstructor.h:
  • API/JSCallbackFunction.cpp:
  • API/JSCallbackFunction.h:
  • API/JSCallbackObject.h:
  • API/JSCallbackObjectFunctions.h:
  • API/JSContextRef.cpp:
  • API/JSObjectRef.cpp:
  • API/JSValueRef.cpp:
  • VM/CTI.cpp:
  • VM/CTI.h:
  • VM/CodeBlock.cpp:
  • VM/CodeBlock.h:
  • VM/CodeGenerator.cpp:
  • VM/CodeGenerator.h:
  • VM/ExceptionHelpers.cpp:
  • VM/ExceptionHelpers.h:
  • VM/JSPropertyNameIterator.cpp:
  • VM/JSPropertyNameIterator.h:
  • VM/Machine.cpp:
  • VM/Machine.h:
  • VM/Register.h:
  • kjs/ArgList.cpp:
  • kjs/ArgList.h:
  • kjs/Arguments.cpp:
  • kjs/Arguments.h:
  • kjs/ArrayConstructor.cpp:
  • kjs/ArrayPrototype.cpp:
  • kjs/BooleanConstructor.cpp:
  • kjs/BooleanConstructor.h:
  • kjs/BooleanObject.h:
  • kjs/BooleanPrototype.cpp:
  • kjs/CallData.cpp:
  • kjs/CallData.h:
  • kjs/ConstructData.cpp:
  • kjs/ConstructData.h:
  • kjs/DateConstructor.cpp:
  • kjs/DateInstance.h:
  • kjs/DatePrototype.cpp:
  • kjs/DatePrototype.h:
  • kjs/DebuggerCallFrame.cpp:
  • kjs/DebuggerCallFrame.h:
  • kjs/ErrorConstructor.cpp:
  • kjs/ErrorPrototype.cpp:
  • kjs/ExecState.cpp:
  • kjs/ExecState.h:
  • kjs/FunctionConstructor.cpp:
  • kjs/FunctionPrototype.cpp:
  • kjs/FunctionPrototype.h:
  • kjs/GetterSetter.cpp:
  • kjs/GetterSetter.h:
  • kjs/InternalFunction.h:
  • kjs/JSActivation.cpp:
  • kjs/JSActivation.h:
  • kjs/JSArray.cpp:
  • kjs/JSArray.h:
  • kjs/JSCell.cpp:
  • kjs/JSCell.h:
  • kjs/JSFunction.cpp:
  • kjs/JSFunction.h:
  • kjs/JSGlobalData.h:
  • kjs/JSGlobalObject.cpp:
  • kjs/JSGlobalObject.h:
  • kjs/JSGlobalObjectFunctions.cpp:
  • kjs/JSGlobalObjectFunctions.h:
  • kjs/JSImmediate.cpp:
  • kjs/JSImmediate.h:
  • kjs/JSNotAnObject.cpp:
  • kjs/JSNotAnObject.h:
  • kjs/JSNumberCell.cpp:
  • kjs/JSNumberCell.h:
  • kjs/JSObject.cpp:
  • kjs/JSObject.h:
  • kjs/JSStaticScopeObject.cpp:
  • kjs/JSStaticScopeObject.h:
  • kjs/JSString.cpp:
  • kjs/JSString.h:
  • kjs/JSValue.h:
  • kjs/JSVariableObject.h:
  • kjs/JSWrapperObject.h:
  • kjs/MathObject.cpp:
  • kjs/MathObject.h:
  • kjs/NativeErrorConstructor.cpp:
  • kjs/NumberConstructor.cpp:
  • kjs/NumberConstructor.h:
  • kjs/NumberObject.cpp:
  • kjs/NumberObject.h:
  • kjs/NumberPrototype.cpp:
  • kjs/ObjectConstructor.cpp:
  • kjs/ObjectPrototype.cpp:
  • kjs/ObjectPrototype.h:
  • kjs/PropertyMap.h:
  • kjs/PropertySlot.cpp:
  • kjs/PropertySlot.h:
  • kjs/RegExpConstructor.cpp:
  • kjs/RegExpConstructor.h:
  • kjs/RegExpMatchesArray.h:
  • kjs/RegExpObject.cpp:
  • kjs/RegExpObject.h:
  • kjs/RegExpPrototype.cpp:
  • kjs/Shell.cpp:
  • kjs/StringConstructor.cpp:
  • kjs/StringObject.cpp:
  • kjs/StringObject.h:
  • kjs/StringObjectThatMasqueradesAsUndefined.h:
  • kjs/StringPrototype.cpp:
  • kjs/StructureID.cpp:
  • kjs/StructureID.h:
  • kjs/collector.cpp:
  • kjs/collector.h:
  • kjs/completion.h:
  • kjs/grammar.y:
  • kjs/interpreter.cpp:
  • kjs/interpreter.h:
  • kjs/lookup.cpp:
  • kjs/lookup.h:
  • kjs/nodes.h:
  • kjs/operations.cpp:
  • kjs/operations.h:
  • kjs/protect.h:
  • profiler/ProfileGenerator.cpp:
  • profiler/Profiler.cpp:
  • profiler/Profiler.h: Use JSValue* instead of JSValuePtr.

JavaScriptGlue:

2008-10-24 Darin Adler <Darin Adler>

  • JSObject.cpp: (nativeCallFunction):
  • JSUtils.cpp: (KJSValueToJSObject): (JSObjectKJSValue): (KJSValueToCFTypeInternal): (KJSValueToCFType):
  • JSUtils.h:
  • JSValueWrapper.cpp: (JSValueWrapper::JSValueWrapper): (JSValueWrapper::GetValue): (JSValueWrapper::JSObjectCopyProperty): (JSValueWrapper::JSObjectSetProperty): (JSValueWrapper::JSObjectCallFunction):
  • JSValueWrapper.h:
  • UserObjectImp.cpp: (UserObjectImp::callAsFunction): (UserObjectImp::userObjectGetter): (UserObjectImp::getOwnPropertySlot): (UserObjectImp::put): (UserObjectImp::toPrimitive):
  • UserObjectImp.h: (UserObjectImp::createStructureID): Use JSValue* instead of JSValuePtr.

WebCore:

2008-10-24 Darin Adler <Darin Adler>

  • bindings/js/JSAttrCustom.cpp:
  • bindings/js/JSCSSRuleCustom.cpp:
  • bindings/js/JSCSSStyleDeclarationCustom.cpp:
  • bindings/js/JSCSSValueCustom.cpp:
  • bindings/js/JSCanvasPixelArrayCustom.h:
  • bindings/js/JSCanvasRenderingContext2DCustom.cpp:
  • bindings/js/JSClipboardCustom.cpp:
  • bindings/js/JSConsoleCustom.cpp:
  • bindings/js/JSCustomSQLStatementCallback.cpp:
  • bindings/js/JSCustomSQLStatementErrorCallback.cpp:
  • bindings/js/JSCustomSQLTransactionCallback.cpp:
  • bindings/js/JSCustomSQLTransactionErrorCallback.cpp:
  • bindings/js/JSCustomVoidCallback.cpp:
  • bindings/js/JSCustomVoidCallback.h:
  • bindings/js/JSCustomXPathNSResolver.cpp:
  • bindings/js/JSCustomXPathNSResolver.h:
  • bindings/js/JSDOMApplicationCacheCustom.cpp:
  • bindings/js/JSDOMBinding.cpp:
  • bindings/js/JSDOMBinding.h:
  • bindings/js/JSDOMWindowBase.cpp:
  • bindings/js/JSDOMWindowBase.h:
  • bindings/js/JSDOMWindowCustom.cpp:
  • bindings/js/JSDOMWindowCustom.h:
  • bindings/js/JSDOMWindowShell.cpp:
  • bindings/js/JSDOMWindowShell.h:
  • bindings/js/JSDatabaseCustom.cpp:
  • bindings/js/JSDedicatedWorkerCustom.cpp:
  • bindings/js/JSDocumentCustom.cpp:
  • bindings/js/JSElementCustom.cpp:
  • bindings/js/JSEventCustom.cpp:
  • bindings/js/JSEventListener.cpp:
  • bindings/js/JSEventTarget.cpp:
  • bindings/js/JSEventTarget.h:
  • bindings/js/JSEventTargetBase.h:
  • bindings/js/JSEventTargetNodeCustom.cpp:
  • bindings/js/JSHTMLAllCollection.h:
  • bindings/js/JSHTMLAppletElementCustom.cpp:
  • bindings/js/JSHTMLCollectionCustom.cpp:
  • bindings/js/JSHTMLDocumentCustom.cpp:
  • bindings/js/JSHTMLEmbedElementCustom.cpp:
  • bindings/js/JSHTMLFormElementCustom.cpp:
  • bindings/js/JSHTMLFrameElementCustom.cpp:
  • bindings/js/JSHTMLFrameSetElementCustom.cpp:
  • bindings/js/JSHTMLIFrameElementCustom.cpp:
  • bindings/js/JSHTMLInputElementCustom.cpp:
  • bindings/js/JSHTMLObjectElementCustom.cpp:
  • bindings/js/JSHTMLOptionsCollectionCustom.cpp:
  • bindings/js/JSHTMLSelectElementCustom.cpp:
  • bindings/js/JSHTMLSelectElementCustom.h:
  • bindings/js/JSHistoryCustom.cpp:
  • bindings/js/JSImageDataCustom.cpp:
  • bindings/js/JSInspectedObjectWrapper.cpp:
  • bindings/js/JSInspectedObjectWrapper.h:
  • bindings/js/JSInspectorCallbackWrapper.cpp:
  • bindings/js/JSInspectorCallbackWrapper.h:
  • bindings/js/JSJavaScriptCallFrameCustom.cpp:
  • bindings/js/JSLocationCustom.cpp:
  • bindings/js/JSMessagePortCustom.cpp:
  • bindings/js/JSMimeTypeArrayCustom.cpp:
  • bindings/js/JSNamedNodeMapCustom.cpp:
  • bindings/js/JSNamedNodesCollection.cpp:
  • bindings/js/JSNamedNodesCollection.h:
  • bindings/js/JSNavigatorCustom.cpp:
  • bindings/js/JSNodeCustom.cpp:
  • bindings/js/JSNodeFilterCondition.cpp:
  • bindings/js/JSNodeFilterCondition.h:
  • bindings/js/JSNodeFilterCustom.cpp:
  • bindings/js/JSNodeIteratorCustom.cpp:
  • bindings/js/JSNodeListCustom.cpp:
  • bindings/js/JSPluginArrayCustom.cpp:
  • bindings/js/JSPluginCustom.cpp:
  • bindings/js/JSPluginElementFunctions.cpp:
  • bindings/js/JSPluginElementFunctions.h:
  • bindings/js/JSQuarantinedObjectWrapper.cpp:
  • bindings/js/JSQuarantinedObjectWrapper.h:
  • bindings/js/JSRGBColor.cpp:
  • bindings/js/JSRGBColor.h:
  • bindings/js/JSSQLResultSetRowListCustom.cpp:
  • bindings/js/JSSQLTransactionCustom.cpp:
  • bindings/js/JSSVGElementInstanceCustom.cpp:
  • bindings/js/JSSVGLengthCustom.cpp:
  • bindings/js/JSSVGMatrixCustom.cpp:
  • bindings/js/JSSVGPathSegCustom.cpp:
  • bindings/js/JSSVGPathSegListCustom.cpp:
  • bindings/js/JSSVGPointListCustom.cpp:
  • bindings/js/JSSVGTransformListCustom.cpp:
  • bindings/js/JSStorageCustom.cpp:
  • bindings/js/JSStyleSheetCustom.cpp:
  • bindings/js/JSStyleSheetListCustom.cpp:
  • bindings/js/JSTextCustom.cpp:
  • bindings/js/JSTreeWalkerCustom.cpp:
  • bindings/js/JSXMLHttpRequestCustom.cpp:
  • bindings/js/JSXMLHttpRequestUploadCustom.cpp:
  • bindings/js/JSXSLTProcessorCustom.cpp:
  • bindings/js/ScheduledAction.cpp:
  • bindings/js/ScheduledAction.h:
  • bindings/js/ScriptController.cpp:
  • bindings/js/ScriptController.h:
  • bindings/objc/WebScriptObject.mm:
  • bindings/objc/WebScriptObjectPrivate.h:
  • bindings/scripts/CodeGeneratorJS.pm:
  • bridge/NP_jsobject.cpp:
  • bridge/c/c_instance.cpp:
  • bridge/c/c_instance.h:
  • bridge/c/c_runtime.cpp:
  • bridge/c/c_runtime.h:
  • bridge/c/c_utility.cpp:
  • bridge/c/c_utility.h:
  • bridge/jni/jni_instance.cpp:
  • bridge/jni/jni_instance.h:
  • bridge/jni/jni_jsobject.h:
  • bridge/jni/jni_jsobject.mm:
  • bridge/jni/jni_objc.mm:
  • bridge/jni/jni_runtime.cpp:
  • bridge/jni/jni_runtime.h:
  • bridge/jni/jni_utility.cpp:
  • bridge/jni/jni_utility.h:
  • bridge/objc/WebScriptObject.h:
  • bridge/objc/objc_class.h:
  • bridge/objc/objc_class.mm:
  • bridge/objc/objc_instance.h:
  • bridge/objc/objc_instance.mm:
  • bridge/objc/objc_runtime.h:
  • bridge/objc/objc_runtime.mm:
  • bridge/objc/objc_utility.h:
  • bridge/objc/objc_utility.mm:
  • bridge/qt/qt_class.cpp:
  • bridge/qt/qt_class.h:
  • bridge/qt/qt_instance.cpp:
  • bridge/qt/qt_instance.h:
  • bridge/qt/qt_runtime.cpp:
  • bridge/qt/qt_runtime.h:
  • bridge/runtime.cpp:
  • bridge/runtime.h:
  • bridge/runtime_array.cpp:
  • bridge/runtime_array.h:
  • bridge/runtime_method.cpp:
  • bridge/runtime_method.h:
  • bridge/runtime_object.cpp:
  • bridge/runtime_object.h:
  • bridge/testqtbindings.cpp:
  • inspector/JavaScriptCallFrame.cpp:
  • inspector/JavaScriptCallFrame.h:
  • inspector/JavaScriptProfile.cpp:
  • inspector/JavaScriptProfile.h:
  • inspector/JavaScriptProfileNode.cpp:
  • inspector/JavaScriptProfileNode.h:
  • loader/FrameLoader.cpp:
  • loader/FrameLoader.h:
  • page/Console.cpp:
  • page/Console.h:
  • plugins/MimeTypeArray.h:
  • plugins/Plugin.h:
  • plugins/PluginArray.h:
  • plugins/PluginView.cpp:
  • xml/XMLHttpRequest.cpp: Use JSValue* instead of JSValuePtr.

WebKit/mac:

2008-10-24 Darin Adler <Darin Adler>

  • WebView/WebFrame.mm: (-[WebFrame _stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
  • WebView/WebScriptDebugDelegate.mm: (-[WebScriptCallFrame _convertValueToObjcValue:]): (-[WebScriptCallFrame exception]): (-[WebScriptCallFrame evaluateWebScript:]):
  • WebView/WebView.mm: (aeDescFromJSValue): (-[WebView aeDescByEvaluatingJavaScriptFromString:]): Use JSValue* instead of JSValuePtr.

WebKit/qt:

2008-10-24 Darin Adler <Darin Adler>

  • Api/qwebframe.cpp: (QWebFrame::evaluateJavaScript): Use JSValue* instead of JSValuePtr.

WebKit/win:

2008-10-24 Darin Adler <Darin Adler>

  • WebScriptCallFrame.cpp: (WebScriptCallFrame::jsValueToString): (WebScriptCallFrame::stringByEvaluatingJavaScriptFromString): (WebScriptCallFrame::valueForVariable): (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):
  • WebScriptCallFrame.h:
  • WebView.cpp: (WebView::stringByEvaluatingJavaScriptFromString): Use JSValue* instead of JSValuePtr.

WebKit/wx:

2008-10-24 Darin Adler <Darin Adler>

  • WebFrame.cpp: (wxWebFrame::RunScript): Use JSValue* instead of JSValuePtr.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/JSNumberCell.h

    r37706 r37845  
    4444    class JSNumberCell : public JSCell {
    4545        friend class CTI;
    46         friend JSValuePtr jsNumberCell(JSGlobalData*, double);
    47         friend JSValuePtr jsNaN(JSGlobalData*);
    48         friend JSValuePtr jsNumberCell(ExecState*, double);
    49         friend JSValuePtr jsNaN(ExecState*);
     46        friend JSValue* jsNumberCell(JSGlobalData*, double);
     47        friend JSValue* jsNaN(JSGlobalData*);
     48        friend JSValue* jsNumberCell(ExecState*, double);
     49        friend JSValue* jsNaN(ExecState*);
    5050    public:
    5151        double value() const { return m_value; }
    5252
    53         virtual JSValuePtr toPrimitive(ExecState*, PreferredPrimitiveType) const;
    54         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValuePtr& value);
     53        virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType) const;
     54        virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
    5555        virtual bool toBoolean(ExecState*) const;
    5656        virtual double toNumber(ExecState*) const;
    … …  
    6060        virtual UString toThisString(ExecState*) const;
    6161        virtual JSObject* toThisObject(ExecState*) const;
    62         virtual JSValuePtr getJSNumber();
     62        virtual JSValue* getJSNumber();
    6363
    6464        int32_t toInt32() const;
    … …  
    8383        }
    8484
    85         static PassRefPtr<StructureID> createStructureID(JSValuePtr proto) { return StructureID::create(proto, TypeInfo(NumberType, NeedsThisConversion)); }
     85        static PassRefPtr<StructureID> createStructureID(JSValue* proto) { return StructureID::create(proto, TypeInfo(NumberType, NeedsThisConversion)); }
    8686
    8787    private:
    … …  
    108108    extern const double Inf;
    109109
    110     JSNumberCell* asNumberCell(JSValuePtr);
    111 
    112     JSValuePtr jsNumberCell(JSGlobalData*, double);
    113     JSValuePtr jsNaN(JSGlobalData*);
    114     JSValuePtr jsNumberCell(ExecState*, double);
    115     JSValuePtr jsNaN(ExecState*);
    116 
    117     inline JSNumberCell* asNumberCell(JSValuePtr value)
     110    JSNumberCell* asNumberCell(JSValue*);
     111
     112    JSValue* jsNumberCell(JSGlobalData*, double);
     113    JSValue* jsNaN(JSGlobalData*);
     114    JSValue* jsNumberCell(ExecState*, double);
     115    JSValue* jsNaN(ExecState*);
     116
     117    inline JSNumberCell* asNumberCell(JSValue* value)
    118118    {
    119119        ASSERT(asCell(value)->isNumber());
    … …  
    121121    }
    122122
    123     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, double d)
    124     {
    125         JSValuePtr v = JSImmediate::from(d);
     123    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, double d)
     124    {
     125        JSValue* v = JSImmediate::from(d);
    126126        return v ? v : jsNumberCell(exec, d);
    127127    }
    128128
    129     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, short i)
    130     {
    131         JSValuePtr v = JSImmediate::from(i);
    132         return v ? v : jsNumberCell(exec, i);
    133     }
    134 
    135     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, unsigned short i)
    136     {
    137         JSValuePtr v = JSImmediate::from(i);
    138         return v ? v : jsNumberCell(exec, i);
    139     }
    140 
    141     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, int i)
    142     {
    143         JSValuePtr v = JSImmediate::from(i);
    144         return v ? v : jsNumberCell(exec, i);
    145     }
    146 
    147     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, unsigned i)
    148     {
    149         JSValuePtr v = JSImmediate::from(i);
    150         return v ? v : jsNumberCell(exec, i);
    151     }
    152 
    153     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, long i)
    154     {
    155         JSValuePtr v = JSImmediate::from(i);
    156         return v ? v : jsNumberCell(exec, i);
    157     }
    158 
    159     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, unsigned long i)
    160     {
    161         JSValuePtr v = JSImmediate::from(i);
    162         return v ? v : jsNumberCell(exec, i);
    163     }
    164 
    165     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, long long i)
    166     {
    167         JSValuePtr v = JSImmediate::from(i);
     129    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, short i)
     130    {
     131        JSValue* v = JSImmediate::from(i);
     132        return v ? v : jsNumberCell(exec, i);
     133    }
     134
     135    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, unsigned short i)
     136    {
     137        JSValue* v = JSImmediate::from(i);
     138        return v ? v : jsNumberCell(exec, i);
     139    }
     140
     141    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, int i)
     142    {
     143        JSValue* v = JSImmediate::from(i);
     144        return v ? v : jsNumberCell(exec, i);
     145    }
     146
     147    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, unsigned i)
     148    {
     149        JSValue* v = JSImmediate::from(i);
     150        return v ? v : jsNumberCell(exec, i);
     151    }
     152
     153    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, long i)
     154    {
     155        JSValue* v = JSImmediate::from(i);
     156        return v ? v : jsNumberCell(exec, i);
     157    }
     158
     159    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, unsigned long i)
     160    {
     161        JSValue* v = JSImmediate::from(i);
     162        return v ? v : jsNumberCell(exec, i);
     163    }
     164
     165    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, long long i)
     166    {
     167        JSValue* v = JSImmediate::from(i);
    168168        return v ? v : jsNumberCell(exec, static_cast<double>(i));
    169169    }
    170170
    171     ALWAYS_INLINE JSValuePtr jsNumber(ExecState* exec, unsigned long long i)
    172     {
    173         JSValuePtr v = JSImmediate::from(i);
     171    ALWAYS_INLINE JSValue* jsNumber(ExecState* exec, unsigned long long i)
     172    {
     173        JSValue* v = JSImmediate::from(i);
    174174        return v ? v : jsNumberCell(exec, static_cast<double>(i));
    175175    }
    176176
    177     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, double d)
    178     {
    179         JSValuePtr v = JSImmediate::from(d);
     177    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, double d)
     178    {
     179        JSValue* v = JSImmediate::from(d);
    180180        return v ? v : jsNumberCell(globalData, d);
    181181    }
    182182
    183     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, short i)
    184     {
    185         JSValuePtr v = JSImmediate::from(i);
    186         return v ? v : jsNumberCell(globalData, i);
    187     }
    188 
    189     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, unsigned short i)
    190     {
    191         JSValuePtr v = JSImmediate::from(i);
    192         return v ? v : jsNumberCell(globalData, i);
    193     }
    194 
    195     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, int i)
    196     {
    197         JSValuePtr v = JSImmediate::from(i);
    198         return v ? v : jsNumberCell(globalData, i);
    199     }
    200 
    201     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, unsigned i)
    202     {
    203         JSValuePtr v = JSImmediate::from(i);
    204         return v ? v : jsNumberCell(globalData, i);
    205     }
    206 
    207     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, long i)
    208     {
    209         JSValuePtr v = JSImmediate::from(i);
    210         return v ? v : jsNumberCell(globalData, i);
    211     }
    212 
    213     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, unsigned long i)
    214     {
    215         JSValuePtr v = JSImmediate::from(i);
    216         return v ? v : jsNumberCell(globalData, i);
    217     }
    218 
    219     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, long long i)
    220     {
    221         JSValuePtr v = JSImmediate::from(i);
     183    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, short i)
     184    {
     185        JSValue* v = JSImmediate::from(i);
     186        return v ? v : jsNumberCell(globalData, i);
     187    }
     188
     189    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, unsigned short i)
     190    {
     191        JSValue* v = JSImmediate::from(i);
     192        return v ? v : jsNumberCell(globalData, i);
     193    }
     194
     195    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, int i)
     196    {
     197        JSValue* v = JSImmediate::from(i);
     198        return v ? v : jsNumberCell(globalData, i);
     199    }
     200
     201    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, unsigned i)
     202    {
     203        JSValue* v = JSImmediate::from(i);
     204        return v ? v : jsNumberCell(globalData, i);
     205    }
     206
     207    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, long i)
     208    {
     209        JSValue* v = JSImmediate::from(i);
     210        return v ? v : jsNumberCell(globalData, i);
     211    }
     212
     213    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, unsigned long i)
     214    {
     215        JSValue* v = JSImmediate::from(i);
     216        return v ? v : jsNumberCell(globalData, i);
     217    }
     218
     219    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, long long i)
     220    {
     221        JSValue* v = JSImmediate::from(i);
    222222        return v ? v : jsNumberCell(globalData, static_cast<double>(i));
    223223    }
    224224
    225     ALWAYS_INLINE JSValuePtr jsNumber(JSGlobalData* globalData, unsigned long long i)
    226     {
    227         JSValuePtr v = JSImmediate::from(i);
     225    ALWAYS_INLINE JSValue* jsNumber(JSGlobalData* globalData, unsigned long long i)
     226    {
     227        JSValue* v = JSImmediate::from(i);
    228228        return v ? v : jsNumberCell(globalData, static_cast<double>(i));
    229229    }
    … …  
    253253    }
    254254
    255     ALWAYS_INLINE JSValuePtr JSValue::toJSNumber(ExecState* exec) const
     255    ALWAYS_INLINE JSValue* JSValue::toJSNumber(ExecState* exec) const
    256256    {
    257257        return JSImmediate::isNumber(asValue()) ? asValue() : jsNumber(exec, this->toNumber(exec));
Note: See TracChangeset for help on using the changeset viewer.