Skip to content

Commit

Permalink
Removing the all-encompassing closure from Enumerable.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcoglan
jcoglan committed Mar 26, 2008
1 parent d7ce2c9 commit e07a83d
Show file tree
Hide file tree
Showing 2 changed files with 173 additions and 172 deletions.
343 changes: 172 additions & 171 deletions source/enumerable.js
View file
Original file line number Diff line number Diff line change
@@ -1,187 +1,188 @@
JS.Enumerable = (function() {

var Null = function(context) { return context || null; };

var forEach = function(block, context) {
JS.util.Enum = {
forEach: function(block, context) {
for (var i = 0, n = this.length; i < n; i++)
block.call(Null(context), this[i], i);
};
block.call(context || null, this[i], i);
},

var isComparable = function(list) {
isComparable: function(list) {
return list.all(function(item) {
return Function.is(item.compareTo);
});
};
},

var Collection = JS.Class({
Collection: JS.Class({
initialize: function(array) {
this.length = 0;
var push = Array.prototype.push;
forEach.call(array, function(item) {
JS.util.Enum.forEach.call(array, function(item) {
push.call(this, item);
}, this);
}
});
})
};

JS.util.Enum.methods = {
all: function(block, context) {
var truth = true;
this.forEach(function(item, i) {
truth = truth && block.call(context || null, item, i);
});
return !!truth;
},

var methods = {
all: function(block, context) {
var truth = true;
this.forEach(function(item, i) {
truth = truth && block.call(Null(context), item, i);
});
return !!truth;
},

any: function(block, context) {
var truth = false;
this.forEach(function(item, i) {
truth = truth || block.call(Null(context), item, i);
});
return !!truth;
},

forEachCons: function(n, block, context) {
var entries = this.entries(), size = entries.length, limit = size - n;
for (var i = 0; i <= limit; i++)
block.call(Null(context), entries.slice(i, i+n), i);
},

forEachSlice: function(n, block, context) {
var entries = this.entries(), size = entries.length, m = Math.ceil(size/n);
for (var i = 0; i < m; i++)
block.call(Null(context), entries.slice(i*n, (i+1)*n), i);
},

find: function(block, context) {
var needle = {}, K = needle;
this.forEach(function(item, i) {
if (needle != K) return;
needle = block.call(Null(context), item, i) ? item : needle;
});
return needle == K ? null : needle;
},

inject: function(memo, block, context) {
var counter = 0, K = {};
if (Function.is(memo)) {
context = block; block = memo; memo = K;
}
this.forEach(function(item, i) {
if (!counter++ && memo === K) return memo = item;
memo = block.call(Null(context), memo, item, i);
});
return memo;
},

map: function(block, context) {
var map = [];
this.forEach(function(item, i) {
map.push(block.call(Null(context), item, i));
});
return map;
},

max: function(block, context) {
var list = this.sort(block, context);
return list[list.length - 1];
},

member: function(needle) {
return this.any(function(item) { return item == needle; });
},

min: function(block, context) {
var list = this.sort(block, context);
return list[0];
},

partition: function(block, context) {
var ayes = [], noes = [];
this.forEach(function(item, i) {
(block.call(Null(context), item, i) ? ayes : noes).push(item);
});
return [ayes, noes];
},

reject: function(block, context) {
var map = [];
this.forEach(function(item, i) {
if (!block.call(Null(context), item, i)) map.push(item);
});
return map;
},

select: function(block, context) {
var map = [];
this.forEach(function(item, i) {
if (block.call(Null(context), item, i)) map.push(item);
});
return map;
},

sort: function(block, context) {
var comparable = isComparable(this), entries = this.entries();
block = block || (comparable
? function(a,b) { return a.compareTo(b); }
: null);
return block
? entries.sort(function(a,b) { return block.call(Null(context), a, b); })
: entries.sort();
},

sortBy: function(block, context) {
var map = new Collection(this.map(block, context));
var comparable = isComparable(map);
return new Collection(map.zip(this).sort(function(a, b) {
a = a[0]; b = b[0];
return comparable ? a.compareTo(b) : (a < b ? -1 : (a > b ? 1 : 0));
})).map(function(item) { return item[1]; });
},

toArray: function() {
return this.map(function(x) { return x; });
},

zip: function() {
var args = [], counter = 0, n = arguments.length, block, context;
if (arguments[n-1] instanceof Function) {
block = arguments[n-1]; context = {};
}
if (arguments[n-2] instanceof Function) {
block = arguments[n-2]; context = arguments[n-1];
}
forEach.call(arguments, function(arg) {
if (arg == block || arg == context) return;
if (arg.toArray) arg = arg.toArray();
if (arg instanceof Array) args.push(arg);
});
var results = this.map(function(item) {
var zip = [item];
forEach.call(args, function(arg) {
zip.push(arg[counter] === undefined ? null : arg[counter]);
});
return ++counter && zip;
});
if (!block) return results;
forEach.call(results, block, context);
any: function(block, context) {
var truth = false;
this.forEach(function(item, i) {
truth = truth || block.call(context || null, item, i);
});
return !!truth;
},

forEachCons: function(n, block, context) {
var entries = this.entries(), size = entries.length, limit = size - n;
for (var i = 0; i <= limit; i++)
block.call(context || null, entries.slice(i, i+n), i);
},

forEachSlice: function(n, block, context) {
var entries = this.entries(), size = entries.length, m = Math.ceil(size/n);
for (var i = 0; i < m; i++)
block.call(context || null, entries.slice(i*n, (i+1)*n), i);
},

find: function(block, context) {
var needle = {}, K = needle;
this.forEach(function(item, i) {
if (needle != K) return;
needle = block.call(context || null, item, i) ? item : needle;
});
return needle == K ? null : needle;
},

inject: function(memo, block, context) {
var counter = 0, K = {};
if (Function.is(memo)) {
context = block; block = memo; memo = K;
}
this.forEach(function(item, i) {
if (!counter++ && memo === K) return memo = item;
memo = block.call(context || null, memo, item, i);
});
return memo;
},

map: function(block, context) {
var map = [];
this.forEach(function(item, i) {
map.push(block.call(context || null, item, i));
});
return map;
},

max: function(block, context) {
var list = this.sort(block, context);
return list[list.length - 1];
},

member: function(needle) {
return this.any(function(item) { return item == needle; });
},

min: function(block, context) {
var list = this.sort(block, context);
return list[0];
},

partition: function(block, context) {
var ayes = [], noes = [];
this.forEach(function(item, i) {
(block.call(context || null, item, i) ? ayes : noes).push(item);
});
return [ayes, noes];
},

reject: function(block, context) {
var map = [];
this.forEach(function(item, i) {
if (!block.call(context || null, item, i)) map.push(item);
});
return map;
},

select: function(block, context) {
var map = [];
this.forEach(function(item, i) {
if (block.call(context || null, item, i)) map.push(item);
});
return map;
},

sort: function(block, context) {
var comparable = JS.util.Enum.isComparable(this), entries = this.entries();
block = block || (comparable
? function(a,b) { return a.compareTo(b); }
: null);
return block
? entries.sort(function(a,b) { return block.call(context || null, a, b); })
: entries.sort();
},

sortBy: function(block, context) {
var util = JS.util.Enum;
var map = new util.Collection(this.map(block, context));
var comparable = util.isComparable(map);
return new util.Collection(map.zip(this).sort(function(a, b) {
a = a[0]; b = b[0];
return comparable ? a.compareTo(b) : (a < b ? -1 : (a > b ? 1 : 0));
})).map(function(item) { return item[1]; });
},

toArray: function() {
return this.map(function(x) { return x; });
},

zip: function() {
var util = JS.util.Enum;
var args = [], counter = 0, n = arguments.length, block, context;
if (arguments[n-1] instanceof Function) {
block = arguments[n-1]; context = {};
}
};

// http://developer.mozilla.org/en/docs/index.php?title=Core_JavaScript_1.5_Reference:Global_Objects:Array&oldid=58326
methods.collect = methods.map;
methods.detect = methods.find;
methods.entries = methods.toArray;
methods.every = methods.all;
methods.findAll = methods.filter = methods.select;
methods.some = methods.any;

var module = {
included: function(klass) {
if (!klass.prototype.forEach) klass.include({forEach: forEach});
klass.include(methods);
if (arguments[n-2] instanceof Function) {
block = arguments[n-2]; context = arguments[n-1];
}
};
util.forEach.call(arguments, function(arg) {
if (arg == block || arg == context) return;
if (arg.toArray) arg = arg.toArray();
if (arg instanceof Array) args.push(arg);
});
var results = this.map(function(item) {
var zip = [item];
util.forEach.call(args, function(arg) {
zip.push(arg[counter] === undefined ? null : arg[counter]);
});
return ++counter && zip;
});
if (!block) return results;
util.forEach.call(results, block, context);
}
};

// http://developer.mozilla.org/en/docs/index.php?title=Core_JavaScript_1.5_Reference:Global_Objects:Array&oldid=58326
JS.extend(JS.util.Enum.methods, {
collect: JS.util.Enum.methods.map,
detect: JS.util.Enum.methods.find,
entries: JS.util.Enum.methods.toArray,
every: JS.util.Enum.methods.all,
findAll: JS.util.Enum.methods.select,
filter: JS.util.Enum.methods.select,
some: JS.util.Enum.methods.any
});

JS.Enumerable = {
included: function(klass) {
klass.include({forEach: JS.util.Enum.forEach}, false);
klass.include(JS.util.Enum.methods);
}
};

Collection.include(module);
return module;
})();
JS.util.Enum.Collection.include(JS.Enumerable);
2 changes: 1 addition & 1 deletion source/state.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
JS.State = JS.Module({
JS.State = JS.Module({
_getState: function(state) {
return (typeof state == 'object' && state) ||
(typeof state == 'string' && ((this.states || {})[state] || {})) ||
Expand Down

0 comments on commit e07a83d

Please sign in to comment.