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

Replace uses of commands.replaceTokens with util.compileMacro.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-23 03:22:29 -05:00
parent 76fad17378
commit 732919f2cd
3 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/modules/util.jsm
View File

@@ -256,10 +256,14 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
return stack.top;
},
compileMacro: function compileFormat(macro) {
compileMacro: function compileFormat(macro, keepUnknown) {
let stack = [frame()];
stack.__defineGetter__("top", function () this[this.length - 1]);
let unknown = util.identity;
if (!keepUnknown)
unknown = function () "";
function frame() update(
function _frame(obj)
_frame === stack.top || _frame.valid(obj) ?
@@ -274,15 +278,15 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
let match, end = 0;
let re = util.regexp(<![CDATA[
(.*?) // 1
([^]*?) // 1
(?:
(<\[) | // 2
< (.*?) > | // 3
(\]>) // 4
(< (.*?) >) | // 3 4
(\]>) // 5
)
]]>, "gy");
while (match = re.exec(macro)) {
let [, prefix, open, macro, close] = match;
let [, prefix, open, full, macro, close] = match;
end += match[0].length;
if (prefix)
@@ -302,14 +306,14 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
let quote = util.identity;
if (flags.q)
quote = function quote(obj) typeof obj === "number" ? obj : Commands.quote(obj);
quote = function quote(obj) typeof obj === "number" ? obj : String.quote(obj);
if (set.has(defaults, name))
stack.top.elements.push(quote(defaults[name]));
else {
stack.top.elements.push(update(
function (obj) obj[name] != null ? quote(obj[name]) : "",
{ test: function (obj) obj[name] != null }));
function (obj) obj[name] != null ? quote(obj[name]) : unknown(full),
{ test: function (obj) obj[name] != null && obj[name] !== false }));
for (let elem in array.iterValues(stack))
elem.seen[name] = true;