summaryrefslogtreecommitdiff
path: root/common/modules/options.jsm
diff options
context:
space:
mode:
authorDoug Kearns <dougkearns@gmail.com>2011-03-07 21:41:07 +1100
committerDoug Kearns <dougkearns@gmail.com>2011-03-07 21:41:07 +1100
commit1c4c5e5ad360f531c7ae21693e0ce15e375cd88d (patch)
tree8f5f0916b75d7ab563d5317496fd02f4b4bc62fe /common/modules/options.jsm
parent7bf3f40ab01448e8e5067d85edf761dbaf2108ee (diff)
downloadpentadactyl-1c4c5e5ad360f531c7ae21693e0ce15e375cd88d.tar.gz
Normalise use of "res" vs "ret" for return variables.
Diffstat (limited to 'common/modules/options.jsm')
-rw-r--r--common/modules/options.jsm50
1 files changed, 25 insertions, 25 deletions
diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 4717b5e8..31684cba 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -872,54 +872,54 @@ var Options = Module("options", {
* @returns {Object} The parsed command object.
*/
parseOpt: function parseOpt(args, modifiers) {
- let ret = {};
+ let res = {};
let matches, prefix, postfix;
- [matches, prefix, ret.name, postfix, ret.valueGiven, ret.operator, ret.value] =
+ [matches, prefix, res.name, postfix, res.valueGiven, res.operator, res.value] =
args.match(/^\s*(no|inv)?([^=]+?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/) || [];
- ret.args = args;
- ret.onlyNonDefault = false; // used for :set to print non-default options
+ res.args = args;
+ res.onlyNonDefault = false; // used for :set to print non-default options
if (!args) {
- ret.name = "all";
- ret.onlyNonDefault = true;
+ res.name = "all";
+ res.onlyNonDefault = true;
}
if (matches) {
- ret.option = this.get(ret.name, ret.scope);
- if (!ret.option && (ret.option = this.get(prefix + ret.name, ret.scope))) {
- ret.name = prefix + ret.name;
+ res.option = this.get(res.name, res.scope);
+ if (!res.option && (res.option = this.get(prefix + res.name, res.scope))) {
+ res.name = prefix + res.name;
prefix = "";
}
}
- ret.prefix = prefix;
- ret.postfix = postfix;
+ res.prefix = prefix;
+ res.postfix = postfix;
- ret.all = (ret.name == "all");
- ret.get = (ret.all || postfix == "?" || (ret.option && ret.option.type != "boolean" && !ret.valueGiven));
- ret.invert = (prefix == "inv" || postfix == "!");
- ret.reset = (postfix == "&");
- ret.unsetBoolean = (prefix == "no");
+ res.all = (res.name == "all");
+ res.get = (res.all || postfix == "?" || (res.option && res.option.type != "boolean" && !res.valueGiven));
+ res.invert = (prefix == "inv" || postfix == "!");
+ res.reset = (postfix == "&");
+ res.unsetBoolean = (prefix == "no");
- ret.scope = modifiers && modifiers.scope;
+ res.scope = modifiers && modifiers.scope;
- if (!ret.option)
- return ret;
+ if (!res.option)
+ return res;
- if (ret.value === undefined)
- ret.value = "";
+ if (res.value === undefined)
+ res.value = "";
- ret.optionValue = ret.option.get(ret.scope);
+ res.optionValue = res.option.get(res.scope);
try {
- ret.values = ret.option.parse(ret.value);
+ res.values = res.option.parse(res.value);
}
catch (e) {
- ret.error = e;
+ res.error = e;
}
- return ret;
+ return res;
},
/**