Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-11 11:27:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize lazy evaluation for 1 param.

Browse Source
This commit is contained in:
jdalton
2015-02-28 10:11:26 -08:00
parent 973038da6a
commit 132aacee89
2 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lodash.src.js
View File

@@ -34,9 +34,10 @@
HOT_SPAN = 16; HOT_SPAN = 16;
/** Used to indicate the type of lazy iteratees. */ /** Used to indicate the type of lazy iteratees. */
var LAZY_FILTER_FLAG = 0, var LAZY_DROP_WHILE_FLAG = 0,
LAZY_MAP_FLAG = 1, LAZY_FILTER_FLAG = 1,
LAZY_WHILE_FLAG = 2; LAZY_MAP_FLAG = 2,
LAZY_TAKE_WHILE_FLAG = 3;
/** Used as the `TypeError` message for "Functions" methods. */ /** Used as the `TypeError` message for "Functions" methods. */
var FUNC_ERROR_TEXT = 'Expected a function'; var FUNC_ERROR_TEXT = 'Expected a function';
@@ -1292,16 +1293,22 @@
while (++iterIndex < iterLength) { while (++iterIndex < iterLength) {
var data = iteratees[iterIndex], var data = iteratees[iterIndex],
iteratee = data.iteratee, iteratee = data.iteratee,
computed = iteratee(value, index, array),
type = data.type; type = data.type;
if (type != LAZY_DROP_WHILE_FLAG) {
var computed = iteratee(value);
} else {
data.done = data.done && (isRight ? index < data.index : index > data.index);
data.index = index;
computed = data.done || (data.done = !iteratee(value));
}
if (type == LAZY_MAP_FLAG) { if (type == LAZY_MAP_FLAG) {
value = computed; value = computed;
} else if (!computed) { } else if (!computed) {
if (type == LAZY_FILTER_FLAG) { if (type == LAZY_TAKE_WHILE_FLAG) {
continue outer;
} else {
break outer; break outer;
} else {
continue outer;
} }
} }
} }
@@ -11482,15 +11489,15 @@
}); });
// Add `LazyWrapper` methods that accept an `iteratee` value. // Add `LazyWrapper` methods that accept an `iteratee` value.
arrayEach(['filter', 'map', 'takeWhile'], function(methodName, index) { arrayEach(['dropWhile', 'filter', 'map', 'takeWhile'], function(methodName, type) {
var isFilter = index == LAZY_FILTER_FLAG || index == LAZY_WHILE_FLAG; var isFilter = type != LAZY_MAP_FLAG;
LazyWrapper.prototype[methodName] = function(iteratee, thisArg) { LazyWrapper.prototype[methodName] = function(iteratee, thisArg) {
var result = this.clone(), var result = this.clone(),
iteratees = result.__iteratees__ || (result.__iteratees__ = []); iteratees = result.__iteratees__ || (result.__iteratees__ = []);
result.__filtered__ = result.__filtered__ || isFilter; result.__filtered__ = result.__filtered__ || isFilter;
iteratees.push({ 'iteratee': getCallback(iteratee, thisArg, 1), 'type': index }); iteratees.push({ 'done': false, 'index': 0, 'iteratee': getCallback(iteratee, thisArg, 1), 'type': type });
return result; return result;
}; };
}); });
@@ -11555,23 +11562,10 @@
return this.filter(identity); return this.filter(identity);
}; };
LazyWrapper.prototype.dropWhile = function(predicate, thisArg) {
var done,
lastIndex,
isRight = this.__dir__ < 0;
predicate = getCallback(predicate, thisArg, 1);
return this.filter(function(value, index, array) {
done = done && (isRight ? index < lastIndex : index > lastIndex);
lastIndex = index;
return done || (done = !predicate(value, index, array));
});
};
LazyWrapper.prototype.reject = function(predicate, thisArg) { LazyWrapper.prototype.reject = function(predicate, thisArg) {
predicate = getCallback(predicate, thisArg, 1); predicate = getCallback(predicate, thisArg, 1);
return this.filter(function(value, index, array) { return this.filter(function(value) {
return !predicate(value, index, array); return !predicate(value);
}); });
}; };
@@ -11593,7 +11587,7 @@
// Add `LazyWrapper` methods to `lodash.prototype`. // Add `LazyWrapper` methods to `lodash.prototype`.
baseForOwn(LazyWrapper.prototype, function(func, methodName) { baseForOwn(LazyWrapper.prototype, function(func, methodName) {
var lodashFunc = lodash[methodName], var lodashFunc = lodash[methodName],
checkIteratee = /(?:filter|map|reject|While)/.test(methodName), checkIteratee = /^(?:filter|map|reject)|While$/.test(methodName),
retUnwrapped = /^(?:first|last)$/.test(methodName); retUnwrapped = /^(?:first|last)$/.test(methodName);
lodash.prototype[methodName] = function() { lodash.prototype[methodName] = function() {

12
test/test.js
View File

@@ -3994,7 +3994,7 @@
args = slice.call(arguments); args = slice.call(arguments);
}).value(); }).value();
deepEqual(args, [16, 3, array]); deepEqual(args, [16]);
_(array).map(square).dropRightWhile(function() { _(array).map(square).dropRightWhile(function() {
args = slice.call(arguments); args = slice.call(arguments);
@@ -4095,7 +4095,7 @@
args = slice.call(arguments); args = slice.call(arguments);
}).value(); }).value();
deepEqual(args, [1, 0, array]); deepEqual(args, [1]);
_(array).map(square).dropWhile(function() { _(array).map(square).dropWhile(function() {
args = slice.call(arguments); args = slice.call(arguments);
@@ -4929,7 +4929,7 @@
args = slice.call(arguments); args = slice.call(arguments);
}).value(); }).value();
deepEqual(args, [16, 3, array]); deepEqual(args, [16]);
_(array).map(square).takeRightWhile(function() { _(array).map(square).takeRightWhile(function() {
args = slice.call(arguments); args = slice.call(arguments);
@@ -5029,7 +5029,7 @@
args = slice.call(arguments); args = slice.call(arguments);
}).value(); }).value();
deepEqual(args, [1, 0, array]); deepEqual(args, [1]);
_(array).map(square).takeWhile(function() { _(array).map(square).takeWhile(function() {
args = slice.call(arguments); args = slice.call(arguments);
@@ -9199,7 +9199,7 @@
args || (args = slice.call(arguments)); args || (args = slice.call(arguments));
}).value(); }).value();
deepEqual(args, [1, 0, array]); deepEqual(args, [1]);
args = null; args = null;
_(array).map(square).map(function() { _(array).map(square).map(function() {
@@ -12186,7 +12186,7 @@
args || (args = slice.call(arguments)); args || (args = slice.call(arguments));
}).value(); }).value();
deepEqual(args, [1, 0, array]); deepEqual(args, [1]);
args = null; args = null;
_(array).map(square)[methodName](function() { _(array).map(square)[methodName](function() {