diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2010-10-18 17:13:30 -0700 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2010-10-18 17:13:30 -0700 |
commit | 1b2f6f9e29bf7137e177b8d9b600fe558d36f512 (patch) | |
tree | c67553632967b08349b9b5e83a897d189dafd8f2 /deps/v8/src/v8natives.js | |
parent | 5d400cfd3a2a9faf27a88bf82f33a57f78fa65af (diff) | |
download | node-new-1b2f6f9e29bf7137e177b8d9b600fe558d36f512.tar.gz |
Upgrade V8 to 2.5.0
Diffstat (limited to 'deps/v8/src/v8natives.js')
-rw-r--r-- | deps/v8/src/v8natives.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/deps/v8/src/v8natives.js b/deps/v8/src/v8natives.js index ca1c99d4c1..88aea9c173 100644 --- a/deps/v8/src/v8natives.js +++ b/deps/v8/src/v8natives.js @@ -547,11 +547,11 @@ function DefineOwnProperty(obj, p, desc, should_throw) { if (!IS_UNDEFINED(current) && !current.isConfigurable()) { // Step 5 and 6 - if ((!desc.hasEnumerable() || + if ((!desc.hasEnumerable() || SameValue(desc.isEnumerable() && current.isEnumerable())) && - (!desc.hasConfigurable() || + (!desc.hasConfigurable() || SameValue(desc.isConfigurable(), current.isConfigurable())) && - (!desc.hasWritable() || + (!desc.hasWritable() || SameValue(desc.isWritable(), current.isWritable())) && (!desc.hasValue() || SameValue(desc.getValue(), current.getValue())) && @@ -755,7 +755,7 @@ function ObjectSeal(obj) { var desc = GetOwnProperty(obj, name); if (desc.isConfigurable()) desc.setConfigurable(false); DefineOwnProperty(obj, name, desc, true); - } + } return ObjectPreventExtension(obj); } @@ -772,7 +772,7 @@ function ObjectFreeze(obj) { if (IsDataDescriptor(desc)) desc.setWritable(false); if (desc.isConfigurable()) desc.setConfigurable(false); DefineOwnProperty(obj, name, desc, true); - } + } return ObjectPreventExtension(obj); } @@ -1118,12 +1118,12 @@ function FunctionBind(this_arg) { // Length is 1. var bound_args = new $Array(argc_bound); for(var i = 0; i < argc_bound; i++) { bound_args[i] = %_Arguments(i+1); - } + } } var fn = this; var result = function() { // Combine the args we got from the bind call with the args - // given as argument to the invocation. + // given as argument to the invocation. var argc = %_ArgumentsLength(); var args = new $Array(argc + argc_bound); // Add bound arguments. @@ -1132,7 +1132,7 @@ function FunctionBind(this_arg) { // Length is 1. } // Add arguments from call. for (var i = 0; i < argc; i++) { - args[argc_bound + i] = %_Arguments(i); + args[argc_bound + i] = %_Arguments(i); } // If this is a construct call we use a special runtime method // to generate the actual object using the bound function. @@ -1147,7 +1147,7 @@ function FunctionBind(this_arg) { // Length is 1. // try to redefine these as defined by the spec. The spec says // that bind should make these throw a TypeError if get or set // is called and make them non-enumerable and non-configurable. - // To be consistent with our normal functions we leave this as it is. + // To be consistent with our normal functions we leave this as it is. // Set the correct length. var length = (this.length - argc_bound) > 0 ? this.length - argc_bound : 0; |