| OLD | NEW |
| 1 // Copyright 2014 the V8 project authors. All rights reserved. | 1 // Copyright 2014 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 // | 4 // |
| 5 | 5 |
| 6 (function(global, utils) { | 6 (function(global, utils) { |
| 7 | 7 |
| 8 "use strict"; | 8 "use strict"; |
| 9 | 9 |
| 10 %CheckIsBootstrapping(); | 10 %CheckIsBootstrapping(); |
| 11 | 11 |
| 12 // ------------------------------------------------------------------- | |
| 13 // Imports | |
| 14 | |
| 15 var GlobalObject = global.Object; | 12 var GlobalObject = global.Object; |
| 16 | 13 |
| 17 var OwnPropertyKeys; | |
| 18 | |
| 19 utils.Import(function(from) { | |
| 20 OwnPropertyKeys = from.OwnPropertyKeys; | |
| 21 }); | |
| 22 | |
| 23 // ------------------------------------------------------------------- | |
| 24 | |
| 25 // ES6, draft 04-03-15, section 19.1.2.1 | 14 // ES6, draft 04-03-15, section 19.1.2.1 |
| 26 function ObjectAssign(target, sources) { | 15 function ObjectAssign(target, sources) { |
| 27 var to = TO_OBJECT_INLINE(target); | 16 var to = TO_OBJECT_INLINE(target); |
| 28 var argsLen = %_ArgumentsLength(); | 17 var argsLen = %_ArgumentsLength(); |
| 29 if (argsLen < 2) return to; | 18 if (argsLen < 2) return to; |
| 30 | 19 |
| 31 for (var i = 1; i < argsLen; ++i) { | 20 for (var i = 1; i < argsLen; ++i) { |
| 32 var nextSource = %_Arguments(i); | 21 var nextSource = %_Arguments(i); |
| 33 if (IS_NULL_OR_UNDEFINED(nextSource)) { | 22 if (IS_NULL_OR_UNDEFINED(nextSource)) { |
| 34 continue; | 23 continue; |
| 35 } | 24 } |
| 36 | 25 |
| 37 var from = TO_OBJECT_INLINE(nextSource); | 26 var from = TO_OBJECT_INLINE(nextSource); |
| 38 var keys = OwnPropertyKeys(from); | 27 var keys = $ownPropertyKeys(from); |
| 39 var len = keys.length; | 28 var len = keys.length; |
| 40 | 29 |
| 41 for (var j = 0; j < len; ++j) { | 30 for (var j = 0; j < len; ++j) { |
| 42 var key = keys[j]; | 31 var key = keys[j]; |
| 43 if (%IsPropertyEnumerable(from, key)) { | 32 if (%IsPropertyEnumerable(from, key)) { |
| 44 var propValue = from[key]; | 33 var propValue = from[key]; |
| 45 to[key] = propValue; | 34 to[key] = propValue; |
| 46 } | 35 } |
| 47 } | 36 } |
| 48 } | 37 } |
| 49 return to; | 38 return to; |
| 50 } | 39 } |
| 51 | 40 |
| 52 // Set up non-enumerable functions on the Object object. | 41 // Set up non-enumerable functions on the Object object. |
| 53 utils.InstallFunctions(GlobalObject, DONT_ENUM, [ | 42 $installFunctions(GlobalObject, DONT_ENUM, [ |
| 54 "assign", ObjectAssign | 43 "assign", ObjectAssign |
| 55 ]); | 44 ]); |
| 56 | 45 |
| 57 }) | 46 }) |
| OLD | NEW |