Changeset 11525 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp
- Timestamp:
- Dec 10, 2005, 4:38:07 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/kjs/array_object.cpp
r11519 r11525 77 77 ValueImp *ArrayInstanceImp::lengthGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot) 78 78 { 79 return Number(static_cast<ArrayInstanceImp *>(slot.slotBase())->length);79 return jsNumber(static_cast<ArrayInstanceImp *>(slot.slotBase())->length); 80 80 } 81 81 … … 292 292 , globalObject(e->dynamicInterpreter()->globalObject()) 293 293 { 294 arguments.append( Undefined());295 arguments.append( Undefined());294 arguments.append(jsUndefined()); 295 arguments.append(jsUndefined()); 296 296 } 297 297 … … 401 401 : ArrayInstanceImp(objProto, 0) 402 402 { 403 setInternalValue( Null());403 setInternalValue(jsNull()); 404 404 } 405 405 … … 416 416 ), id(i) 417 417 { 418 put(exec,lengthPropertyName, Number(len),DontDelete|ReadOnly|DontEnum);418 put(exec,lengthPropertyName,jsNumber(len),DontDelete|ReadOnly|DontEnum); 419 419 } 420 420 … … 495 495 } 496 496 visitedElems.remove(thisObj); 497 result = String(str);497 result = jsString(str); 498 498 break; 499 499 } … … 526 526 curObj = static_cast<ObjectImp *>(it++); // may be 0 527 527 } 528 arr->put(exec,lengthPropertyName, Number(n), DontEnum | DontDelete);528 arr->put(exec,lengthPropertyName, jsNumber(n), DontEnum | DontDelete); 529 529 530 530 result = arr; … … 533 533 case Pop:{ 534 534 if (length == 0) { 535 thisObj->put(exec, lengthPropertyName, Number(length), DontEnum | DontDelete);536 result = Undefined();535 thisObj->put(exec, lengthPropertyName, jsNumber(length), DontEnum | DontDelete); 536 result = jsUndefined(); 537 537 } else { 538 538 result = thisObj->get(exec, length - 1); 539 thisObj->put(exec, lengthPropertyName, Number(length - 1), DontEnum | DontDelete);539 thisObj->put(exec, lengthPropertyName, jsNumber(length - 1), DontEnum | DontDelete); 540 540 } 541 541 break; … … 545 545 thisObj->put(exec, length + n, args[n]); 546 546 length += args.size(); 547 thisObj->put(exec,lengthPropertyName, Number(length), DontEnum | DontDelete);548 result = Number(length);547 thisObj->put(exec,lengthPropertyName, jsNumber(length), DontEnum | DontDelete); 548 result = jsNumber(length); 549 549 break; 550 550 } … … 573 573 case Shift: { 574 574 if (length == 0) { 575 thisObj->put(exec, lengthPropertyName, Number(length), DontEnum | DontDelete);576 result = Undefined();575 thisObj->put(exec, lengthPropertyName, jsNumber(length), DontEnum | DontDelete); 576 result = jsUndefined(); 577 577 } else { 578 578 result = thisObj->get(exec, 0); … … 584 584 } 585 585 thisObj->deleteProperty(exec, length - 1); 586 thisObj->put(exec, lengthPropertyName, Number(length - 1), DontEnum | DontDelete);586 thisObj->put(exec, lengthPropertyName, jsNumber(length - 1), DontEnum | DontDelete); 587 587 } 588 588 break; … … 627 627 resObj->put(exec, n, v); 628 628 } 629 resObj->put(exec, lengthPropertyName, Number(n), DontEnum | DontDelete);629 resObj->put(exec, lengthPropertyName, jsNumber(n), DontEnum | DontDelete); 630 630 break; 631 631 } … … 654 654 655 655 if (length == 0) { 656 thisObj->put(exec, lengthPropertyName, Number(0), DontEnum | DontDelete);656 thisObj->put(exec, lengthPropertyName, jsNumber(0), DontEnum | DontDelete); 657 657 result = thisObj; 658 658 break; … … 720 720 resObj->put(exec, k, v); 721 721 } 722 resObj->put(exec, lengthPropertyName, Number(deleteCount), DontEnum | DontDelete);722 resObj->put(exec, lengthPropertyName, jsNumber(deleteCount), DontEnum | DontDelete); 723 723 724 724 unsigned int additionalArgs = maxInt( args.size() - 2, 0 ); … … 752 752 thisObj->put(exec, k+begin, args[k+2]); 753 753 } 754 thisObj->put(exec, lengthPropertyName, Number(length - deleteCount + additionalArgs), DontEnum | DontDelete);754 thisObj->put(exec, lengthPropertyName, jsNumber(length - deleteCount + additionalArgs), DontEnum | DontDelete); 755 755 break; 756 756 } … … 766 766 for ( unsigned int k = 0; k < nrArgs; ++k ) 767 767 thisObj->put(exec, k, args[k]); 768 result = Number(length + nrArgs);768 result = jsNumber(length + nrArgs); 769 769 thisObj->put(exec, lengthPropertyName, result, DontEnum | DontDelete); 770 770 break; … … 786 786 787 787 if (id == Some || id == Every) 788 result = Boolean(id == Every);788 result = jsBoolean(id == Every); 789 789 else 790 790 result = thisObj; … … 795 795 796 796 eachArguments.append(thisObj->get(exec, k)); 797 eachArguments.append( Number(k));797 eachArguments.append(jsNumber(k)); 798 798 eachArguments.append(thisObj); 799 799 … … 801 801 802 802 if (id == Every && !predicateResult) { 803 result = Boolean(false);803 result = jsBoolean(false); 804 804 break; 805 805 } 806 806 if (id == Some && predicateResult) { 807 result = Boolean(true);807 result = jsBoolean(true); 808 808 break; 809 809 } … … 828 828 { 829 829 // ECMA 15.4.3.1 Array.prototype 830 put(exec, prototypePropertyName, arrayProto, DontEnum|DontDelete|ReadOnly);830 put(exec, prototypePropertyName, arrayProto, DontEnum|DontDelete|ReadOnly); 831 831 832 832 // no. of arguments for constructor 833 put(exec, lengthPropertyName,Number(1), ReadOnly|DontDelete|DontEnum);833 put(exec, lengthPropertyName, jsNumber(1), ReadOnly|DontDelete|DontEnum); 834 834 } 835 835
Note:
See TracChangeset
for help on using the changeset viewer.