* Update ACS parser PEG.js script to include some missing functionality
* Regenerate acs_parser.js with latest pegjs & new rules
This commit is contained in:
Bryan Ashby
parent
79c1ad6ce6
commit
9a2b48ac47
|
|
@ -1,19 +1,18 @@
|
|||
module.exports = (function() {
|
||||
"use strict";
|
||||
|
||||
/*
|
||||
* Generated by PEG.js 0.9.0.
|
||||
/*
|
||||
* Generated by PEG.js 0.10.0.
|
||||
*
|
||||
* http://pegjs.org/
|
||||
*/
|
||||
|
||||
function peg$subclass(child, parent) {
|
||||
"use strict";
|
||||
|
||||
function peg$subclass(child, parent) {
|
||||
function ctor() { this.constructor = child; }
|
||||
ctor.prototype = parent.prototype;
|
||||
child.prototype = new ctor();
|
||||
}
|
||||
}
|
||||
|
||||
function peg$SyntaxError(message, expected, found, location) {
|
||||
function peg$SyntaxError(message, expected, found, location) {
|
||||
this.message = message;
|
||||
this.expected = expected;
|
||||
this.found = found;
|
||||
|
|
@ -23,58 +22,164 @@ module.exports = (function() {
|
|||
if (typeof Error.captureStackTrace === "function") {
|
||||
Error.captureStackTrace(this, peg$SyntaxError);
|
||||
}
|
||||
}
|
||||
|
||||
peg$subclass(peg$SyntaxError, Error);
|
||||
|
||||
peg$SyntaxError.buildMessage = function(expected, found) {
|
||||
var DESCRIBE_EXPECTATION_FNS = {
|
||||
literal: function(expectation) {
|
||||
return "\"" + literalEscape(expectation.text) + "\"";
|
||||
},
|
||||
|
||||
"class": function(expectation) {
|
||||
var escapedParts = "",
|
||||
i;
|
||||
|
||||
for (i = 0; i < expectation.parts.length; i++) {
|
||||
escapedParts += expectation.parts[i] instanceof Array
|
||||
? classEscape(expectation.parts[i][0]) + "-" + classEscape(expectation.parts[i][1])
|
||||
: classEscape(expectation.parts[i]);
|
||||
}
|
||||
|
||||
peg$subclass(peg$SyntaxError, Error);
|
||||
return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]";
|
||||
},
|
||||
|
||||
function peg$parse(input) {
|
||||
var options = arguments.length > 1 ? arguments[1] : {},
|
||||
parser = this,
|
||||
any: function(expectation) {
|
||||
return "any character";
|
||||
},
|
||||
|
||||
peg$FAILED = {},
|
||||
end: function(expectation) {
|
||||
return "end of input";
|
||||
},
|
||||
|
||||
other: function(expectation) {
|
||||
return expectation.description;
|
||||
}
|
||||
};
|
||||
|
||||
function hex(ch) {
|
||||
return ch.charCodeAt(0).toString(16).toUpperCase();
|
||||
}
|
||||
|
||||
function literalEscape(s) {
|
||||
return s
|
||||
.replace(/\\/g, '\\\\')
|
||||
.replace(/"/g, '\\"')
|
||||
.replace(/\0/g, '\\0')
|
||||
.replace(/\t/g, '\\t')
|
||||
.replace(/\n/g, '\\n')
|
||||
.replace(/\r/g, '\\r')
|
||||
.replace(/[\x00-\x0F]/g, function(ch) { return '\\x0' + hex(ch); })
|
||||
.replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x' + hex(ch); });
|
||||
}
|
||||
|
||||
function classEscape(s) {
|
||||
return s
|
||||
.replace(/\\/g, '\\\\')
|
||||
.replace(/\]/g, '\\]')
|
||||
.replace(/\^/g, '\\^')
|
||||
.replace(/-/g, '\\-')
|
||||
.replace(/\0/g, '\\0')
|
||||
.replace(/\t/g, '\\t')
|
||||
.replace(/\n/g, '\\n')
|
||||
.replace(/\r/g, '\\r')
|
||||
.replace(/[\x00-\x0F]/g, function(ch) { return '\\x0' + hex(ch); })
|
||||
.replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x' + hex(ch); });
|
||||
}
|
||||
|
||||
function describeExpectation(expectation) {
|
||||
return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
|
||||
}
|
||||
|
||||
function describeExpected(expected) {
|
||||
var descriptions = new Array(expected.length),
|
||||
i, j;
|
||||
|
||||
for (i = 0; i < expected.length; i++) {
|
||||
descriptions[i] = describeExpectation(expected[i]);
|
||||
}
|
||||
|
||||
descriptions.sort();
|
||||
|
||||
if (descriptions.length > 0) {
|
||||
for (i = 1, j = 1; i < descriptions.length; i++) {
|
||||
if (descriptions[i - 1] !== descriptions[i]) {
|
||||
descriptions[j] = descriptions[i];
|
||||
j++;
|
||||
}
|
||||
}
|
||||
descriptions.length = j;
|
||||
}
|
||||
|
||||
switch (descriptions.length) {
|
||||
case 1:
|
||||
return descriptions[0];
|
||||
|
||||
case 2:
|
||||
return descriptions[0] + " or " + descriptions[1];
|
||||
|
||||
default:
|
||||
return descriptions.slice(0, -1).join(", ")
|
||||
+ ", or "
|
||||
+ descriptions[descriptions.length - 1];
|
||||
}
|
||||
}
|
||||
|
||||
function describeFound(found) {
|
||||
return found ? "\"" + literalEscape(found) + "\"" : "end of input";
|
||||
}
|
||||
|
||||
return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
|
||||
};
|
||||
|
||||
function peg$parse(input, options) {
|
||||
options = options !== void 0 ? options : {};
|
||||
|
||||
var peg$FAILED = {},
|
||||
|
||||
peg$startRuleFunctions = { start: peg$parsestart },
|
||||
peg$startRuleFunction = peg$parsestart,
|
||||
|
||||
peg$c0 = "|",
|
||||
peg$c1 = { type: "literal", value: "|", description: "\"|\"" },
|
||||
peg$c1 = peg$literalExpectation("|", false),
|
||||
peg$c2 = "&",
|
||||
peg$c3 = { type: "literal", value: "&", description: "\"&\"" },
|
||||
peg$c3 = peg$literalExpectation("&", false),
|
||||
peg$c4 = "!",
|
||||
peg$c5 = { type: "literal", value: "!", description: "\"!\"" },
|
||||
peg$c5 = peg$literalExpectation("!", false),
|
||||
peg$c6 = "(",
|
||||
peg$c7 = { type: "literal", value: "(", description: "\"(\"" },
|
||||
peg$c7 = peg$literalExpectation("(", false),
|
||||
peg$c8 = ")",
|
||||
peg$c9 = { type: "literal", value: ")", description: "\")\"" },
|
||||
peg$c9 = peg$literalExpectation(")", false),
|
||||
peg$c10 = function(left, right) { return left || right; },
|
||||
peg$c11 = function(left, right) { return left && right; },
|
||||
peg$c12 = function(value) { return !value; },
|
||||
peg$c13 = function(value) { return value; },
|
||||
peg$c14 = ",",
|
||||
peg$c15 = { type: "literal", value: ",", description: "\",\"" },
|
||||
peg$c15 = peg$literalExpectation(",", false),
|
||||
peg$c16 = " ",
|
||||
peg$c17 = { type: "literal", value: " ", description: "\" \"" },
|
||||
peg$c17 = peg$literalExpectation(" ", false),
|
||||
peg$c18 = "[",
|
||||
peg$c19 = { type: "literal", value: "[", description: "\"[\"" },
|
||||
peg$c19 = peg$literalExpectation("[", false),
|
||||
peg$c20 = "]",
|
||||
peg$c21 = { type: "literal", value: "]", description: "\"]\"" },
|
||||
peg$c21 = peg$literalExpectation("]", false),
|
||||
peg$c22 = function(acs, a) { return checkAccess(acs, a); },
|
||||
peg$c23 = /^[A-Z]/,
|
||||
peg$c24 = { type: "class", value: "[A-Z]", description: "[A-Z]" },
|
||||
peg$c24 = peg$classExpectation([["A", "Z"]], false, false),
|
||||
peg$c25 = function(c) { return c.join(''); },
|
||||
peg$c26 = /^[A-Za-z0-9\-_+]/,
|
||||
peg$c27 = { type: "class", value: "[A-Za-z0-9\\-_\\+]", description: "[A-Za-z0-9\\-_\\+]" },
|
||||
peg$c27 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "-", "_", "+"], false, false),
|
||||
peg$c28 = function(a) { return a.join('') },
|
||||
peg$c29 = function(v) { return v; },
|
||||
peg$c30 = function(start, last) { return start.concat(last); },
|
||||
peg$c31 = function(l) { return l; },
|
||||
peg$c32 = /^[0-9]/,
|
||||
peg$c33 = { type: "class", value: "[0-9]", description: "[0-9]" },
|
||||
peg$c33 = peg$classExpectation([["0", "9"]], false, false),
|
||||
peg$c34 = function(d) { return parseInt(d.join(''), 10); },
|
||||
|
||||
peg$currPos = 0,
|
||||
peg$savedPos = 0,
|
||||
peg$posDetailsCache = [{ line: 1, column: 1, seenCR: false }],
|
||||
peg$posDetailsCache = [{ line: 1, column: 1 }],
|
||||
peg$maxFailPos = 0,
|
||||
peg$maxFailExpected = [],
|
||||
peg$silentFails = 0,
|
||||
|
|
@ -97,27 +202,44 @@ module.exports = (function() {
|
|||
return peg$computeLocation(peg$savedPos, peg$currPos);
|
||||
}
|
||||
|
||||
function expected(description) {
|
||||
throw peg$buildException(
|
||||
null,
|
||||
[{ type: "other", description: description }],
|
||||
function expected(description, location) {
|
||||
location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
|
||||
|
||||
throw peg$buildStructuredError(
|
||||
[peg$otherExpectation(description)],
|
||||
input.substring(peg$savedPos, peg$currPos),
|
||||
peg$computeLocation(peg$savedPos, peg$currPos)
|
||||
location
|
||||
);
|
||||
}
|
||||
|
||||
function error(message) {
|
||||
throw peg$buildException(
|
||||
message,
|
||||
null,
|
||||
input.substring(peg$savedPos, peg$currPos),
|
||||
peg$computeLocation(peg$savedPos, peg$currPos)
|
||||
);
|
||||
function error(message, location) {
|
||||
location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
|
||||
|
||||
throw peg$buildSimpleError(message, location);
|
||||
}
|
||||
|
||||
function peg$literalExpectation(text, ignoreCase) {
|
||||
return { type: "literal", text: text, ignoreCase: ignoreCase };
|
||||
}
|
||||
|
||||
function peg$classExpectation(parts, inverted, ignoreCase) {
|
||||
return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
|
||||
}
|
||||
|
||||
function peg$anyExpectation() {
|
||||
return { type: "any" };
|
||||
}
|
||||
|
||||
function peg$endExpectation() {
|
||||
return { type: "end" };
|
||||
}
|
||||
|
||||
function peg$otherExpectation(description) {
|
||||
return { type: "other", description: description };
|
||||
}
|
||||
|
||||
function peg$computePosDetails(pos) {
|
||||
var details = peg$posDetailsCache[pos],
|
||||
p, ch;
|
||||
var details = peg$posDetailsCache[pos], p;
|
||||
|
||||
if (details) {
|
||||
return details;
|
||||
|
|
@ -130,23 +252,15 @@ module.exports = (function() {
|
|||
details = peg$posDetailsCache[p];
|
||||
details = {
|
||||
line: details.line,
|
||||
column: details.column,
|
||||
seenCR: details.seenCR
|
||||
column: details.column
|
||||
};
|
||||
|
||||
while (p < pos) {
|
||||
ch = input.charAt(p);
|
||||
if (ch === "\n") {
|
||||
if (!details.seenCR) { details.line++; }
|
||||
details.column = 1;
|
||||
details.seenCR = false;
|
||||
} else if (ch === "\r" || ch === "\u2028" || ch === "\u2029") {
|
||||
if (input.charCodeAt(p) === 10) {
|
||||
details.line++;
|
||||
details.column = 1;
|
||||
details.seenCR = true;
|
||||
} else {
|
||||
details.column++;
|
||||
details.seenCR = false;
|
||||
}
|
||||
|
||||
p++;
|
||||
|
|
@ -186,71 +300,13 @@ module.exports = (function() {
|
|||
peg$maxFailExpected.push(expected);
|
||||
}
|
||||
|
||||
function peg$buildException(message, expected, found, location) {
|
||||
function cleanupExpected(expected) {
|
||||
var i = 1;
|
||||
|
||||
expected.sort(function(a, b) {
|
||||
if (a.description < b.description) {
|
||||
return -1;
|
||||
} else if (a.description > b.description) {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
});
|
||||
|
||||
while (i < expected.length) {
|
||||
if (expected[i - 1] === expected[i]) {
|
||||
expected.splice(i, 1);
|
||||
} else {
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function buildMessage(expected, found) {
|
||||
function stringEscape(s) {
|
||||
function hex(ch) { return ch.charCodeAt(0).toString(16).toUpperCase(); }
|
||||
|
||||
return s
|
||||
.replace(/\\/g, '\\\\')
|
||||
.replace(/"/g, '\\"')
|
||||
.replace(/\x08/g, '\\b')
|
||||
.replace(/\t/g, '\\t')
|
||||
.replace(/\n/g, '\\n')
|
||||
.replace(/\f/g, '\\f')
|
||||
.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(/[\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),
|
||||
expectedDesc, foundDesc, i;
|
||||
|
||||
for (i = 0; i < expected.length; i++) {
|
||||
expectedDescs[i] = expected[i].description;
|
||||
}
|
||||
|
||||
expectedDesc = expected.length > 1
|
||||
? expectedDescs.slice(0, -1).join(", ")
|
||||
+ " or "
|
||||
+ expectedDescs[expected.length - 1]
|
||||
: expectedDescs[0];
|
||||
|
||||
foundDesc = found ? "\"" + stringEscape(found) + "\"" : "end of input";
|
||||
|
||||
return "Expected " + expectedDesc + " but " + foundDesc + " found.";
|
||||
}
|
||||
|
||||
if (expected !== null) {
|
||||
cleanupExpected(expected);
|
||||
function peg$buildSimpleError(message, location) {
|
||||
return new peg$SyntaxError(message, null, null, location);
|
||||
}
|
||||
|
||||
function peg$buildStructuredError(expected, found, location) {
|
||||
return new peg$SyntaxError(
|
||||
message !== null ? message : buildMessage(expected, found),
|
||||
peg$SyntaxError.buildMessage(expected, found),
|
||||
expected,
|
||||
found,
|
||||
location
|
||||
|
|
@ -832,12 +888,12 @@ module.exports = (function() {
|
|||
return client.node === value;
|
||||
},
|
||||
NP : function numberOfPosts() {
|
||||
// :TODO: implement me!!!!
|
||||
return false;
|
||||
const postCount = parseInt(user.properties.post_count, 10);
|
||||
return !isNaN(value) && postCount >= value;
|
||||
},
|
||||
NC : function numberOfCalls() {
|
||||
// :TODO: implement me!!
|
||||
return false;
|
||||
const loginCount = parseInt(user.properties.login_count, 10);
|
||||
return !isNaN(value) && loginCount >= value;
|
||||
},
|
||||
SC : function isSecureConnection() {
|
||||
return client.session.isSecure;
|
||||
|
|
@ -900,11 +956,10 @@ module.exports = (function() {
|
|||
return peg$result;
|
||||
} else {
|
||||
if (peg$result !== peg$FAILED && peg$currPos < input.length) {
|
||||
peg$fail({ type: "end", description: "end of input" });
|
||||
peg$fail(peg$endExpectation());
|
||||
}
|
||||
|
||||
throw peg$buildException(
|
||||
null,
|
||||
throw peg$buildStructuredError(
|
||||
peg$maxFailExpected,
|
||||
peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
|
||||
peg$maxFailPos < input.length
|
||||
|
|
@ -912,10 +967,9 @@ module.exports = (function() {
|
|||
: peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
module.exports = {
|
||||
SyntaxError: peg$SyntaxError,
|
||||
parse: peg$parse
|
||||
};
|
||||
})();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -44,12 +44,12 @@
|
|||
return client.node === value;
|
||||
},
|
||||
NP : function numberOfPosts() {
|
||||
// :TODO: implement me!!!!
|
||||
return false;
|
||||
const postCount = parseInt(user.properties.post_count, 10);
|
||||
return !isNaN(value) && postCount >= value;
|
||||
},
|
||||
NC : function numberOfCalls() {
|
||||
// :TODO: implement me!!
|
||||
return false;
|
||||
const loginCount = parseInt(user.properties.login_count, 10);
|
||||
return !isNaN(value) && loginCount >= value;
|
||||
},
|
||||
SC : function isSecureConnection() {
|
||||
return client.session.isSecure;
|
||||
|
|
|
|||
Loading…
Reference in New Issue