yapp 2.2.95 → 2.2.99

package/lib/parser/yapp.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _occamParsers = require("occam-parsers");
-var _parser = require("../utilities/parser");
+var _occamGrammarUtilities = require("occam-grammar-utilities");
 function _assertThisInitialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -90,6 +90,7 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, result);
     };
 }
+var rulesFromBNF = _occamGrammarUtilities.parserUtilities.rulesFromBNF, parserFromRules = _occamGrammarUtilities.parserUtilities.parserFromRules;
 var YappParser = /*#__PURE__*/ function(CommonParser) {
     _inherits(YappParser, CommonParser);
     var _super = _createSuper(YappParser);
@@ -101,21 +102,21 @@ var YappParser = /*#__PURE__*/ function(CommonParser) {
         {
             key: "fromNothing",
             value: function fromNothing(Class) {
-                var bnf = Class.bnf, rules = (0, _parser).rulesFromBNF(bnf), parser = (0, _parser).parserFromRules(Class, rules);
+                var bnf = Class.bnf, rules = rulesFromBNF(bnf), parser = parserFromRules(Class, rules);
                 return parser;
             }
         },
         {
             key: "fromBNF",
             value: function fromBNF(Class, bnf) {
-                var rules = (0, _parser).rulesFromBNF(bnf), parser = (0, _parser).parserFromRules(Class, rules);
+                var rules = rulesFromBNF(bnf), parser = parserFromRules(Class, rules);
                 return parser;
             }
         },
         {
             key: "fromRules",
             value: function fromRules(Class, rules) {
-                var parser = (0, _parser).parserFromRules(Class, rules);
+                var parser = parserFromRules(Class, rules);
                 return parser;
             }
         }
@@ -124,4 +125,4 @@ var YappParser = /*#__PURE__*/ function(CommonParser) {
 }(_occamParsers.CommonParser);
 exports.default = YappParser;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXJzZXIveWFwcC5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgQ29tbW9uUGFyc2VyIH0gZnJvbSBcIm9jY2FtLXBhcnNlcnNcIjtcblxuaW1wb3J0IHsgcnVsZXNGcm9tQk5GLCBwYXJzZXJGcm9tUnVsZXMgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3BhcnNlclwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBZYXBwUGFyc2VyIGV4dGVuZHMgQ29tbW9uUGFyc2VyIHtcbiAgc3RhdGljIGZyb21Ob3RoaW5nKENsYXNzKSB7XG4gICAgY29uc3QgeyBibmYgfSA9IENsYXNzLFxuICAgICAgICAgIHJ1bGVzID0gcnVsZXNGcm9tQk5GKGJuZiksXG4gICAgICAgICAgcGFyc2VyID0gcGFyc2VyRnJvbVJ1bGVzKENsYXNzLCBydWxlcyk7XG5cbiAgICByZXR1cm4gcGFyc2VyO1xuICB9XG5cbiAgc3RhdGljIGZyb21CTkYoQ2xhc3MsIGJuZikge1xuICAgIGNvbnN0IHJ1bGVzID0gcnVsZXNGcm9tQk5GKGJuZiksXG4gICAgICAgICAgcGFyc2VyID0gcGFyc2VyRnJvbVJ1bGVzKENsYXNzLCBydWxlcyk7XG5cbiAgICByZXR1cm4gcGFyc2VyO1xuICB9XG5cbiAgc3RhdGljIGZyb21SdWxlcyhDbGFzcywgcnVsZXMpIHtcbiAgICBjb25zdCBwYXJzZXIgPSBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICAgIHJldHVybiBwYXJzZXI7XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiWWFwcFBhcnNlciIsImZyb21Ob3RoaW5nIiwiQ2xhc3MiLCJibmYiLCJydWxlcyIsInJ1bGVzRnJvbUJORiIsInBhcnNlciIsInBhcnNlckZyb21SdWxlcyIsImZyb21CTkYiLCJmcm9tUnVsZXMiLCJDb21tb25QYXJzZXIiXSwibWFwcGluZ3MiOiJBQUFBLFlBQVksQ0FBQzs7Ozs7QUFFZ0IsSUFBQSxhQUFlLFdBQWYsZUFBZSxDQUFBO0FBRUUsSUFBQSxPQUFxQixXQUFyQixxQkFBcUIsQ0FBQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFcEQsSUFBQSxBQUFNQSxVQUFVLGlCQ041QixBRE1ZOzs7YUFBTUEsVUFBVTs7Ozs7O1lBQ3RCQyxHQUFXLEVBQVhBLGFBQVc7bUJBQWxCLFNBQU9BLFdBQVcsQ0FBQ0MsS0FBSyxFQUFFO2dCQUN4QixJQUFNLEFBQUVDLEdBQUcsR0FBS0QsS0FBSyxDQUFiQyxHQUFHLEFBQVUsRUFDZkMsS0FBSyxHQUFHQyxDQUFBQSxHQUFBQSxPQUFZLEFBQUssQ0FBQSxhQUFMLENBQUNGLEdBQUcsQ0FBQyxFQUN6QkcsTUFBTSxHQUFHQyxDQUFBQSxHQUFBQSxPQUFlLEFBQWMsQ0FBQSxnQkFBZCxDQUFDTCxLQUFLLEVBQUVFLEtBQUssQ0FBQyxBQUFDO2dCQUU3QyxPQUFPRSxNQUFNLENBQUM7YUFDZjs7O1lBRU1FLEdBQU8sRUFBUEEsU0FBTzttQkFBZCxTQUFPQSxPQUFPLENBQUNOLEtBQUssRUFBRUMsR0FBRyxFQUFFO2dCQUN6QixJQUFNQyxLQUFLLEdBQUdDLENBQUFBLEdBQUFBLE9BQVksQUFBSyxDQUFBLGFBQUwsQ0FBQ0YsR0FBRyxDQUFDLEVBQ3pCRyxNQUFNLEdBQUdDLENBQUFBLEdBQUFBLE9BQWUsQUFBYyxDQUFBLGdCQUFkLENBQUNMLEtBQUssRUFBRUUsS0FBSyxDQUFDLEFBQUM7Z0JBRTdDLE9BQU9FLE1BQU0sQ0FBQzthQUNmOzs7WUFFTUcsR0FBUyxFQUFUQSxXQUFTO21CQUFoQixTQUFPQSxTQUFTLENBQUNQLEtBQUssRUFBRUUsS0FBSyxFQUFFO2dCQUM3QixJQUFNRSxNQUFNLEdBQUdDLENBQUFBLEdBQUFBLE9BQWUsQUFBYyxDQUFBLGdCQUFkLENBQUNMLEtBQUssRUFBRUUsS0FBSyxDQUFDLEFBQUM7Z0JBRTdDLE9BQU9FLE1BQU0sQ0FBQzthQUNmOzs7O0NBQ0YsQ0FyQnVDSSxhQUFZLGFBQUEsQ0FxQm5EO2tCQXJCb0JWLFVBQVUifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wYXJzZXIveWFwcC5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgQ29tbW9uUGFyc2VyIH0gZnJvbSBcIm9jY2FtLXBhcnNlcnNcIjtcbmltcG9ydCB7IHBhcnNlclV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1ncmFtbWFyLXV0aWxpdGllc1wiO1xuXG5jb25zdCB7IHJ1bGVzRnJvbUJORiwgcGFyc2VyRnJvbVJ1bGVzIH0gPSBwYXJzZXJVdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFlhcHBQYXJzZXIgZXh0ZW5kcyBDb21tb25QYXJzZXIge1xuICBzdGF0aWMgZnJvbU5vdGhpbmcoQ2xhc3MpIHtcbiAgICBjb25zdCB7IGJuZiB9ID0gQ2xhc3MsXG4gICAgICAgICAgcnVsZXMgPSBydWxlc0Zyb21CTkYoYm5mKSxcbiAgICAgICAgICBwYXJzZXIgPSBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICAgIHJldHVybiBwYXJzZXI7XG4gIH1cblxuICBzdGF0aWMgZnJvbUJORihDbGFzcywgYm5mKSB7XG4gICAgY29uc3QgcnVsZXMgPSBydWxlc0Zyb21CTkYoYm5mKSxcbiAgICAgICAgICBwYXJzZXIgPSBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICAgIHJldHVybiBwYXJzZXI7XG4gIH1cblxuICBzdGF0aWMgZnJvbVJ1bGVzKENsYXNzLCBydWxlcykge1xuICAgIGNvbnN0IHBhcnNlciA9IHBhcnNlckZyb21SdWxlcyhDbGFzcywgcnVsZXMpO1xuXG4gICAgcmV0dXJuIHBhcnNlcjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJydWxlc0Zyb21CTkYiLCJwYXJzZXJVdGlsaXRpZXMiLCJwYXJzZXJGcm9tUnVsZXMiLCJZYXBwUGFyc2VyIiwiZnJvbU5vdGhpbmciLCJDbGFzcyIsImJuZiIsInJ1bGVzIiwicGFyc2VyIiwiZnJvbUJORiIsImZyb21SdWxlcyIsIkNvbW1vblBhcnNlciJdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxDQUFDOzs7OztBQUVnQixJQUFBLGFBQWUsV0FBZixlQUFlLENBQUE7QUFDWixJQUFBLHNCQUF5QixXQUF6Qix5QkFBeUIsQ0FBQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFekQsSUFBUUEsWUFBWSxHQUFzQkMsc0JBQWUsZ0JBQUEsQ0FBakRELFlBQVksRUFBRUUsZUFBZSxHQUFLRCxzQkFBZSxnQkFBQSxDQUFuQ0MsZUFBZSxBQUFxQjtBQUUzQyxJQUFBLEFBQU1DLFVBQVUsaUJDUDVCLEFET1k7OzthQUFNQSxVQUFVOzs7Ozs7WUFDdEJDLEdBQVcsRUFBWEEsYUFBVzttQkFBbEIsU0FBT0EsV0FBVyxDQUFDQyxLQUFLLEVBQUU7Z0JBQ3hCLElBQU0sQUFBRUMsR0FBRyxHQUFLRCxLQUFLLENBQWJDLEdBQUcsQUFBVSxFQUNmQyxLQUFLLEdBQUdQLFlBQVksQ0FBQ00sR0FBRyxDQUFDLEVBQ3pCRSxNQUFNLEdBQUdOLGVBQWUsQ0FBQ0csS0FBSyxFQUFFRSxLQUFLLENBQUMsQUFBQztnQkFFN0MsT0FBT0MsTUFBTSxDQUFDO2FBQ2Y7OztZQUVNQyxHQUFPLEVBQVBBLFNBQU87bUJBQWQsU0FBT0EsT0FBTyxDQUFDSixLQUFLLEVBQUVDLEdBQUcsRUFBRTtnQkFDekIsSUFBTUMsS0FBSyxHQUFHUCxZQUFZLENBQUNNLEdBQUcsQ0FBQyxFQUN6QkUsTUFBTSxHQUFHTixlQUFlLENBQUNHLEtBQUssRUFBRUUsS0FBSyxDQUFDLEFBQUM7Z0JBRTdDLE9BQU9DLE1BQU0sQ0FBQzthQUNmOzs7WUFFTUUsR0FBUyxFQUFUQSxXQUFTO21CQUFoQixTQUFPQSxTQUFTLENBQUNMLEtBQUssRUFBRUUsS0FBSyxFQUFFO2dCQUM3QixJQUFNQyxNQUFNLEdBQUdOLGVBQWUsQ0FBQ0csS0FBSyxFQUFFRSxLQUFLLENBQUMsQUFBQztnQkFFN0MsT0FBT0MsTUFBTSxDQUFDO2FBQ2Y7Ozs7Q0FDRixDQXJCdUNHLGFBQVksYUFBQSxDQXFCbkQ7a0JBckJvQlIsVUFBVSJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "yapp",
   "author": "James Smith",
-  "version": "2.2.95",
+  "version": "2.2.99",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/yapp",
   "description": "Yet Another Pretty Printer.",
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@swc/core": "^1.2.106",
-    "easy-layout": "^5.0.102",
+    "easy-layout": "^5.0.106",
     "esbuild": "^0.11.7",
     "express": "^4.17.1",
     "juxtapose": "^4.0.37",

package/src/parser/yapp.js

@@ -1,8 +1,9 @@
 "use strict";
 
 import { CommonParser } from "occam-parsers";
+import { parserUtilities } from "occam-grammar-utilities";
 
-import { rulesFromBNF, parserFromRules } from "../utilities/parser";
+const { rulesFromBNF, parserFromRules } = parserUtilities;
 
 export default class YappParser extends CommonParser {
   static fromNothing(Class) {

package/lib/utilities/parser.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-exports.rulesFromBNF = rulesFromBNF;
-exports.parserFromRules = parserFromRules;
-var _occamLexers = require("occam-lexers");
-var _occamParsers = require("occam-parsers");
-var _occamGrammarUtilities = require("occam-grammar-utilities");
-var _rules = require("../utilities/rules");
-var bnfLexer = _occamLexers.BNFLexer.fromNothing(), bnfParser = _occamParsers.BNFParser.fromNothing();
-function rulesFromBNF(bnf) {
-    var tokens = bnfLexer.tokensFromBNF(bnf), rules = bnfParser.rulesFromTokens(tokens);
-    return rules;
-}
-function parserFromRules(Class, rules) {
-    var ruleMap = (0, _rules).ruleMapFromRules(rules);
-    var startRule = (0, _rules).startRuleFromRules(rules);
-    startRule = (0, _occamGrammarUtilities).eliminateLeftRecursion(startRule, ruleMap);
-    var parser = new Class(startRule, ruleMap);
-    return parser;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcGFyc2VyLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBCTkZMZXhlciB9IGZyb20gXCJvY2NhbS1sZXhlcnNcIjtcbmltcG9ydCB7IEJORlBhcnNlciB9IGZyb20gXCJvY2NhbS1wYXJzZXJzXCI7XG5pbXBvcnQgeyBlbGltaW5hdGVMZWZ0UmVjdXJzaW9uIH0gZnJvbSBcIm9jY2FtLWdyYW1tYXItdXRpbGl0aWVzXCI7XG5cbmltcG9ydCB7IHJ1bGVNYXBGcm9tUnVsZXMsIHN0YXJ0UnVsZUZyb21SdWxlcyB9IGZyb20gXCIuLi91dGlsaXRpZXMvcnVsZXNcIjtcblxuXG5jb25zdCBibmZMZXhlciA9IEJORkxleGVyLmZyb21Ob3RoaW5nKCksXG4gICAgICBibmZQYXJzZXIgPSBCTkZQYXJzZXIuZnJvbU5vdGhpbmcoKTtcblxuZXhwb3J0IGZ1bmN0aW9uIHJ1bGVzRnJvbUJORihibmYpIHtcbiAgY29uc3QgdG9rZW5zID0gYm5mTGV4ZXIudG9rZW5zRnJvbUJORihibmYpLFxuICAgICAgICBydWxlcyA9IGJuZlBhcnNlci5ydWxlc0Zyb21Ub2tlbnModG9rZW5zKTtcblxuICByZXR1cm4gcnVsZXM7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBwYXJzZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKSB7XG4gIGNvbnN0IHJ1bGVNYXAgPSBydWxlTWFwRnJvbVJ1bGVzKHJ1bGVzKTtcblxuICBsZXQgc3RhcnRSdWxlID0gc3RhcnRSdWxlRnJvbVJ1bGVzKHJ1bGVzKTtcblxuICBzdGFydFJ1bGUgPSBlbGltaW5hdGVMZWZ0UmVjdXJzaW9uKHN0YXJ0UnVsZSwgcnVsZU1hcCk7XG5cbiAgY29uc3QgcGFyc2VyID0gbmV3IENsYXNzKHN0YXJ0UnVsZSwgcnVsZU1hcCk7XG5cbiAgcmV0dXJuIHBhcnNlcjtcbn1cbiJdLCJuYW1lcyI6WyJydWxlc0Zyb21CTkYiLCJwYXJzZXJGcm9tUnVsZXMiLCJibmZMZXhlciIsIkJORkxleGVyIiwiZnJvbU5vdGhpbmciLCJibmZQYXJzZXIiLCJCTkZQYXJzZXIiLCJibmYiLCJ0b2tlbnMiLCJ0b2tlbnNGcm9tQk5GIiwicnVsZXMiLCJydWxlc0Zyb21Ub2tlbnMiLCJDbGFzcyIsInJ1bGVNYXAiLCJydWxlTWFwRnJvbVJ1bGVzIiwic3RhcnRSdWxlIiwic3RhcnRSdWxlRnJvbVJ1bGVzIiwiZWxpbWluYXRlTGVmdFJlY3Vyc2lvbiIsInBhcnNlciJdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxDQUFDOzs7O1FBWUdBLFlBQVksR0FBWkEsWUFBWTtRQU9aQyxlQUFlLEdBQWZBLGVBQWU7QUFqQk4sSUFBQSxZQUFjLFdBQWQsY0FBYyxDQUFBO0FBQ2IsSUFBQSxhQUFlLFdBQWYsZUFBZSxDQUFBO0FBQ0YsSUFBQSxzQkFBeUIsV0FBekIseUJBQXlCLENBQUE7QUFFWCxJQUFBLE1BQW9CLFdBQXBCLG9CQUFvQixDQUFBO0FBR3pFLElBQU1DLFFBQVEsR0FBR0MsWUFBUSxTQUFBLENBQUNDLFdBQVcsRUFBRSxFQUNqQ0MsU0FBUyxHQUFHQyxhQUFTLFVBQUEsQ0FBQ0YsV0FBVyxFQUFFLEFBQUM7QUFFbkMsU0FBU0osWUFBWSxDQUFDTyxHQUFHLEVBQUU7SUFDaEMsSUFBTUMsTUFBTSxHQUFHTixRQUFRLENBQUNPLGFBQWEsQ0FBQ0YsR0FBRyxDQUFDLEVBQ3BDRyxLQUFLLEdBQUdMLFNBQVMsQ0FBQ00sZUFBZSxDQUFDSCxNQUFNLENBQUMsQUFBQztJQUVoRCxPQUFPRSxLQUFLLENBQUM7Q0FDZDtBQUVNLFNBQVNULGVBQWUsQ0FBQ1csS0FBSyxFQUFFRixLQUFLLEVBQUU7SUFDNUMsSUFBTUcsT0FBTyxHQUFHQyxDQUFBQSxHQUFBQSxNQUFnQixBQUFPLENBQUEsaUJBQVAsQ0FBQ0osS0FBSyxDQUFDLEFBQUM7SUFFeEMsSUFBSUssU0FBUyxHQUFHQyxDQUFBQSxHQUFBQSxNQUFrQixBQUFPLENBQUEsbUJBQVAsQ0FBQ04sS0FBSyxDQUFDLEFBQUM7SUFFMUNLLFNBQVMsR0FBR0UsQ0FBQUEsR0FBQUEsc0JBQXNCLEFBQW9CLENBQUEsdUJBQXBCLENBQUNGLFNBQVMsRUFBRUYsT0FBTyxDQUFDLENBQUM7SUFFdkQsSUFBTUssTUFBTSxHQUFHLElBQUlOLEtBQUssQ0FBQ0csU0FBUyxFQUFFRixPQUFPLENBQUMsQUFBQztJQUU3QyxPQUFPSyxNQUFNLENBQUM7Q0FDZiJ9

package/src/utilities/parser.js

@@ -1,30 +0,0 @@
-"use strict";
-
-import { BNFLexer } from "occam-lexers";
-import { BNFParser } from "occam-parsers";
-import { eliminateLeftRecursion } from "occam-grammar-utilities";
-
-import { ruleMapFromRules, startRuleFromRules } from "../utilities/rules";
-
-
-const bnfLexer = BNFLexer.fromNothing(),
-      bnfParser = BNFParser.fromNothing();
-
-export function rulesFromBNF(bnf) {
-  const tokens = bnfLexer.tokensFromBNF(bnf),
-        rules = bnfParser.rulesFromTokens(tokens);
-
-  return rules;
-}
-
-export function parserFromRules(Class, rules) {
-  const ruleMap = ruleMapFromRules(rules);
-
-  let startRule = startRuleFromRules(rules);
-
-  startRule = eliminateLeftRecursion(startRule, ruleMap);
-
-  const parser = new Class(startRule, ruleMap);
-
-  return parser;
-}