Index: src/js/harmony-array.js |
diff --git a/src/js/harmony-array.js b/src/js/harmony-array.js |
index 61bdbb689eed3e7a58c18c1a445da41e3d9eeb55..acaec50cbd7311439fe741e28107cf1c2abad13c 100644 |
--- a/src/js/harmony-array.js |
+++ b/src/js/harmony-array.js |
@@ -15,18 +15,18 @@ var GetIterator; |
var GetMethod; |
var GlobalArray = global.Array; |
var iteratorSymbol = utils.ImportNow("iterator_symbol"); |
-var MathMax; |
-var MathMin; |
var ObjectIsFrozen; |
var ObjectDefineProperty; |
+var MaxSimple; |
Jakob Kummerow
2015/10/15 14:18:48
nit: please preserve alpha-sorting
skomski
2015/10/15 15:17:58
Done.
|
+var MinSimple; |
utils.Import(function(from) { |
GetIterator = from.GetIterator; |
GetMethod = from.GetMethod; |
- MathMax = from.MathMax; |
- MathMin = from.MathMin; |
ObjectIsFrozen = from.ObjectIsFrozen; |
ObjectDefineProperty = from.ObjectDefineProperty; |
+ MaxSimple = from.MaxSimple; |
+ MinSimple = from.MinSimple; |
}); |
// ------------------------------------------------------------------- |
@@ -35,28 +35,28 @@ function InnerArrayCopyWithin(target, start, end, array, length) { |
target = TO_INTEGER(target); |
var to; |
if (target < 0) { |
- to = MathMax(length + target, 0); |
+ to = MaxSimple(length + target, 0); |
} else { |
- to = MathMin(target, length); |
+ to = MinSimple(target, length); |
} |
start = TO_INTEGER(start); |
var from; |
if (start < 0) { |
- from = MathMax(length + start, 0); |
+ from = MaxSimple(length + start, 0); |
} else { |
- from = MathMin(start, length); |
+ from = MinSimple(start, length); |
} |
end = IS_UNDEFINED(end) ? length : TO_INTEGER(end); |
var final; |
if (end < 0) { |
- final = MathMax(length + end, 0); |
+ final = MaxSimple(length + end, 0); |
} else { |
- final = MathMin(end, length); |
+ final = MinSimple(end, length); |
} |
- var count = MathMin(final - from, length - to); |
+ var count = MinSimple(final - from, length - to); |
var direction = 1; |
if (from < to && to < (from + count)) { |
direction = -1; |