From 9a2b48ac474ffc3cc2b10ee822db5af19fc6ed88 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Fri, 24 Feb 2017 23:38:30 -0700 Subject: [PATCH] * Update ACS parser PEG.js script to include some missing functionality * Regenerate acs_parser.js with latest pegjs & new rules --- core/acs_parser.js | 1666 +++++++++++++++++++++-------------------- misc/acs_parser.pegjs | 8 +- 2 files changed, 864 insertions(+), 810 deletions(-) diff --git a/core/acs_parser.js b/core/acs_parser.js index 454e1ba5..36b9372a 100644 --- a/core/acs_parser.js +++ b/core/acs_parser.js @@ -1,417 +1,408 @@ -module.exports = (function() { - "use strict"; +/* + * Generated by PEG.js 0.10.0. + * + * http://pegjs.org/ + */ - /* - * Generated by PEG.js 0.9.0. - * - * http://pegjs.org/ - */ +"use strict"; - function peg$subclass(child, parent) { - function ctor() { this.constructor = child; } - ctor.prototype = parent.prototype; - child.prototype = new ctor(); +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) { + this.message = message; + this.expected = expected; + this.found = found; + this.location = location; + this.name = "SyntaxError"; + + if (typeof Error.captureStackTrace === "function") { + Error.captureStackTrace(this, peg$SyntaxError); } +} - function peg$SyntaxError(message, expected, found, location) { - this.message = message; - this.expected = expected; - this.found = found; - this.location = location; - this.name = "SyntaxError"; +peg$subclass(peg$SyntaxError, Error); - if (typeof Error.captureStackTrace === "function") { - Error.captureStackTrace(this, peg$SyntaxError); - } - } +peg$SyntaxError.buildMessage = function(expected, found) { + var DESCRIBE_EXPECTATION_FNS = { + literal: function(expectation) { + return "\"" + literalEscape(expectation.text) + "\""; + }, - peg$subclass(peg$SyntaxError, Error); + "class": function(expectation) { + var escapedParts = "", + i; - function peg$parse(input) { - var options = arguments.length > 1 ? arguments[1] : {}, - parser = this, - - peg$FAILED = {}, - - peg$startRuleFunctions = { start: peg$parsestart }, - peg$startRuleFunction = peg$parsestart, - - peg$c0 = "|", - peg$c1 = { type: "literal", value: "|", description: "\"|\"" }, - peg$c2 = "&", - peg$c3 = { type: "literal", value: "&", description: "\"&\"" }, - peg$c4 = "!", - peg$c5 = { type: "literal", value: "!", description: "\"!\"" }, - peg$c6 = "(", - peg$c7 = { type: "literal", value: "(", description: "\"(\"" }, - peg$c8 = ")", - peg$c9 = { type: "literal", value: ")", description: "\")\"" }, - 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$c16 = " ", - peg$c17 = { type: "literal", value: " ", description: "\" \"" }, - peg$c18 = "[", - peg$c19 = { type: "literal", value: "[", description: "\"[\"" }, - peg$c20 = "]", - peg$c21 = { type: "literal", value: "]", description: "\"]\"" }, - peg$c22 = function(acs, a) { return checkAccess(acs, a); }, - peg$c23 = /^[A-Z]/, - peg$c24 = { type: "class", value: "[A-Z]", description: "[A-Z]" }, - 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$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$c34 = function(d) { return parseInt(d.join(''), 10); }, - - peg$currPos = 0, - peg$savedPos = 0, - peg$posDetailsCache = [{ line: 1, column: 1, seenCR: false }], - peg$maxFailPos = 0, - peg$maxFailExpected = [], - peg$silentFails = 0, - - peg$result; - - if ("startRule" in options) { - if (!(options.startRule in peg$startRuleFunctions)) { - throw new Error("Can't start parsing from rule \"" + options.startRule + "\"."); - } - - peg$startRuleFunction = peg$startRuleFunctions[options.startRule]; - } - - function text() { - return input.substring(peg$savedPos, peg$currPos); - } - - function location() { - return peg$computeLocation(peg$savedPos, peg$currPos); - } - - function expected(description) { - throw peg$buildException( - null, - [{ type: "other", description: description }], - input.substring(peg$savedPos, peg$currPos), - peg$computeLocation(peg$savedPos, peg$currPos) - ); - } - - function error(message) { - throw peg$buildException( - message, - null, - input.substring(peg$savedPos, peg$currPos), - peg$computeLocation(peg$savedPos, peg$currPos) - ); - } - - function peg$computePosDetails(pos) { - var details = peg$posDetailsCache[pos], - p, ch; - - 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++; } - details.column = 1; - details.seenCR = false; - } else if (ch === "\r" || ch === "\u2028" || ch === "\u2029") { - details.line++; - details.column = 1; - details.seenCR = true; - } else { - details.column++; - details.seenCR = false; + 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]); } - p++; - } - - peg$posDetailsCache[pos] = details; - return details; - } - } - - function peg$computeLocation(startPos, endPos) { - var startPosDetails = peg$computePosDetails(startPos), - endPosDetails = peg$computePosDetails(endPos); - - return { - start: { - offset: startPos, - line: startPosDetails.line, - column: startPosDetails.column + return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]"; }, - end: { - offset: endPos, - line: endPosDetails.line, - column: endPosDetails.column + + any: function(expectation) { + return "any character"; + }, + + 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]); } - function peg$fail(expected) { - if (peg$currPos < peg$maxFailPos) { return; } + descriptions.sort(); - if (peg$currPos > peg$maxFailPos) { - peg$maxFailPos = peg$currPos; - peg$maxFailExpected = []; - } - - 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++; - } + if (descriptions.length > 0) { + for (i = 1, j = 1; i < descriptions.length; i++) { + if (descriptions[i - 1] !== descriptions[i]) { + descriptions[j] = descriptions[i]; + j++; } } - - 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); - } - - return new peg$SyntaxError( - message !== null ? message : buildMessage(expected, found), - expected, - found, - location - ); + descriptions.length = j; } - function peg$parsestart() { - var s0; + switch (descriptions.length) { + case 1: + return descriptions[0]; - s0 = peg$parseorExpr(); + case 2: + return descriptions[0] + " or " + descriptions[1]; - return s0; + 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 = peg$literalExpectation("|", false), + peg$c2 = "&", + peg$c3 = peg$literalExpectation("&", false), + peg$c4 = "!", + peg$c5 = peg$literalExpectation("!", false), + peg$c6 = "(", + peg$c7 = peg$literalExpectation("(", false), + peg$c8 = ")", + 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 = peg$literalExpectation(",", false), + peg$c16 = " ", + peg$c17 = peg$literalExpectation(" ", false), + peg$c18 = "[", + peg$c19 = peg$literalExpectation("[", false), + peg$c20 = "]", + peg$c21 = peg$literalExpectation("]", false), + peg$c22 = function(acs, a) { return checkAccess(acs, a); }, + peg$c23 = /^[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 = 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 = 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 }], + peg$maxFailPos = 0, + peg$maxFailExpected = [], + peg$silentFails = 0, + + peg$result; + + if ("startRule" in options) { + if (!(options.startRule in peg$startRuleFunctions)) { + throw new Error("Can't start parsing from rule \"" + options.startRule + "\"."); } - function peg$parseOR() { - var s0; + peg$startRuleFunction = peg$startRuleFunctions[options.startRule]; + } - if (input.charCodeAt(peg$currPos) === 124) { - s0 = peg$c0; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c1); } + function text() { + return input.substring(peg$savedPos, peg$currPos); + } + + function location() { + return peg$computeLocation(peg$savedPos, peg$currPos); + } + + 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), + location + ); + } + + 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; + + if (details) { + return details; + } else { + p = pos - 1; + while (!peg$posDetailsCache[p]) { + p--; } - return s0; - } + details = peg$posDetailsCache[p]; + details = { + line: details.line, + column: details.column + }; - function peg$parseAND() { - var s0; - - if (input.charCodeAt(peg$currPos) === 38) { - s0 = peg$c2; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c3); } - } - - return s0; - } - - function peg$parseNOT() { - var s0; - - if (input.charCodeAt(peg$currPos) === 33) { - s0 = peg$c4; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c5); } - } - - return s0; - } - - function peg$parsegroupOpen() { - var s0; - - if (input.charCodeAt(peg$currPos) === 40) { - s0 = peg$c6; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c7); } - } - - return s0; - } - - function peg$parsegroupClose() { - var s0; - - if (input.charCodeAt(peg$currPos) === 41) { - s0 = peg$c8; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c9); } - } - - return s0; - } - - function peg$parseorExpr() { - var s0, s1, s2, s3; - - s0 = peg$currPos; - s1 = peg$parseandExpr(); - if (s1 !== peg$FAILED) { - s2 = peg$parseOR(); - if (s2 !== peg$FAILED) { - s3 = peg$parseorExpr(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c10(s1, s3); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + while (p < pos) { + if (input.charCodeAt(p) === 10) { + details.line++; + details.column = 1; } else { - peg$currPos = s0; - s0 = peg$FAILED; + details.column++; } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parseandExpr(); + + p++; } - return s0; + peg$posDetailsCache[pos] = details; + return details; + } + } + + 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) { + if (peg$currPos < peg$maxFailPos) { return; } + + if (peg$currPos > peg$maxFailPos) { + peg$maxFailPos = peg$currPos; + peg$maxFailExpected = []; } - function peg$parseandExpr() { - var s0, s1, s2, s3; + peg$maxFailExpected.push(expected); + } - s0 = peg$currPos; - s1 = peg$parsenotExpr(); - if (s1 !== peg$FAILED) { - s2 = peg$parseAND(); - if (s2 === peg$FAILED) { - s2 = null; - } - if (s2 !== peg$FAILED) { - s3 = peg$parseorExpr(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c11(s1, s3); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parsenotExpr(); - } + function peg$buildSimpleError(message, location) { + return new peg$SyntaxError(message, null, null, location); + } - return s0; + function peg$buildStructuredError(expected, found, location) { + return new peg$SyntaxError( + peg$SyntaxError.buildMessage(expected, found), + expected, + found, + location + ); + } + + function peg$parsestart() { + var s0; + + s0 = peg$parseorExpr(); + + return s0; + } + + function peg$parseOR() { + var s0; + + if (input.charCodeAt(peg$currPos) === 124) { + s0 = peg$c0; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c1); } } - function peg$parsenotExpr() { - var s0, s1, s2; + return s0; + } - s0 = peg$currPos; - s1 = peg$parseNOT(); - if (s1 !== peg$FAILED) { - s2 = peg$parseatom(); - if (s2 !== peg$FAILED) { + function peg$parseAND() { + var s0; + + if (input.charCodeAt(peg$currPos) === 38) { + s0 = peg$c2; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c3); } + } + + return s0; + } + + function peg$parseNOT() { + var s0; + + if (input.charCodeAt(peg$currPos) === 33) { + s0 = peg$c4; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c5); } + } + + return s0; + } + + function peg$parsegroupOpen() { + var s0; + + if (input.charCodeAt(peg$currPos) === 40) { + s0 = peg$c6; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c7); } + } + + return s0; + } + + function peg$parsegroupClose() { + var s0; + + if (input.charCodeAt(peg$currPos) === 41) { + s0 = peg$c8; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c9); } + } + + return s0; + } + + function peg$parseorExpr() { + var s0, s1, s2, s3; + + s0 = peg$currPos; + s1 = peg$parseandExpr(); + if (s1 !== peg$FAILED) { + s2 = peg$parseOR(); + if (s2 !== peg$FAILED) { + s3 = peg$parseorExpr(); + if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c12(s2); + s1 = peg$c10(s1, s3); s0 = s1; } else { peg$currPos = s0; @@ -421,217 +412,312 @@ module.exports = (function() { peg$currPos = s0; s0 = peg$FAILED; } - if (s0 === peg$FAILED) { - s0 = peg$parseatom(); - } - - return s0; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$parseandExpr(); } - function peg$parseatom() { - var s0, s1, s2, s3; + return s0; + } - s0 = peg$parseacsCheck(); - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parsegroupOpen(); - if (s1 !== peg$FAILED) { - s2 = peg$parseorExpr(); - if (s2 !== peg$FAILED) { - s3 = peg$parsegroupClose(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c13(s2); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } + function peg$parseandExpr() { + var s0, s1, s2, s3; - return s0; - } - - function peg$parsecomma() { - var s0; - - if (input.charCodeAt(peg$currPos) === 44) { - s0 = peg$c14; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c15); } - } - - return s0; - } - - function peg$parsews() { - var s0; - - if (input.charCodeAt(peg$currPos) === 32) { - s0 = peg$c16; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c17); } - } - - return s0; - } - - function peg$parseoptWs() { - var s0, s1; - - s0 = []; - s1 = peg$parsews(); - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsews(); - } - - return s0; - } - - function peg$parselistOpen() { - var s0; - - if (input.charCodeAt(peg$currPos) === 91) { - s0 = peg$c18; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c19); } - } - - return s0; - } - - function peg$parselistClose() { - var s0; - - if (input.charCodeAt(peg$currPos) === 93) { - s0 = peg$c20; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c21); } - } - - return s0; - } - - function peg$parseacsCheck() { - var s0, s1, s2; - - s0 = peg$currPos; - s1 = peg$parseacsCode(); - if (s1 !== peg$FAILED) { - s2 = peg$parsearg(); - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c22(s1, s2); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - return s0; - } - - function peg$parseacsCode() { - var s0, s1, s2, s3; - - s0 = peg$currPos; - s1 = peg$currPos; - if (peg$c23.test(input.charAt(peg$currPos))) { - s2 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c24); } + s0 = peg$currPos; + s1 = peg$parsenotExpr(); + if (s1 !== peg$FAILED) { + s2 = peg$parseAND(); + if (s2 === peg$FAILED) { + s2 = null; } if (s2 !== peg$FAILED) { - if (peg$c23.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c24); } - } + s3 = peg$parseorExpr(); if (s3 !== peg$FAILED) { - s2 = [s2, s3]; - s1 = s2; + peg$savedPos = s0; + s1 = peg$c11(s1, s3); + s0 = s1; } else { - peg$currPos = s1; - s1 = peg$FAILED; + peg$currPos = s0; + s0 = peg$FAILED; } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$parsenotExpr(); + } + + return s0; + } + + function peg$parsenotExpr() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = peg$parseNOT(); + if (s1 !== peg$FAILED) { + s2 = peg$parseatom(); + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c12(s2); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$parseatom(); + } + + return s0; + } + + function peg$parseatom() { + var s0, s1, s2, s3; + + s0 = peg$parseacsCheck(); + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$parsegroupOpen(); + if (s1 !== peg$FAILED) { + s2 = peg$parseorExpr(); + if (s2 !== peg$FAILED) { + s3 = peg$parsegroupClose(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c13(s2); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } + + return s0; + } + + function peg$parsecomma() { + var s0; + + if (input.charCodeAt(peg$currPos) === 44) { + s0 = peg$c14; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c15); } + } + + return s0; + } + + function peg$parsews() { + var s0; + + if (input.charCodeAt(peg$currPos) === 32) { + s0 = peg$c16; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c17); } + } + + return s0; + } + + function peg$parseoptWs() { + var s0, s1; + + s0 = []; + s1 = peg$parsews(); + while (s1 !== peg$FAILED) { + s0.push(s1); + s1 = peg$parsews(); + } + + return s0; + } + + function peg$parselistOpen() { + var s0; + + if (input.charCodeAt(peg$currPos) === 91) { + s0 = peg$c18; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c19); } + } + + return s0; + } + + function peg$parselistClose() { + var s0; + + if (input.charCodeAt(peg$currPos) === 93) { + s0 = peg$c20; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c21); } + } + + return s0; + } + + function peg$parseacsCheck() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = peg$parseacsCode(); + if (s1 !== peg$FAILED) { + s2 = peg$parsearg(); + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c22(s1, s2); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseacsCode() { + var s0, s1, s2, s3; + + s0 = peg$currPos; + s1 = peg$currPos; + if (peg$c23.test(input.charAt(peg$currPos))) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c24); } + } + if (s2 !== peg$FAILED) { + if (peg$c23.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c24); } + } + if (s3 !== peg$FAILED) { + s2 = [s2, s3]; + s1 = s2; } else { peg$currPos = s1; s1 = peg$FAILED; } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c25(s1); - } - s0 = s1; - - return s0; + } else { + peg$currPos = s1; + s1 = peg$FAILED; } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c25(s1); + } + s0 = s1; - function peg$parseargVar() { - var s0, s1, s2; + return s0; + } - s0 = peg$currPos; - s1 = []; - if (peg$c26.test(input.charAt(peg$currPos))) { - s2 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c27); } + function peg$parseargVar() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = []; + if (peg$c26.test(input.charAt(peg$currPos))) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c27); } + } + if (s2 !== peg$FAILED) { + while (s2 !== peg$FAILED) { + s1.push(s2); + if (peg$c26.test(input.charAt(peg$currPos))) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c27); } + } } - if (s2 !== peg$FAILED) { - while (s2 !== peg$FAILED) { - s1.push(s2); - if (peg$c26.test(input.charAt(peg$currPos))) { - s2 = input.charAt(peg$currPos); - peg$currPos++; + } else { + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c28(s1); + } + s0 = s1; + + return s0; + } + + function peg$parsecommaList() { + var s0, s1, s2, s3, s4, s5, s6; + + s0 = peg$currPos; + s1 = []; + s2 = peg$currPos; + s3 = peg$parseargVar(); + if (s3 !== peg$FAILED) { + s4 = peg$parseoptWs(); + if (s4 !== peg$FAILED) { + s5 = peg$parsecomma(); + if (s5 !== peg$FAILED) { + s6 = peg$parseoptWs(); + if (s6 !== peg$FAILED) { + peg$savedPos = s2; + s3 = peg$c29(s3); + s2 = s3; } else { + peg$currPos = s2; s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c27); } } + } else { + peg$currPos = s2; + s2 = peg$FAILED; } } else { - s1 = peg$FAILED; + peg$currPos = s2; + s2 = peg$FAILED; } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c28(s1); - } - s0 = s1; - - return s0; + } else { + peg$currPos = s2; + s2 = peg$FAILED; } - - function peg$parsecommaList() { - var s0, s1, s2, s3, s4, s5, s6; - - s0 = peg$currPos; - s1 = []; + while (s2 !== peg$FAILED) { + s1.push(s2); s2 = peg$currPos; s3 = peg$parseargVar(); if (s3 !== peg$FAILED) { @@ -660,42 +746,37 @@ module.exports = (function() { peg$currPos = s2; s2 = peg$FAILED; } - while (s2 !== peg$FAILED) { - s1.push(s2); - s2 = peg$currPos; - s3 = peg$parseargVar(); - if (s3 !== peg$FAILED) { - s4 = peg$parseoptWs(); - if (s4 !== peg$FAILED) { - s5 = peg$parsecomma(); - if (s5 !== peg$FAILED) { - s6 = peg$parseoptWs(); - if (s6 !== peg$FAILED) { - peg$savedPos = s2; - s3 = peg$c29(s3); - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } + } + if (s1 !== peg$FAILED) { + s2 = peg$parseargVar(); + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c30(s1, s2); + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; } - if (s1 !== peg$FAILED) { - s2 = peg$parseargVar(); - if (s2 !== peg$FAILED) { + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parselist() { + var s0, s1, s2, s3; + + s0 = peg$currPos; + s1 = peg$parselistOpen(); + if (s1 !== peg$FAILED) { + s2 = peg$parsecommaList(); + if (s2 !== peg$FAILED) { + s3 = peg$parselistClose(); + if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c30(s1, s2); + s1 = peg$c31(s2); s0 = s1; } else { peg$currPos = s0; @@ -705,217 +786,190 @@ module.exports = (function() { peg$currPos = s0; s0 = peg$FAILED; } - - return s0; - } - - function peg$parselist() { - var s0, s1, s2, s3; - - s0 = peg$currPos; - s1 = peg$parselistOpen(); - if (s1 !== peg$FAILED) { - s2 = peg$parsecommaList(); - if (s2 !== peg$FAILED) { - s3 = peg$parselistClose(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c31(s2); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - return s0; - } - - function peg$parsenumber() { - var s0, s1, s2; - - s0 = peg$currPos; - s1 = []; - if (peg$c32.test(input.charAt(peg$currPos))) { - s2 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c33); } - } - if (s2 !== peg$FAILED) { - while (s2 !== peg$FAILED) { - s1.push(s2); - if (peg$c32.test(input.charAt(peg$currPos))) { - s2 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c33); } - } - } - } else { - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c34(s1); - } - s0 = s1; - - return s0; - } - - function peg$parsearg() { - var s0; - - s0 = peg$parselist(); - if (s0 === peg$FAILED) { - s0 = peg$parsenumber(); - if (s0 === peg$FAILED) { - s0 = null; - } - } - - return s0; - } - - - var client = options.client; - var user = options.client.user; - - var _ = require('lodash'); - var assert = require('assert'); - - function checkAccess(acsCode, value) { - try { - return { - LC : function isLocalConnection() { - return client.isLocal(); - }, - AG : function ageGreaterOrEqualThan() { - return !isNaN(value) && user.getAge() >= value; - }, - AS : function accountStatus() { - if(!_.isArray(value)) { - value = [ value ]; - } - - const userAccountStatus = parseInt(user.properties.account_status, 10); - value = value.map(n => parseInt(n, 10)); // ensure we have integers - return value.indexOf(userAccountStatus) > -1; - }, - EC : function isEncoding() { - switch(value) { - case 0 : return 'cp437' === client.term.outputEncoding.toLowerCase(); - case 1 : return 'utf-8' === client.term.outputEncoding.toLowerCase(); - default : return false; - } - }, - GM : function isOneOfGroups() { - if(!_.isArray(value)) { - return false; - } - - return _.findIndex(value, function cmp(groupName) { - return user.isGroupMember(groupName); - }) > - 1; - }, - NN : function isNode() { - return client.node === value; - }, - NP : function numberOfPosts() { - // :TODO: implement me!!!! - return false; - }, - NC : function numberOfCalls() { - // :TODO: implement me!! - return false; - }, - SC : function isSecureConnection() { - return client.session.isSecure; - }, - ML : function minutesLeft() { - // :TODO: implement me! - return false; - }, - TH : function termHeight() { - return !isNaN(value) && client.term.termHeight >= value; - }, - TM : function isOneOfThemes() { - if(!_.isArray(value)) { - return false; - } - - return value.indexOf(client.currentTheme.name) > -1; - }, - TT : function isOneOfTermTypes() { - if(!_.isArray(value)) { - return false; - } - - return value.indexOf(client.term.termType) > -1; - }, - TW : function termWidth() { - return !isNaN(value) && client.term.termWidth >= value; - }, - ID : function isUserId(value) { - if(!_.isArray(value)) { - value = [ value ]; - } - - value = value.map(n => parseInt(n, 10)); // ensure we have integers - return value.indexOf(user.userId) > -1; - }, - WD : function isOneOfDayOfWeek() { - if(!_.isArray(value)) { - value = [ value ]; - } - - value = value.map(n => parseInt(n, 10)); // ensure we have integers - return value.indexOf(new Date().getDay()) > -1; - }, - MM : function isMinutesPastMidnight() { - // :TODO: return true if value is >= minutes past midnight sys time - return false; - } - }[acsCode](value); - } catch (e) { - client.log.warn( { acsCode : acsCode, value : value }, 'Invalid ACS string!'); - return false; - } - } - - - peg$result = peg$startRuleFunction(); - - if (peg$result !== peg$FAILED && peg$currPos === input.length) { - return peg$result; } else { - if (peg$result !== peg$FAILED && peg$currPos < input.length) { - peg$fail({ type: "end", description: "end of input" }); - } - - 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) - ); + peg$currPos = s0; + s0 = peg$FAILED; } + + return s0; } - return { - SyntaxError: peg$SyntaxError, - parse: peg$parse - }; -})(); + function peg$parsenumber() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = []; + if (peg$c32.test(input.charAt(peg$currPos))) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c33); } + } + if (s2 !== peg$FAILED) { + while (s2 !== peg$FAILED) { + s1.push(s2); + if (peg$c32.test(input.charAt(peg$currPos))) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c33); } + } + } + } else { + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c34(s1); + } + s0 = s1; + + return s0; + } + + function peg$parsearg() { + var s0; + + s0 = peg$parselist(); + if (s0 === peg$FAILED) { + s0 = peg$parsenumber(); + if (s0 === peg$FAILED) { + s0 = null; + } + } + + return s0; + } + + + var client = options.client; + var user = options.client.user; + + var _ = require('lodash'); + var assert = require('assert'); + + function checkAccess(acsCode, value) { + try { + return { + LC : function isLocalConnection() { + return client.isLocal(); + }, + AG : function ageGreaterOrEqualThan() { + return !isNaN(value) && user.getAge() >= value; + }, + AS : function accountStatus() { + if(!_.isArray(value)) { + value = [ value ]; + } + + const userAccountStatus = parseInt(user.properties.account_status, 10); + value = value.map(n => parseInt(n, 10)); // ensure we have integers + return value.indexOf(userAccountStatus) > -1; + }, + EC : function isEncoding() { + switch(value) { + case 0 : return 'cp437' === client.term.outputEncoding.toLowerCase(); + case 1 : return 'utf-8' === client.term.outputEncoding.toLowerCase(); + default : return false; + } + }, + GM : function isOneOfGroups() { + if(!_.isArray(value)) { + return false; + } + + return _.findIndex(value, function cmp(groupName) { + return user.isGroupMember(groupName); + }) > - 1; + }, + NN : function isNode() { + return client.node === value; + }, + NP : function numberOfPosts() { + const postCount = parseInt(user.properties.post_count, 10); + return !isNaN(value) && postCount >= value; + }, + NC : function numberOfCalls() { + const loginCount = parseInt(user.properties.login_count, 10); + return !isNaN(value) && loginCount >= value; + }, + SC : function isSecureConnection() { + return client.session.isSecure; + }, + ML : function minutesLeft() { + // :TODO: implement me! + return false; + }, + TH : function termHeight() { + return !isNaN(value) && client.term.termHeight >= value; + }, + TM : function isOneOfThemes() { + if(!_.isArray(value)) { + return false; + } + + return value.indexOf(client.currentTheme.name) > -1; + }, + TT : function isOneOfTermTypes() { + if(!_.isArray(value)) { + return false; + } + + return value.indexOf(client.term.termType) > -1; + }, + TW : function termWidth() { + return !isNaN(value) && client.term.termWidth >= value; + }, + ID : function isUserId(value) { + if(!_.isArray(value)) { + value = [ value ]; + } + + value = value.map(n => parseInt(n, 10)); // ensure we have integers + return value.indexOf(user.userId) > -1; + }, + WD : function isOneOfDayOfWeek() { + if(!_.isArray(value)) { + value = [ value ]; + } + + value = value.map(n => parseInt(n, 10)); // ensure we have integers + return value.indexOf(new Date().getDay()) > -1; + }, + MM : function isMinutesPastMidnight() { + // :TODO: return true if value is >= minutes past midnight sys time + return false; + } + }[acsCode](value); + } catch (e) { + client.log.warn( { acsCode : acsCode, value : value }, 'Invalid ACS string!'); + return false; + } + } + + + peg$result = peg$startRuleFunction(); + + if (peg$result !== peg$FAILED && peg$currPos === input.length) { + return peg$result; + } else { + if (peg$result !== peg$FAILED && peg$currPos < input.length) { + peg$fail(peg$endExpectation()); + } + + throw peg$buildStructuredError( + 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) + ); + } +} + +module.exports = { + SyntaxError: peg$SyntaxError, + parse: peg$parse +}; diff --git a/misc/acs_parser.pegjs b/misc/acs_parser.pegjs index 14a03042..b381ccef 100644 --- a/misc/acs_parser.pegjs +++ b/misc/acs_parser.pegjs @@ -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;