[Pkg-mozext-commits] [greasemonkey] 23/55: Add author and homepage script values.
David Prévot
taffit at moszumanska.debian.org
Thu Oct 29 15:38:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository greasemonkey.
commit 25ef32ac4fdfc99c2f2d2f62d545419b38a21923
Author: Anthony Lieuallen <arantius at gmail.com>
Date: Wed Sep 23 15:50:12 2015 -0400
Add author and homepage script values.
For displaying in the addon manager "more" page.
Fixes #1944
---
modules/addons4.js | 30 ++-
modules/parseScript.js | 3 +
modules/script.js | 26 ++-
modules/util/parseMetaLine.js | 502 +++++++++++++++++++++++-------------------
peg.txt | 2 +
5 files changed, 322 insertions(+), 241 deletions(-)
diff --git a/modules/addons4.js b/modules/addons4.js
index 503bc46..3abc189 100755
--- a/modules/addons4.js
+++ b/modules/addons4.js
@@ -89,28 +89,34 @@ function ScriptAddonFactoryById(aId) {
function ScriptAddon(aScript) {
this._script = aScript;
- this.id = aScript.id + SCRIPT_ID_SUFFIX;
- this.forceUpdate = false;
- this.name = this._script.localized.name;
- this.version = this._script.version;
+ this.creator = {
+ name: this._script.author,
+ url: this._script.homepageURL,
+ };
this.description = this._script.localized.description;
+ this.forceUpdate = false;
+ this.homepageURL = this._script.homepageURL;
this.iconURL = this._script.icon && this._script.icon.fileURL;
- this.updateDate = this._script.modifiedDate;
+ this.id = aScript.id + SCRIPT_ID_SUFFIX;
+ this.name = this._script.localized.name;
this.providesUpdatesSecurely = aScript.updateIsSecure;
+ this.updateDate = this._script.modifiedDate;
+ this.version = this._script.version;
}
// Required attributes.
+ScriptAddon.prototype.appDisabled = false;
+ScriptAddon.prototype.blocklistState = 0;
+ScriptAddon.prototype.creator = null;
ScriptAddon.prototype.id = null;
-ScriptAddon.prototype.version = null;
-ScriptAddon.prototype.type = SCRIPT_ADDON_TYPE;
ScriptAddon.prototype.isCompatible = true;
-ScriptAddon.prototype.blocklistState = 0;
-ScriptAddon.prototype.appDisabled = false;
-ScriptAddon.prototype.scope = AddonManager.SCOPE_PROFILE;
+ScriptAddon.prototype.homepageURL = null;
ScriptAddon.prototype.name = null;
-ScriptAddon.prototype.creator = null;
-ScriptAddon.prototype.pendingOperations = 0;
ScriptAddon.prototype.operationsRequiringRestart = AddonManager.OP_NEEDS_RESTART_NONE;
+ScriptAddon.prototype.pendingOperations = 0;
+ScriptAddon.prototype.scope = AddonManager.SCOPE_PROFILE;
+ScriptAddon.prototype.type = SCRIPT_ADDON_TYPE;
+ScriptAddon.prototype.version = null;
// Optional attributes
ScriptAddon.prototype.description = null;
diff --git a/modules/parseScript.js b/modules/parseScript.js
index 07402ea..903b00f 100644
--- a/modules/parseScript.js
+++ b/modules/parseScript.js
@@ -103,6 +103,8 @@ function parse(aSource, aUri, aFailWhenMissing, aNoMetaOk) {
break;
+ case 'author':
+ script[data.keyword] = data.value;
case 'namespace':
case 'version':
script['_' + data.keyword] = data.value;
@@ -123,6 +125,7 @@ function parse(aSource, aUri, aFailWhenMissing, aNoMetaOk) {
case 'installURL':
data.keyword = 'downloadURL';
case 'downloadURL':
+ case 'homepageURL':
case 'updateURL':
try {
var uri = GM_util.uriFromUrl(data.value, aUri);
diff --git a/modules/script.js b/modules/script.js
index bbb1859..3d2ce74 100644
--- a/modules/script.js
+++ b/modules/script.js
@@ -32,6 +32,7 @@ var gAboutBlankRegexp = /^about:blank/;
function Script(configNode) {
this._observers = [];
+ this._author = null;
this._basedir = null;
this._dependFail = false;
this._dependhash = null;
@@ -41,6 +42,7 @@ function Script(configNode) {
this._excludes = [];
this._filename = null;
this._grants = [];
+ this._homepageURL = null;
this._icon = new ScriptIcon(this);
this._id = null;
this._installTime = null;
@@ -111,6 +113,12 @@ Script.prototype._changed = function(event, data) {
// TODO: Move this method to be public rather than just aliasing it.
Script.prototype.changed = Script.prototype._changed;
+
+Script.prototype.__defineGetter__('author',
+function Script_getAuthor() { return this._author; });
+Script.prototype.__defineSetter__('author',
+function Script_setAuthor(aVal) { this._author = '' + aVal; });
+
Script.prototype.__defineGetter__('installDate',
function Script_getInstallDate() { return new Date(this._installTime); });
@@ -179,6 +187,11 @@ function Script_getDownloadUrl() { return this._downloadURL; });
Script.prototype.__defineSetter__('downloadURL',
function Script_setDownloadUrl(aVal) { this._downloadURL = '' + aVal; });
+Script.prototype.__defineGetter__('homepageURL',
+function Script_getHomepageUrl() { return this._homepageURL; });
+Script.prototype.__defineSetter__('homepageURL',
+function Script_setHomepageUrl(aVal) { this._homepageURL = '' + aVal; });
+
Script.prototype.__defineGetter__('uuid',
function Script_getUuid() { return this._uuid; });
@@ -321,7 +334,9 @@ Script.prototype.fixTimestampsOnInstall = function() {
Script.prototype._loadFromConfigNode = function(node) {
this._filename = node.getAttribute("filename");
this._basedir = node.getAttribute("basedir") || ".";
+ this.author = node.getAttribute("author") || null;
this.downloadURL = node.getAttribute("installurl") || null;
+ this.homepageURL = node.getAttribute("homepageurl") || null;
this.updateURL = node.getAttribute("updateurl") || null;
if (!this.fileExists(this.baseDirFile)) return;
@@ -413,10 +428,11 @@ Script.prototype._loadFromConfigNode = function(node) {
}
this.checkConfig();
- this._name = node.getAttribute("name");
- this._namespace = node.getAttribute("namespace");
+ this.author = node.getAttribute("author") || "";
this._description = node.getAttribute("description");
this._enabled = node.getAttribute("enabled") == 'true';
+ this._name = node.getAttribute("name");
+ this._namespace = node.getAttribute("namespace");
this._noframes = node.getAttribute("noframes") == 'true';
this._runAt = node.getAttribute("runAt") || "document-end"; // legacy default
this._updateMetaStatus = node.getAttribute("updateMetaStatus") || "unknown";
@@ -495,17 +511,18 @@ Script.prototype.toConfigNode = function(doc) {
scriptNode.appendChild(doc.createTextNode("\n\t"));
+ scriptNode.setAttribute("author", this._author);
scriptNode.setAttribute("basedir", this._basedir);
scriptNode.setAttribute("checkRemoteUpdates", this.checkRemoteUpdates);
scriptNode.setAttribute("dependhash", this._dependhash);
scriptNode.setAttribute("description", this._description);
scriptNode.setAttribute("enabled", this._enabled);
- scriptNode.setAttribute("noframes", this._noframes);
scriptNode.setAttribute("filename", this._filename);
scriptNode.setAttribute("installTime", this._installTime);
scriptNode.setAttribute("modified", this._modifiedTime);
scriptNode.setAttribute("name", this._name);
scriptNode.setAttribute("namespace", this._namespace);
+ scriptNode.setAttribute("noframes", this._noframes);
scriptNode.setAttribute("runAt", this._runAt);
scriptNode.setAttribute("updateMetaStatus", this._updateMetaStatus);
scriptNode.setAttribute("uuid", this._uuid);
@@ -514,6 +531,9 @@ Script.prototype.toConfigNode = function(doc) {
if (this.downloadURL) {
scriptNode.setAttribute("installurl", this.downloadURL);
}
+ if (this.homepageURL) {
+ scriptNode.setAttribute("homepageurl", this.homepageURL);
+ }
if (this.updateURL) {
scriptNode.setAttribute("updateurl", this.updateURL);
}
diff --git a/modules/util/parseMetaLine.js b/modules/util/parseMetaLine.js
index 93af0ce..304ff9f 100644
--- a/modules/util/parseMetaLine.js
+++ b/modules/util/parseMetaLine.js
@@ -1,9 +1,9 @@
var EXPORTED_SYMBOLS = ['parseMetaLine'];
/*
- * Generated by PEG.js 0.8.0.
+ * Generated by PEG.js 0.9.0.
*
- * http://pegjs.majda.cz/
+ * http://pegjs.org/
*/
function peg$subclass(child, parent) {
@@ -12,87 +12,89 @@ function peg$subclass(child, parent) {
child.prototype = new ctor();
}
-function SyntaxError(message, expected, found, offset, line, column) {
+function peg$SyntaxError(message, expected, found, location) {
this.message = message;
this.expected = expected;
this.found = found;
- this.offset = offset;
- this.line = line;
- this.column = column;
-
+ this.location = location;
this.name = "SyntaxError";
+
+ if (typeof Error.captureStackTrace === "function") {
+ Error.captureStackTrace(this, peg$SyntaxError);
+ }
}
-peg$subclass(SyntaxError, Error);
+peg$subclass(peg$SyntaxError, Error);
function parseMetaLine(input) {
var options = arguments.length > 1 ? arguments[1] : {},
+ parser = this,
peg$FAILED = {},
peg$startRuleFunctions = { line: peg$parseline },
peg$startRuleFunction = peg$parseline,
- peg$c0 = peg$FAILED,
- peg$c1 = "// @",
- peg$c2 = { type: "literal", value: "// @", description: "\"// @\"" },
- peg$c3 = null,
- peg$c4 = "\n",
- peg$c5 = { type: "literal", value: "\n", description: "\"\\n\"" },
- peg$c6 = function(meta) { return meta; },
- peg$c7 = [],
- peg$c8 = /^[ \t\n]/,
- peg$c9 = { type: "class", value: "[ \\t\\n]", description: "[ \\t\\n]" },
- peg$c10 = /^[^ \t\n]/,
- peg$c11 = { type: "class", value: "[^ \\t\\n]", description: "[^ \\t\\n]" },
- peg$c12 = /^[^\n]/,
- peg$c13 = { type: "class", value: "[^\\n]", description: "[^\\n]" },
- peg$c14 = "noframes",
- peg$c15 = { type: "literal", value: "noframes", description: "\"noframes\"" },
- peg$c16 = function(keyword) { return {keyword:keyword}; },
- peg$c17 = "downloadURL",
- peg$c18 = { type: "literal", value: "downloadURL", description: "\"downloadURL\"" },
- peg$c19 = "exclude",
- peg$c20 = { type: "literal", value: "exclude", description: "\"exclude\"" },
- peg$c21 = "grant",
- peg$c22 = { type: "literal", value: "grant", description: "\"grant\"" },
- peg$c23 = "icon",
- peg$c24 = { type: "literal", value: "icon", description: "\"icon\"" },
- peg$c25 = "include",
- peg$c26 = { type: "literal", value: "include", description: "\"include\"" },
- peg$c27 = "installURL",
- peg$c28 = { type: "literal", value: "installURL", description: "\"installURL\"" },
- peg$c29 = "match",
- peg$c30 = { type: "literal", value: "match", description: "\"match\"" },
- peg$c31 = "namespace",
- peg$c32 = { type: "literal", value: "namespace", description: "\"namespace\"" },
- peg$c33 = "require",
- peg$c34 = { type: "literal", value: "require", description: "\"require\"" },
- peg$c35 = "run-at",
- peg$c36 = { type: "literal", value: "run-at", description: "\"run-at\"" },
- peg$c37 = "updateURL",
- peg$c38 = { type: "literal", value: "updateURL", description: "\"updateURL\"" },
- peg$c39 = "version",
- peg$c40 = { type: "literal", value: "version", description: "\"version\"" },
- peg$c41 = function(keyword, value) { return {keyword:keyword, value:value}; },
- peg$c42 = "resource",
- peg$c43 = { type: "literal", value: "resource", description: "\"resource\"" },
- peg$c44 = function(keyword, value1, value2) { return {keyword:keyword, value1:value1, value2:value2}; },
- peg$c45 = "description",
- peg$c46 = { type: "literal", value: "description", description: "\"description\"" },
- peg$c47 = "name",
- peg$c48 = { type: "literal", value: "name", description: "\"name\"" },
- peg$c49 = ":",
- peg$c50 = { type: "literal", value: ":", description: "\":\"" },
- peg$c51 = /^[a-zA-Z\-]/,
- peg$c52 = { type: "class", value: "[a-zA-Z\\-]", description: "[a-zA-Z\\-]" },
- peg$c53 = function(localeValue) { return localeValue },
- peg$c54 = function(keyword, locale, value) { return {keyword:keyword, locale:locale, value:value}; },
+ peg$c0 = "// @",
+ peg$c1 = { type: "literal", value: "// @", description: "\"// @\"" },
+ peg$c2 = "\n",
+ peg$c3 = { type: "literal", value: "\n", description: "\"\\n\"" },
+ peg$c4 = function(meta) { return meta; },
+ peg$c5 = /^[ \t\n]/,
+ peg$c6 = { type: "class", value: "[ \\t\\n]", description: "[ \\t\\n]" },
+ peg$c7 = /^[^ \t\n]/,
+ peg$c8 = { type: "class", value: "[^ \\t\\n]", description: "[^ \\t\\n]" },
+ peg$c9 = /^[^\n]/,
+ peg$c10 = { type: "class", value: "[^\\n]", description: "[^\\n]" },
+ peg$c11 = "noframes",
+ peg$c12 = { type: "literal", value: "noframes", description: "\"noframes\"" },
+ peg$c13 = function(keyword) { return {keyword:keyword}; },
+ peg$c14 = "author",
+ peg$c15 = { type: "literal", value: "author", description: "\"author\"" },
+ peg$c16 = "downloadURL",
+ peg$c17 = { type: "literal", value: "downloadURL", description: "\"downloadURL\"" },
+ peg$c18 = "exclude",
+ peg$c19 = { type: "literal", value: "exclude", description: "\"exclude\"" },
+ peg$c20 = "grant",
+ peg$c21 = { type: "literal", value: "grant", description: "\"grant\"" },
+ peg$c22 = "homepageURL",
+ peg$c23 = { type: "literal", value: "homepageURL", description: "\"homepageURL\"" },
+ peg$c24 = "icon",
+ peg$c25 = { type: "literal", value: "icon", description: "\"icon\"" },
+ peg$c26 = "include",
+ peg$c27 = { type: "literal", value: "include", description: "\"include\"" },
+ peg$c28 = "installURL",
+ peg$c29 = { type: "literal", value: "installURL", description: "\"installURL\"" },
+ peg$c30 = "match",
+ peg$c31 = { type: "literal", value: "match", description: "\"match\"" },
+ peg$c32 = "namespace",
+ peg$c33 = { type: "literal", value: "namespace", description: "\"namespace\"" },
+ peg$c34 = "require",
+ peg$c35 = { type: "literal", value: "require", description: "\"require\"" },
+ peg$c36 = "run-at",
+ peg$c37 = { type: "literal", value: "run-at", description: "\"run-at\"" },
+ peg$c38 = "updateURL",
+ peg$c39 = { type: "literal", value: "updateURL", description: "\"updateURL\"" },
+ peg$c40 = "version",
+ peg$c41 = { type: "literal", value: "version", description: "\"version\"" },
+ peg$c42 = function(keyword, value) { return {keyword:keyword, value:value}; },
+ peg$c43 = "resource",
+ peg$c44 = { type: "literal", value: "resource", description: "\"resource\"" },
+ peg$c45 = function(keyword, value1, value2) { return {keyword:keyword, value1:value1, value2:value2}; },
+ peg$c46 = "description",
+ peg$c47 = { type: "literal", value: "description", description: "\"description\"" },
+ peg$c48 = "name",
+ peg$c49 = { type: "literal", value: "name", description: "\"name\"" },
+ peg$c50 = ":",
+ peg$c51 = { type: "literal", value: ":", description: "\":\"" },
+ peg$c52 = /^[a-zA-Z\-]/,
+ peg$c53 = { type: "class", value: "[a-zA-Z-]", description: "[a-zA-Z-]" },
+ peg$c54 = function(keyword, localeValue) { return localeValue },
+ peg$c55 = function(keyword, locale, value) { return {keyword:keyword, locale:locale, value:value}; },
peg$currPos = 0,
- peg$reportedPos = 0,
- peg$cachedPos = 0,
- peg$cachedPosDetails = { line: 1, column: 1, seenCR: false },
+ peg$savedPos = 0,
+ peg$posDetailsCache = [{ line: 1, column: 1, seenCR: false }],
peg$maxFailPos = 0,
peg$maxFailExpected = [],
peg$silentFails = 0,
@@ -108,38 +110,51 @@ function parseMetaLine(input) {
}
function text() {
- return input.substring(peg$reportedPos, peg$currPos);
- }
-
- function offset() {
- return peg$reportedPos;
+ return input.substring(peg$savedPos, peg$currPos);
}
- function line() {
- return peg$computePosDetails(peg$reportedPos).line;
- }
-
- function column() {
- return peg$computePosDetails(peg$reportedPos).column;
+ function location() {
+ return peg$computeLocation(peg$savedPos, peg$currPos);
}
function expected(description) {
throw peg$buildException(
null,
[{ type: "other", description: description }],
- peg$reportedPos
+ input.substring(peg$savedPos, peg$currPos),
+ peg$computeLocation(peg$savedPos, peg$currPos)
);
}
function error(message) {
- throw peg$buildException(message, null, peg$reportedPos);
+ throw peg$buildException(
+ message,
+ null,
+ input.substring(peg$savedPos, peg$currPos),
+ peg$computeLocation(peg$savedPos, peg$currPos)
+ );
}
function peg$computePosDetails(pos) {
- function advance(details, startPos, endPos) {
- var p, ch;
+ var details = peg$posDetailsCache[pos],
+ p, ch;
- for (p = startPos; p < endPos; p++) {
+ if (details) {
+ return details;
+ } else {
+ p = pos - 1;
+ while (!peg$posDetailsCache[p]) {
+ p--;
+ }
+
+ details = peg$posDetailsCache[p];
+ details = {
+ line: details.line,
+ column: details.column,
+ seenCR: details.seenCR
+ };
+
+ while (p < pos) {
ch = input.charAt(p);
if (ch === "\n") {
if (!details.seenCR) { details.line++; }
@@ -153,19 +168,31 @@ function parseMetaLine(input) {
details.column++;
details.seenCR = false;
}
- }
- }
- if (peg$cachedPos !== pos) {
- if (peg$cachedPos > pos) {
- peg$cachedPos = 0;
- peg$cachedPosDetails = { line: 1, column: 1, seenCR: false };
+ p++;
}
- advance(peg$cachedPosDetails, peg$cachedPos, pos);
- peg$cachedPos = pos;
+
+ peg$posDetailsCache[pos] = details;
+ return details;
}
+ }
- return peg$cachedPosDetails;
+ function peg$computeLocation(startPos, endPos) {
+ var startPosDetails = peg$computePosDetails(startPos),
+ endPosDetails = peg$computePosDetails(endPos);
+
+ return {
+ start: {
+ offset: startPos,
+ line: startPosDetails.line,
+ column: startPosDetails.column
+ },
+ end: {
+ offset: endPos,
+ line: endPosDetails.line,
+ column: endPosDetails.column
+ }
+ };
}
function peg$fail(expected) {
@@ -179,7 +206,7 @@ function parseMetaLine(input) {
peg$maxFailExpected.push(expected);
}
- function peg$buildException(message, expected, pos) {
+ function peg$buildException(message, expected, found, location) {
function cleanupExpected(expected) {
var i = 1;
@@ -216,8 +243,8 @@ function parseMetaLine(input) {
.replace(/\r/g, '\\r')
.replace(/[\x00-\x07\x0B\x0E\x0F]/g, function(ch) { return '\\x0' + hex(ch); })
.replace(/[\x10-\x1F\x80-\xFF]/g, function(ch) { return '\\x' + hex(ch); })
- .replace(/[\u0180-\u0FFF]/g, function(ch) { return '\\u0' + hex(ch); })
- .replace(/[\u1080-\uFFFF]/g, function(ch) { return '\\u' + hex(ch); });
+ .replace(/[\u0100-\u0FFF]/g, function(ch) { return '\\u0' + hex(ch); })
+ .replace(/[\u1000-\uFFFF]/g, function(ch) { return '\\u' + hex(ch); });
}
var expectedDescs = new Array(expected.length),
@@ -238,20 +265,15 @@ function parseMetaLine(input) {
return "Expected " + expectedDesc + " but " + foundDesc + " found.";
}
- var posDetails = peg$computePosDetails(pos),
- found = pos < input.length ? input.charAt(pos) : null;
-
if (expected !== null) {
cleanupExpected(expected);
}
- return new SyntaxError(
+ return new peg$SyntaxError(
message !== null ? message : buildMessage(expected, found),
expected,
found,
- pos,
- posDetails.line,
- posDetails.column
+ location
);
}
@@ -259,12 +281,12 @@ function parseMetaLine(input) {
var s0, s1, s2, s3;
s0 = peg$currPos;
- if (input.substr(peg$currPos, 4) === peg$c1) {
- s1 = peg$c1;
+ if (input.substr(peg$currPos, 4) === peg$c0) {
+ s1 = peg$c0;
peg$currPos += 4;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c2); }
+ if (peg$silentFails === 0) { peg$fail(peg$c1); }
}
if (s1 !== peg$FAILED) {
s2 = peg$parsekeyword0();
@@ -279,30 +301,30 @@ function parseMetaLine(input) {
}
if (s2 !== peg$FAILED) {
if (input.charCodeAt(peg$currPos) === 10) {
- s3 = peg$c4;
+ s3 = peg$c2;
peg$currPos++;
} else {
s3 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c5); }
+ if (peg$silentFails === 0) { peg$fail(peg$c3); }
}
if (s3 === peg$FAILED) {
- s3 = peg$c3;
+ s3 = null;
}
if (s3 !== peg$FAILED) {
- peg$reportedPos = s0;
- s1 = peg$c6(s2);
+ peg$savedPos = s0;
+ s1 = peg$c4(s2);
s0 = s1;
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
return s0;
@@ -312,26 +334,26 @@ function parseMetaLine(input) {
var s0, s1;
s0 = [];
- if (peg$c8.test(input.charAt(peg$currPos))) {
+ if (peg$c5.test(input.charAt(peg$currPos))) {
s1 = input.charAt(peg$currPos);
peg$currPos++;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c9); }
+ if (peg$silentFails === 0) { peg$fail(peg$c6); }
}
if (s1 !== peg$FAILED) {
while (s1 !== peg$FAILED) {
s0.push(s1);
- if (peg$c8.test(input.charAt(peg$currPos))) {
+ if (peg$c5.test(input.charAt(peg$currPos))) {
s1 = input.charAt(peg$currPos);
peg$currPos++;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c9); }
+ if (peg$silentFails === 0) { peg$fail(peg$c6); }
}
}
} else {
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
return s0;
@@ -342,31 +364,32 @@ function parseMetaLine(input) {
s0 = peg$currPos;
s1 = [];
- if (peg$c10.test(input.charAt(peg$currPos))) {
+ if (peg$c7.test(input.charAt(peg$currPos))) {
s2 = input.charAt(peg$currPos);
peg$currPos++;
} else {
s2 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c11); }
+ if (peg$silentFails === 0) { peg$fail(peg$c8); }
}
if (s2 !== peg$FAILED) {
while (s2 !== peg$FAILED) {
s1.push(s2);
- if (peg$c10.test(input.charAt(peg$currPos))) {
+ if (peg$c7.test(input.charAt(peg$currPos))) {
s2 = input.charAt(peg$currPos);
peg$currPos++;
} else {
s2 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c11); }
+ if (peg$silentFails === 0) { peg$fail(peg$c8); }
}
}
} else {
- s1 = peg$c0;
+ s1 = peg$FAILED;
}
if (s1 !== peg$FAILED) {
- s1 = input.substring(s0, peg$currPos);
+ s0 = input.substring(s0, peg$currPos);
+ } else {
+ s0 = s1;
}
- s0 = s1;
return s0;
}
@@ -376,31 +399,32 @@ function parseMetaLine(input) {
s0 = peg$currPos;
s1 = [];
- if (peg$c12.test(input.charAt(peg$currPos))) {
+ if (peg$c9.test(input.charAt(peg$currPos))) {
s2 = input.charAt(peg$currPos);
peg$currPos++;
} else {
s2 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c13); }
+ if (peg$silentFails === 0) { peg$fail(peg$c10); }
}
if (s2 !== peg$FAILED) {
while (s2 !== peg$FAILED) {
s1.push(s2);
- if (peg$c12.test(input.charAt(peg$currPos))) {
+ if (peg$c9.test(input.charAt(peg$currPos))) {
s2 = input.charAt(peg$currPos);
peg$currPos++;
} else {
s2 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c13); }
+ if (peg$silentFails === 0) { peg$fail(peg$c10); }
}
}
} else {
- s1 = peg$c0;
+ s1 = peg$FAILED;
}
if (s1 !== peg$FAILED) {
- s1 = input.substring(s0, peg$currPos);
+ s0 = input.substring(s0, peg$currPos);
+ } else {
+ s0 = s1;
}
- s0 = s1;
return s0;
}
@@ -409,16 +433,16 @@ function parseMetaLine(input) {
var s0, s1;
s0 = peg$currPos;
- if (input.substr(peg$currPos, 8) === peg$c14) {
- s1 = peg$c14;
+ if (input.substr(peg$currPos, 8) === peg$c11) {
+ s1 = peg$c11;
peg$currPos += 8;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c15); }
+ if (peg$silentFails === 0) { peg$fail(peg$c12); }
}
if (s1 !== peg$FAILED) {
- peg$reportedPos = s0;
- s1 = peg$c16(s1);
+ peg$savedPos = s0;
+ s1 = peg$c13(s1);
}
s0 = s1;
@@ -429,100 +453,118 @@ function parseMetaLine(input) {
var s0, s1, s2, s3;
s0 = peg$currPos;
- if (input.substr(peg$currPos, 11) === peg$c17) {
- s1 = peg$c17;
- peg$currPos += 11;
+ if (input.substr(peg$currPos, 6) === peg$c14) {
+ s1 = peg$c14;
+ peg$currPos += 6;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c18); }
+ if (peg$silentFails === 0) { peg$fail(peg$c15); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 7) === peg$c19) {
- s1 = peg$c19;
- peg$currPos += 7;
+ if (input.substr(peg$currPos, 11) === peg$c16) {
+ s1 = peg$c16;
+ peg$currPos += 11;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c20); }
+ if (peg$silentFails === 0) { peg$fail(peg$c17); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 5) === peg$c21) {
- s1 = peg$c21;
- peg$currPos += 5;
+ if (input.substr(peg$currPos, 7) === peg$c18) {
+ s1 = peg$c18;
+ peg$currPos += 7;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c22); }
+ if (peg$silentFails === 0) { peg$fail(peg$c19); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 4) === peg$c23) {
- s1 = peg$c23;
- peg$currPos += 4;
+ if (input.substr(peg$currPos, 5) === peg$c20) {
+ s1 = peg$c20;
+ peg$currPos += 5;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c24); }
+ if (peg$silentFails === 0) { peg$fail(peg$c21); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 7) === peg$c25) {
- s1 = peg$c25;
- peg$currPos += 7;
+ if (input.substr(peg$currPos, 11) === peg$c22) {
+ s1 = peg$c22;
+ peg$currPos += 11;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c26); }
+ if (peg$silentFails === 0) { peg$fail(peg$c23); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 10) === peg$c27) {
- s1 = peg$c27;
- peg$currPos += 10;
+ if (input.substr(peg$currPos, 4) === peg$c24) {
+ s1 = peg$c24;
+ peg$currPos += 4;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c28); }
+ if (peg$silentFails === 0) { peg$fail(peg$c25); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 5) === peg$c29) {
- s1 = peg$c29;
- peg$currPos += 5;
+ if (input.substr(peg$currPos, 7) === peg$c26) {
+ s1 = peg$c26;
+ peg$currPos += 7;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c30); }
+ if (peg$silentFails === 0) { peg$fail(peg$c27); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 9) === peg$c31) {
- s1 = peg$c31;
- peg$currPos += 9;
+ if (input.substr(peg$currPos, 10) === peg$c28) {
+ s1 = peg$c28;
+ peg$currPos += 10;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c32); }
+ if (peg$silentFails === 0) { peg$fail(peg$c29); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 7) === peg$c33) {
- s1 = peg$c33;
- peg$currPos += 7;
+ if (input.substr(peg$currPos, 5) === peg$c30) {
+ s1 = peg$c30;
+ peg$currPos += 5;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c34); }
+ if (peg$silentFails === 0) { peg$fail(peg$c31); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 6) === peg$c35) {
- s1 = peg$c35;
- peg$currPos += 6;
+ if (input.substr(peg$currPos, 9) === peg$c32) {
+ s1 = peg$c32;
+ peg$currPos += 9;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c36); }
+ if (peg$silentFails === 0) { peg$fail(peg$c33); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 9) === peg$c37) {
- s1 = peg$c37;
- peg$currPos += 9;
+ if (input.substr(peg$currPos, 7) === peg$c34) {
+ s1 = peg$c34;
+ peg$currPos += 7;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c38); }
+ if (peg$silentFails === 0) { peg$fail(peg$c35); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 7) === peg$c39) {
- s1 = peg$c39;
- peg$currPos += 7;
+ if (input.substr(peg$currPos, 6) === peg$c36) {
+ s1 = peg$c36;
+ peg$currPos += 6;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c40); }
+ if (peg$silentFails === 0) { peg$fail(peg$c37); }
+ }
+ if (s1 === peg$FAILED) {
+ if (input.substr(peg$currPos, 9) === peg$c38) {
+ s1 = peg$c38;
+ peg$currPos += 9;
+ } else {
+ s1 = peg$FAILED;
+ if (peg$silentFails === 0) { peg$fail(peg$c39); }
+ }
+ if (s1 === peg$FAILED) {
+ if (input.substr(peg$currPos, 7) === peg$c40) {
+ s1 = peg$c40;
+ peg$currPos += 7;
+ } else {
+ s1 = peg$FAILED;
+ if (peg$silentFails === 0) { peg$fail(peg$c41); }
+ }
+ }
}
}
}
@@ -540,20 +582,20 @@ function parseMetaLine(input) {
if (s2 !== peg$FAILED) {
s3 = peg$parsenon_newline();
if (s3 !== peg$FAILED) {
- peg$reportedPos = s0;
- s1 = peg$c41(s1, s3);
+ peg$savedPos = s0;
+ s1 = peg$c42(s1, s3);
s0 = s1;
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
return s0;
@@ -563,12 +605,12 @@ function parseMetaLine(input) {
var s0, s1, s2, s3, s4, s5;
s0 = peg$currPos;
- if (input.substr(peg$currPos, 8) === peg$c42) {
- s1 = peg$c42;
+ if (input.substr(peg$currPos, 8) === peg$c43) {
+ s1 = peg$c43;
peg$currPos += 8;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c43); }
+ if (peg$silentFails === 0) { peg$fail(peg$c44); }
}
if (s1 !== peg$FAILED) {
s2 = peg$parsewhitespace();
@@ -579,28 +621,28 @@ function parseMetaLine(input) {
if (s4 !== peg$FAILED) {
s5 = peg$parsenon_newline();
if (s5 !== peg$FAILED) {
- peg$reportedPos = s0;
- s1 = peg$c44(s1, s3, s5);
+ peg$savedPos = s0;
+ s1 = peg$c45(s1, s3, s5);
s0 = s1;
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
return s0;
@@ -610,97 +652,98 @@ function parseMetaLine(input) {
var s0, s1, s2, s3, s4, s5, s6;
s0 = peg$currPos;
- if (input.substr(peg$currPos, 11) === peg$c45) {
- s1 = peg$c45;
+ if (input.substr(peg$currPos, 11) === peg$c46) {
+ s1 = peg$c46;
peg$currPos += 11;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c46); }
+ if (peg$silentFails === 0) { peg$fail(peg$c47); }
}
if (s1 === peg$FAILED) {
- if (input.substr(peg$currPos, 4) === peg$c47) {
- s1 = peg$c47;
+ if (input.substr(peg$currPos, 4) === peg$c48) {
+ s1 = peg$c48;
peg$currPos += 4;
} else {
s1 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c48); }
+ if (peg$silentFails === 0) { peg$fail(peg$c49); }
}
}
if (s1 !== peg$FAILED) {
s2 = peg$currPos;
if (input.charCodeAt(peg$currPos) === 58) {
- s3 = peg$c49;
+ s3 = peg$c50;
peg$currPos++;
} else {
s3 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c50); }
+ if (peg$silentFails === 0) { peg$fail(peg$c51); }
}
if (s3 !== peg$FAILED) {
s4 = peg$currPos;
s5 = [];
- if (peg$c51.test(input.charAt(peg$currPos))) {
+ if (peg$c52.test(input.charAt(peg$currPos))) {
s6 = input.charAt(peg$currPos);
peg$currPos++;
} else {
s6 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c52); }
+ if (peg$silentFails === 0) { peg$fail(peg$c53); }
}
if (s6 !== peg$FAILED) {
while (s6 !== peg$FAILED) {
s5.push(s6);
- if (peg$c51.test(input.charAt(peg$currPos))) {
+ if (peg$c52.test(input.charAt(peg$currPos))) {
s6 = input.charAt(peg$currPos);
peg$currPos++;
} else {
s6 = peg$FAILED;
- if (peg$silentFails === 0) { peg$fail(peg$c52); }
+ if (peg$silentFails === 0) { peg$fail(peg$c53); }
}
}
} else {
- s5 = peg$c0;
+ s5 = peg$FAILED;
}
if (s5 !== peg$FAILED) {
- s5 = input.substring(s4, peg$currPos);
+ s4 = input.substring(s4, peg$currPos);
+ } else {
+ s4 = s5;
}
- s4 = s5;
if (s4 !== peg$FAILED) {
- peg$reportedPos = s2;
- s3 = peg$c53(s4);
+ peg$savedPos = s2;
+ s3 = peg$c54(s1, s4);
s2 = s3;
} else {
peg$currPos = s2;
- s2 = peg$c0;
+ s2 = peg$FAILED;
}
} else {
peg$currPos = s2;
- s2 = peg$c0;
+ s2 = peg$FAILED;
}
if (s2 === peg$FAILED) {
- s2 = peg$c3;
+ s2 = null;
}
if (s2 !== peg$FAILED) {
s3 = peg$parsewhitespace();
if (s3 !== peg$FAILED) {
s4 = peg$parsenon_newline();
if (s4 !== peg$FAILED) {
- peg$reportedPos = s0;
- s1 = peg$c54(s1, s2, s4);
+ peg$savedPos = s0;
+ s1 = peg$c55(s1, s2, s4);
s0 = s1;
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
} else {
peg$currPos = s0;
- s0 = peg$c0;
+ s0 = peg$FAILED;
}
return s0;
@@ -715,6 +758,13 @@ function parseMetaLine(input) {
peg$fail({ type: "end", description: "end of input" });
}
- throw peg$buildException(null, peg$maxFailExpected, peg$maxFailPos);
+ throw peg$buildException(
+ null,
+ peg$maxFailExpected,
+ peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+ peg$maxFailPos < input.length
+ ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+ : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+ );
}
}
diff --git a/peg.txt b/peg.txt
index 3c72cfc..d067c31 100644
--- a/peg.txt
+++ b/peg.txt
@@ -57,9 +57,11 @@ keyword0 =
keyword1 =
keyword:(
+ "author" /
"downloadURL" /
"exclude" /
"grant" /
+ "homepageURL" /
"icon" /
"include" /
"installURL" /
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/greasemonkey.git
More information about the Pkg-mozext-commits
mailing list