gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-13 10:15:45 +01:00
Code Issues Projects Releases Wiki Activity

Move iteration utility functions to the iter namespace.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-02 16:56:18 -05:00
parent 91f02c9763
commit fbd7556a76
14 changed files with 261 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

309
common/modules/base.jsm
View File

@@ -332,7 +332,7 @@ function keys(obj) {
* @param {object} obj The object to inspect.
* @returns {Generator}
*/
function values(obj) {
function values(obj) iter(function values() {
if (isinstance(obj, ["Generator", "Iterator"]))
for (let k in obj)
yield k;
@@ -340,31 +340,10 @@ function values(obj) {
for (var k in obj)
if (hasOwnProperty.call(obj, k))
yield obj[k];
}
}());
/**
* Iterates over an iterable object and calls a callback for each
* element.
*
* @param {object} iter The iterator.
* @param {function} fn The callback.
* @param {object} self The this object for *fn*.
*/
function forEach(iter, fn, self) {
for (let val in iter)
fn.call(self, val);
}
/**
* Iterates over each iterable argument in turn, yielding each value.
*
* @returns {Generator}
*/
function iterAll() {
for (let i = 0; i < arguments.length; i++)
for (let j in Iterator(arguments[i]))
yield j;
}
var forEach = deprecated("Please use iter.forEach instead", function forEach() iter.forEach.apply(iter, arguments));
var iterAll = deprecated("Please use iter instead", function iterAll() iter.apply(null, arguments));
/**
* Utility for managing sets of strings. Given an array, returns an
@@ -429,87 +408,6 @@ set.remove = function (set, key) {
return res;
}
/**
* Iterates over an arbitrary object. The following iterators types are
* supported, and work as a user would expect:
*
* • nsIDOMNodeIterator
* • mozIStorageStatement
*
* Additionally, the following array-like objects yield a tuple of the
* form [index, element] for each contained element:
*
* • nsIDOMHTMLCollection
* • nsIDOMNodeList
*
* and the following likewise yield one element of the form
* [name, element] for each contained element:
*
* • nsIDOMNamedNodeMap
*
* Duck typing is implemented for the any other type. If the object
* contains the "enumerator" property, iter is called on that. If the
* property is a function, it is called first. If it contains the
* property "getNext" along with either "hasMoreItems" or "hasMore", it
* is iterated over appropriately.
*
* For all other cases, this function behaves exactly like the Iterator
* function.
*
* @param {object} obj
* @returns {Generator}
*/
function iter(obj) {
let res = Iterator(obj);
if (ctypes && ctypes.CData && obj instanceof ctypes.CData) {
while (obj.constructor instanceof ctypes.PointerType)
obj = obj.contents;
if (obj.constructor instanceof ctypes.ArrayType)
res = array.iterItems(obj);
else if (obj.constructor instanceof ctypes.StructType)
res = (function () {
for (let prop in values(obj.constructor.fields))
yield let ([name, type] = Iterator(prop).next()) [name, obj[name]];
})();
else
return iter({});
}
else if (isinstance(obj, [Ci.nsIDOMHTMLCollection, Ci.nsIDOMNodeList]))
res = array.iterItems(obj);
else if (obj instanceof Ci.nsIDOMNamedNodeMap)
res = (function () {
for (let i = 0; i < obj.length; i++)
yield [obj.name, obj];
})();
else if (obj instanceof Ci.mozIStorageStatement)
res = (function (obj) {
while (obj.executeStep())
yield obj.row;
obj.reset();
})(obj);
else if ("getNext" in obj) {
if ("hasMoreElements" in obj)
res = (function () {
while (obj.hasMoreElements())
yield obj.getNext();
})();
else if ("hasMore" in obj)
res = (function () {
while (obj.hasMore())
yield obj.getNext();
})();
}
else if ("enumerator" in obj) {
if (callable(obj.enumerator))
return iter(obj.enumerator());
return iter(obj.enumerator);
}
res.__noSuchMethod__ = function __noSuchMethod__(meth, args)
let (ary = array(this))
ary[meth] ? ary[meth].apply(ary, args) : ary.__noSuchMethod__(meth, args);
return res;
}
/**
* Returns true if both arguments are functions and
* (targ() instanceof src) would also return true.
@@ -889,7 +787,7 @@ Class.prototype = {
memoize(Class.prototype, "closure", function () {
const self = this;
function closure(fn) function () fn.apply(self, arguments);
for (let k in iterAll(properties(this), properties(this, true)))
for (let k in iter(properties(this), properties(this, true)))
if (!this.__lookupGetter__(k) && callable(this[k]))
closure[k] = closure(this[k]);
return closure;
@@ -910,8 +808,8 @@ function XPCOM(interfaces, superClass) {
Cc["@dactyl.googlecode.com/base/xpc-interface-shim"].createInstance());
let res = Class("XPCOM(" + interfaces + ")", superClass || Class, update(
array([k, v === undefined || callable(v) ? function stub() null : v]
for ([k, v] in Iterator(shim))).toObject(),
iter.toObject([k, v === undefined || callable(v) ? function stub() null : v]
for ([k, v] in Iterator(shim))),
{ QueryInterface: XPCOMUtils.generateQI(interfaces) }));
shim = interfaces = null;
return res;
@@ -1121,6 +1019,197 @@ function UTF8(str) {
function octal(decimal) parseInt(decimal, 8);
/**
* Iterates over an arbitrary object. The following iterators types are
* supported, and work as a user would expect:
*
* • nsIDOMNodeIterator
* • mozIStorageStatement
*
* Additionally, the following array-like objects yield a tuple of the
* form [index, element] for each contained element:
*
* • nsIDOMHTMLCollection
* • nsIDOMNodeList
*
* and the following likewise yield one element of the form
* [name, element] for each contained element:
*
* • nsIDOMNamedNodeMap
*
* Duck typing is implemented for the any other type. If the object
* contains the "enumerator" property, iter is called on that. If the
* property is a function, it is called first. If it contains the
* property "getNext" along with either "hasMoreItems" or "hasMore", it
* is iterated over appropriately.
*
* For all other cases, this function behaves exactly like the Iterator
* function.
*
* @param {object} obj
* @returns {Generator}
*/
function iter(obj) {
let args = arguments;
let res = Iterator(obj);
if (isinstance(args, ["Iterator", "Generator"]))
;
else if (args.length > 1)
res = (function () {
for (let i = 0; i < args.length; i++)
for (let j in Iterator(args[i]))
yield j;
})();
else if (ctypes && ctypes.CData && obj instanceof ctypes.CData) {
while (obj.constructor instanceof ctypes.PointerType)
obj = obj.contents;
if (obj.constructor instanceof ctypes.ArrayType)
res = array.iterItems(obj);
else if (obj.constructor instanceof ctypes.StructType)
res = (function () {
for (let prop in values(obj.constructor.fields))
yield let ([name, type] = Iterator(prop).next()) [name, obj[name]];
})();
else
return iter({});
}
else if (isinstance(obj, [Ci.nsIDOMHTMLCollection, Ci.nsIDOMNodeList]))
res = array.iterItems(obj);
else if (obj instanceof Ci.nsIDOMNamedNodeMap)
res = (function () {
for (let i = 0; i < obj.length; i++)
yield [obj.name, obj];
})();
else if (obj instanceof Ci.mozIStorageStatement)
res = (function (obj) {
while (obj.executeStep())
yield obj.row;
obj.reset();
})(obj);
else if ("getNext" in obj) {
if ("hasMoreElements" in obj)
res = (function () {
while (obj.hasMoreElements())
yield obj.getNext();
})();
else if ("hasMore" in obj)
res = (function () {
while (obj.hasMore())
yield obj.getNext();
})();
}
else if ("enumerator" in obj) {
if (callable(obj.enumerator))
return iter(obj.enumerator());
return iter(obj.enumerator);
}
res.__noSuchMethod__ = function __noSuchMethod__(meth, args) {
if (meth in iter)
var res = iter[meth].apply(iter, [this].concat(args));
else
res = let (ary = array(this))
ary[meth] ? ary[meth].apply(ary, args) : ary.__noSuchMethod__(meth, args);
if (isinstance(res, ["Iterator", "Generator"]))
return iter(res);
return res;
};
return res;
}
update(iter, {
toArray: function toArray(iter) array(iter).array,
// See array.prototype for API docs.
toObject: function toObject(iter) {
let obj = {};
for (let [k, v] in iter)
obj[k] = v;
return obj;
},
compact: function compact(iter) (item for (item in iter) if (item != null)),
every: function every(iter, pred, self) {
pred = pred || util.identity;
for (let elem in iter)
if (!pred.call(self, elem))
return false;
return true;
},
some: function every(iter, pred, self) {
pred = pred || util.identity;
for (let elem in iter)
if (pred.call(self, elem))
return true;
return false;
},
filter: function filter(iter, pred, self) {
for (let elem in iter)
if (pred.call(self, elem))
yield elem;
},
/**
* Iterates over an iterable object and calls a callback for each
* element.
*
* @param {object} iter The iterator.
* @param {function} fn The callback.
* @param {object} self The this object for *fn*.
*/
forEach: function forEach(iter, func, self) {
for (let val in iter)
func.call(self, val);
},
/**
* Returns the array that results from applying *func* to each property of
* *obj*.
*
* @param {Object} obj
* @param {function} func
* @returns {Array}
*/
map: function map(iter, func, self) {
for (let i in iter)
yield func.call(self, i);
},
/**
* Returns the nth member of the given array that matches the
* given predicate.
*/
nth: function nth(iter, pred, n, self) {
for (let elem in iter)
if (pred.call(self, elem) && n-- === 0)
return elem;
return undefined;
},
uniq: function uniq(iter) {
let seen = {};
for (let item in iter)
if (!set.add(seen, item))
yield item;
},
/**
* Zips the contents of two arrays. The resulting array is the length of
* ary1, with any shortcomings of ary2 replaced with null strings.
*
* @param {Array} ary1
* @param {Array} ary2
* @returns {Array}
*/
zip: function zip(iter1, iter2) {
try {
yield [iter1.next(), iter2.next()];
}
catch (e if e instanceof StopIteration) {}
}
});
/**
* Array utility methods.
*/
@@ -1138,6 +1227,8 @@ var array = Class("array", Array, {
var res = array[meth].apply(null, [this.array].concat(args));
if (isArray(res))
return array(res);
if (isinstance(res, ["Iterator", "Generator"]))
return iter(res);
return res;
},
array: ary,

6
common/modules/sanitizer.jsm
View File

@@ -211,7 +211,9 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
addItem: function addItem(name, params) {
this.itemMap[name] = update(this.itemMap[name] || Item(name),
array([k, v] for ([k, v] in Iterator(params)) if (!callable(v))).toObject());
iter.toObject([k, v]
for ([k, v] in Iterator(params))
if (!callable(v))));
let names = set([name].concat(params.contains || []).map(function (e) "clear-" + e));
if (params.action)
@@ -315,7 +317,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
deny: 2,
session: 8
},
UNPERMS: Class.memoize(function () array.toObject([[v, k] for ([k, v] in Iterator(this.PERMS))])),
UNPERMS: Class.memoize(function () iter(this.PERMS).map(Array.reverse).toObject()),
COMMANDS: {
unset: "Unset",
allow: "Allowed",

15
common/modules/util.jsm
View File

@@ -793,20 +793,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
.map(function (node) "//" + node).join(" | ");
},
/**
* Returns the array that results from applying *func* to each property of
* *obj*.
*
* @param {Object} obj
* @param {function} func
* @returns {Array}
*/
map: function map(obj, func) {
let ary = [];
for (let i in Iterator(obj))
ary.push(func(i));
return ary;
},
map: deprecated("Please use iter.map instead", function map(obj, fn, self) iter(obj).map(fn, self).toArray()),
/**
* Converts a URI string into a URI object.