| 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 // ------------------------------------------------------------------- | 12 // ------------------------------------------------------------------- |
| 13 // Imports | 13 // Imports |
| 14 | 14 |
| 15 var GlobalObject = global.Object; | 15 var GlobalObject = global.Object; |
| 16 | 16 |
| 17 var OwnPropertyKeys; | 17 var OwnPropertyKeys; |
| 18 | 18 |
| 19 utils.Import(function(from) { | 19 utils.Import(function(from) { |
| 20 OwnPropertyKeys = from.OwnPropertyKeys; | 20 OwnPropertyKeys = from.OwnPropertyKeys; |
| 21 }); | 21 }); |
| 22 | 22 |
| 23 // ------------------------------------------------------------------- | 23 // ------------------------------------------------------------------- |
| 24 | 24 |
| 25 // ES6, draft 04-03-15, section 19.1.2.1 | 25 // ES6, draft 04-03-15, section 19.1.2.1 |
| 26 function ObjectAssign(target, sources) { | 26 function ObjectAssign(target, sources) { |
| 27 var to = TO_OBJECT_INLINE(target); | 27 var to = TO_OBJECT(target); |
| 28 var argsLen = %_ArgumentsLength(); | 28 var argsLen = %_ArgumentsLength(); |
| 29 if (argsLen < 2) return to; | 29 if (argsLen < 2) return to; |
| 30 | 30 |
| 31 for (var i = 1; i < argsLen; ++i) { | 31 for (var i = 1; i < argsLen; ++i) { |
| 32 var nextSource = %_Arguments(i); | 32 var nextSource = %_Arguments(i); |
| 33 if (IS_NULL_OR_UNDEFINED(nextSource)) { | 33 if (IS_NULL_OR_UNDEFINED(nextSource)) { |
| 34 continue; | 34 continue; |
| 35 } | 35 } |
| 36 | 36 |
| 37 var from = TO_OBJECT_INLINE(nextSource); | 37 var from = TO_OBJECT(nextSource); |
| 38 var keys = OwnPropertyKeys(from); | 38 var keys = OwnPropertyKeys(from); |
| 39 var len = keys.length; | 39 var len = keys.length; |
| 40 | 40 |
| 41 for (var j = 0; j < len; ++j) { | 41 for (var j = 0; j < len; ++j) { |
| 42 var key = keys[j]; | 42 var key = keys[j]; |
| 43 if (%IsPropertyEnumerable(from, key)) { | 43 if (%IsPropertyEnumerable(from, key)) { |
| 44 var propValue = from[key]; | 44 var propValue = from[key]; |
| 45 to[key] = propValue; | 45 to[key] = propValue; |
| 46 } | 46 } |
| 47 } | 47 } |
| 48 } | 48 } |
| 49 return to; | 49 return to; |
| 50 } | 50 } |
| 51 | 51 |
| 52 // Set up non-enumerable functions on the Object object. | 52 // Set up non-enumerable functions on the Object object. |
| 53 utils.InstallFunctions(GlobalObject, DONT_ENUM, [ | 53 utils.InstallFunctions(GlobalObject, DONT_ENUM, [ |
| 54 "assign", ObjectAssign | 54 "assign", ObjectAssign |
| 55 ]); | 55 ]); |
| 56 | 56 |
| 57 }) | 57 }) |
| OLD | NEW |