occam-nominal 0.0.6 → 1.0.0

package/.swcrc

@@ -1,10 +1,4 @@
 {
-    "jsc": {
-        "parser": {
-            "syntax": "ecmascript",
-            "jsx": true
-        }
-    },
     "module": {
         "type": "commonjs"
     }

package/lib/index.js

@@ -9,47 +9,19 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    get CombinedCustomGrammar () {
-        return _combined.default;
-    },
-    get CustomGrammar () {
-        return _customGrammar.default;
-    },
-    get DEFAULT_CUSTOM_GRAMMAR_NAME () {
-        return _grammarNames.DEFAULT_CUSTOM_GRAMMAR_NAME;
-    },
-    get customGrammarUtilities () {
-        return _customGrammar1.default;
-    },
-    get defaultCustomGrammar () {
-        return _default.default;
-    },
     get lexersUtilities () {
         return _lexers.default;
     },
     get parsersUtilities () {
         return _parsers.default;
-    },
-    get ruleNames () {
-        return _ruleNames.default;
-    },
-    get vocabularyNames () {
-        return _vocabularyNames.default;
     }
 });
-var _grammarNames = require("./grammarNames");
-var _ruleNames = /*#__PURE__*/ _interop_require_default(require("./ruleNames"));
-var _vocabularyNames = /*#__PURE__*/ _interop_require_default(require("./vocabularyNames"));
-var _customGrammar = /*#__PURE__*/ _interop_require_default(require("./customGrammar"));
-var _default = /*#__PURE__*/ _interop_require_default(require("./customGrammar/default"));
-var _combined = /*#__PURE__*/ _interop_require_default(require("./customGrammar/combined"));
 var _lexers = /*#__PURE__*/ _interop_require_default(require("./utilities/lexers"));
 var _parsers = /*#__PURE__*/ _interop_require_default(require("./utilities/parsers"));
-var _customGrammar1 = /*#__PURE__*/ _interop_require_default(require("./utilities/customGrammar"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IHsgREVGQVVMVF9DVVNUT01fR1JBTU1BUl9OQU1FIH0gZnJvbSBcIi4vZ3JhbW1hck5hbWVzXCI7XG5cbmV4cG9ydCB7IGRlZmF1bHQgYXMgcnVsZU5hbWVzIH0gZnJvbSBcIi4vcnVsZU5hbWVzXCI7XG5leHBvcnQgeyBkZWZhdWx0IGFzIHZvY2FidWxhcnlOYW1lcyB9IGZyb20gXCIuL3ZvY2FidWxhcnlOYW1lc1wiO1xuXG5leHBvcnQgeyBkZWZhdWx0IGFzIEN1c3RvbUdyYW1tYXIgfSBmcm9tIFwiLi9jdXN0b21HcmFtbWFyXCI7XG5leHBvcnQgeyBkZWZhdWx0IGFzIGRlZmF1bHRDdXN0b21HcmFtbWFyIH0gZnJvbSBcIi4vY3VzdG9tR3JhbW1hci9kZWZhdWx0XCI7XG5leHBvcnQgeyBkZWZhdWx0IGFzIENvbWJpbmVkQ3VzdG9tR3JhbW1hciB9IGZyb20gXCIuL2N1c3RvbUdyYW1tYXIvY29tYmluZWRcIjtcblxuZXhwb3J0IHsgZGVmYXVsdCBhcyBsZXhlcnNVdGlsaXRpZXMgfSBmcm9tIFwiLi91dGlsaXRpZXMvbGV4ZXJzXCI7XG5leHBvcnQgeyBkZWZhdWx0IGFzIHBhcnNlcnNVdGlsaXRpZXMgfSBmcm9tIFwiLi91dGlsaXRpZXMvcGFyc2Vyc1wiO1xuZXhwb3J0IHsgZGVmYXVsdCBhcyBjdXN0b21HcmFtbWFyVXRpbGl0aWVzIH0gZnJvbSBcIi4vdXRpbGl0aWVzL2N1c3RvbUdyYW1tYXJcIjtcbiJdLCJuYW1lcyI6WyJDb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJDdXN0b21HcmFtbWFyIiwiREVGQVVMVF9DVVNUT01fR1JBTU1BUl9OQU1FIiwiY3VzdG9tR3JhbW1hclV0aWxpdGllcyIsImRlZmF1bHRDdXN0b21HcmFtbWFyIiwibGV4ZXJzVXRpbGl0aWVzIiwicGFyc2Vyc1V0aWxpdGllcyIsInJ1bGVOYW1lcyIsInZvY2FidWxhcnlOYW1lcyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBU29CQTtlQUFBQSxpQkFBcUI7O1FBRnJCQztlQUFBQSxzQkFBYTs7UUFMeEJDO2VBQUFBLHlDQUEyQjs7UUFXaEJDO2VBQUFBLHVCQUFzQjs7UUFMdEJDO2VBQUFBLGdCQUFvQjs7UUFHcEJDO2VBQUFBLGVBQWU7O1FBQ2ZDO2VBQUFBLGdCQUFnQjs7UUFSaEJDO2VBQUFBLGtCQUFTOztRQUNUQztlQUFBQSx3QkFBZTs7OzRCQUhTO2dFQUVQO3NFQUNNO29FQUVGOzhEQUNPOytEQUNDOzZEQUVOOzhEQUNDO3FFQUNNIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IHsgZGVmYXVsdCBhcyBsZXhlcnNVdGlsaXRpZXMgfSBmcm9tIFwiLi91dGlsaXRpZXMvbGV4ZXJzXCI7XG5leHBvcnQgeyBkZWZhdWx0IGFzIHBhcnNlcnNVdGlsaXRpZXMgfSBmcm9tIFwiLi91dGlsaXRpZXMvcGFyc2Vyc1wiO1xuIl0sIm5hbWVzIjpbImxleGVyc1V0aWxpdGllcyIsInBhcnNlcnNVdGlsaXRpZXMiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQUVvQkE7ZUFBQUEsZUFBZTs7UUFDZkM7ZUFBQUEsZ0JBQWdCOzs7NkRBRE87OERBQ0MifQ==

package/lib/utilities/lexers.js

@@ -23,44 +23,13 @@ _export(exports, {
     }
 });
 var _occamgrammars = require("occam-grammars");
-var _occamlexers = require("occam-lexers");
-var _combined = /*#__PURE__*/ _interop_require_default(require("../customGrammar/combined"));
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
-var lexerFromRules = _occamlexers.lexerUtilities.lexerFromRules, rulesFromEntries = _occamlexers.lexerUtilities.rulesFromEntries;
+var _occamcustomgrammars = require("occam-custom-grammars");
+var lexerFromNothing = _occamcustomgrammars.lexersUtilities.lexerFromNothing, lexerFromCombinedCustomGrammar = _occamcustomgrammars.lexersUtilities.lexerFromCombinedCustomGrammar, lexerFromEntriesAndCombinedCustomGrammar = _occamcustomgrammars.lexersUtilities.lexerFromEntriesAndCombinedCustomGrammar;
 function nominalLexerFromNothing(Class) {
     if (Class === undefined) {
         Class = _occamgrammars.NominalLexer; ///
     }
-    var entries = Class.entries, combinedCustomGrammar = _combined.default.fromNothing(), rules = rulesFromEntriesAndCombinedCustomGrammar(entries, combinedCustomGrammar), nominalLexer = lexerFromRules(Class, rules);
+    var lexer = lexerFromNothing(Class), nominalLexer = lexer; ///
     return nominalLexer;
 }
 function nominalLexerFromCombinedCustomGrammar(Class, combinedCustomGrammar) {
@@ -68,7 +37,7 @@ function nominalLexerFromCombinedCustomGrammar(Class, combinedCustomGrammar) {
         combinedCustomGrammar = Class; ///
         Class = _occamgrammars.NominalLexer; ///
     }
-    var entries = Class.entries, rules = rulesFromEntriesAndCombinedCustomGrammar(entries, combinedCustomGrammar), nominalLexer = lexerFromRules(Class, rules);
+    var lexer = lexerFromCombinedCustomGrammar(Class, combinedCustomGrammar), nominalLexer = lexer; ///
     return nominalLexer;
 }
 function nominalLexerFromEntriesAndCombinedCustomGrammar(Class, entries, combinedCustomGrammar) {
@@ -77,7 +46,7 @@ function nominalLexerFromEntriesAndCombinedCustomGrammar(Class, entries, combine
         entries = Class; ///
         Class = _occamgrammars.NominalLexer; ///
     }
-    var rules = rulesFromEntriesAndCombinedCustomGrammar(entries, combinedCustomGrammar), nominalLexer = lexerFromRules(Class, rules);
+    var lexer = lexerFromEntriesAndCombinedCustomGrammar(Class, entries, combinedCustomGrammar), nominalLexer = lexer; ///
     return nominalLexer;
 }
 var _default = {
@@ -85,11 +54,5 @@ var _default = {
     nominalLexerFromCombinedCustomGrammar: nominalLexerFromCombinedCustomGrammar,
     nominalLexerFromEntriesAndCombinedCustomGrammar: nominalLexerFromEntriesAndCombinedCustomGrammar
 };
-function rulesFromEntriesAndCombinedCustomGrammar(entries, combinedCustomGrammar) {
-    var customGrammarEntries = combinedCustomGrammar.getEntries();
-    entries = _to_consumable_array(customGrammarEntries).concat(_to_consumable_array(entries));
-    var rules = rulesFromEntries(entries);
-    return rules;
-}
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbGV4ZXJzLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBOb21pbmFsTGV4ZXIgfSBmcm9tIFwib2NjYW0tZ3JhbW1hcnNcIjtcbmltcG9ydCB7IGxleGVyVXRpbGl0aWVzIH0gZnJvbSBcIm9jY2FtLWxleGVyc1wiO1xuXG5pbXBvcnQgQ29tYmluZWRDdXN0b21HcmFtbWFyIGZyb20gXCIuLi9jdXN0b21HcmFtbWFyL2NvbWJpbmVkXCI7XG5cbmNvbnN0IHsgbGV4ZXJGcm9tUnVsZXMsIHJ1bGVzRnJvbUVudHJpZXMgfSA9IGxleGVyVXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gbm9taW5hbExleGVyRnJvbU5vdGhpbmcoQ2xhc3MpIHtcbiAgaWYgKENsYXNzID09PSB1bmRlZmluZWQpIHtcbiAgICBDbGFzcyA9IE5vbWluYWxMZXhlcjsgLy8vXG4gIH1cblxuICBjb25zdCB7IGVudHJpZXMgfSA9IENsYXNzLFxuICAgICAgICBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBDb21iaW5lZEN1c3RvbUdyYW1tYXIuZnJvbU5vdGhpbmcoKSxcbiAgICAgICAgcnVsZXMgPSBydWxlc0Zyb21FbnRyaWVzQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyKGVudHJpZXMsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hciksXG4gICAgICAgIG5vbWluYWxMZXhlciA9IGxleGVyRnJvbVJ1bGVzKENsYXNzLCBydWxlcyk7XG5cbiAgcmV0dXJuIG5vbWluYWxMZXhlcjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vbWluYWxMZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIoQ2xhc3MsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikge1xuICBpZiAoY29tYmluZWRDdXN0b21HcmFtbWFyID09PSB1bmRlZmluZWQpIHtcbiAgICBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBDbGFzczsgIC8vL1xuXG4gICAgQ2xhc3MgPSBOb21pbmFsTGV4ZXI7IC8vL1xuICB9XG5cbiAgY29uc3QgeyBlbnRyaWVzIH0gPSBDbGFzcyxcbiAgICAgICAgcnVsZXMgPSBydWxlc0Zyb21FbnRyaWVzQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyKGVudHJpZXMsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hciksXG4gICAgICAgIG5vbWluYWxMZXhlciA9IGxleGVyRnJvbVJ1bGVzKENsYXNzLCBydWxlcyk7XG5cbiAgcmV0dXJuIG5vbWluYWxMZXhlcjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vbWluYWxMZXhlckZyb21FbnRyaWVzQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyKENsYXNzLCBlbnRyaWVzLCBjb21iaW5lZEN1c3RvbUdyYW1tYXIpIHtcbiAgaWYgKGNvbWJpbmVkQ3VzdG9tR3JhbW1hciA9PT0gdW5kZWZpbmVkKSB7XG4gICAgY29tYmluZWRDdXN0b21HcmFtbWFyID0gZW50cmllczsgIC8vL1xuXG4gICAgZW50cmllcyA9IENsYXNzOyAgLy8vXG5cbiAgICBDbGFzcyA9IE5vbWluYWxMZXhlcjsgLy8vXG4gIH1cblxuICBjb25zdCBydWxlcyA9IHJ1bGVzRnJvbUVudHJpZXNBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIoZW50cmllcywgY29tYmluZWRDdXN0b21HcmFtbWFyKSxcbiAgICAgICAgbm9taW5hbExleGVyID0gbGV4ZXJGcm9tUnVsZXMoQ2xhc3MsIHJ1bGVzKTtcblxuICByZXR1cm4gbm9taW5hbExleGVyO1xufVxuXG5leHBvcnQgZGVmYXVsdCB7XG4gIG5vbWluYWxMZXhlckZyb21Ob3RoaW5nLFxuICBub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyLFxuICBub21pbmFsTGV4ZXJGcm9tRW50cmllc0FuZENvbWJpbmVkQ3VzdG9tR3JhbW1hclxufTtcblxuZnVuY3Rpb24gcnVsZXNGcm9tRW50cmllc0FuZENvbWJpbmVkQ3VzdG9tR3JhbW1hcihlbnRyaWVzLCBjb21iaW5lZEN1c3RvbUdyYW1tYXIpIHtcbiAgY29uc3QgY3VzdG9tR3JhbW1hckVudHJpZXMgPSBjb21iaW5lZEN1c3RvbUdyYW1tYXIuZ2V0RW50cmllcygpO1xuXG4gIGVudHJpZXMgPSBbIC8vL1xuICAgIC4uLmN1c3RvbUdyYW1tYXJFbnRyaWVzLFxuICAgIC4uLmVudHJpZXNcbiAgXTtcblxuICBjb25zdCBydWxlcyA9IHJ1bGVzRnJvbUVudHJpZXMoZW50cmllcyk7XG5cbiAgcmV0dXJuIHJ1bGVzO1xufVxuIl0sIm5hbWVzIjpbIm5vbWluYWxMZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIiLCJub21pbmFsTGV4ZXJGcm9tRW50cmllc0FuZENvbWJpbmVkQ3VzdG9tR3JhbW1hciIsIm5vbWluYWxMZXhlckZyb21Ob3RoaW5nIiwibGV4ZXJGcm9tUnVsZXMiLCJsZXhlclV0aWxpdGllcyIsInJ1bGVzRnJvbUVudHJpZXMiLCJDbGFzcyIsInVuZGVmaW5lZCIsIk5vbWluYWxMZXhlciIsImVudHJpZXMiLCJjb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJDb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJmcm9tTm90aGluZyIsInJ1bGVzIiwicnVsZXNGcm9tRW50cmllc0FuZENvbWJpbmVkQ3VzdG9tR3JhbW1hciIsIm5vbWluYWxMZXhlciIsImN1c3RvbUdyYW1tYXJFbnRyaWVzIiwiZ2V0RW50cmllcyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBbURBO2VBQUE7O1FBN0JnQkE7ZUFBQUE7O1FBY0FDO2VBQUFBOztRQTNCQUM7ZUFBQUE7Ozs2QkFQYTsyQkFDRTsrREFFRzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVsQyxJQUFRQyxpQkFBcUNDLDJCQUFjLENBQW5ERCxnQkFBZ0JFLG1CQUFxQkQsMkJBQWMsQ0FBbkNDO0FBRWpCLFNBQVNILHdCQUF3QkksS0FBSztJQUMzQyxJQUFJQSxVQUFVQyxXQUFXO1FBQ3ZCRCxRQUFRRSwyQkFBWSxFQUFFLEdBQUc7SUFDM0I7SUFFQSxJQUFNLEFBQUVDLFVBQVlILE1BQVpHLFNBQ0ZDLHdCQUF3QkMsaUJBQXFCLENBQUNDLFdBQVcsSUFDekRDLFFBQVFDLHlDQUF5Q0wsU0FBU0Msd0JBQzFESyxlQUFlWixlQUFlRyxPQUFPTztJQUUzQyxPQUFPRTtBQUNUO0FBRU8sU0FBU2Ysc0NBQXNDTSxLQUFLLEVBQUVJLHFCQUFxQjtJQUNoRixJQUFJQSwwQkFBMEJILFdBQVc7UUFDdkNHLHdCQUF3QkosT0FBUSxHQUFHO1FBRW5DQSxRQUFRRSwyQkFBWSxFQUFFLEdBQUc7SUFDM0I7SUFFQSxJQUFNLEFBQUVDLFVBQVlILE1BQVpHLFNBQ0ZJLFFBQVFDLHlDQUF5Q0wsU0FBU0Msd0JBQzFESyxlQUFlWixlQUFlRyxPQUFPTztJQUUzQyxPQUFPRTtBQUNUO0FBRU8sU0FBU2QsZ0RBQWdESyxLQUFLLEVBQUVHLE9BQU8sRUFBRUMscUJBQXFCO0lBQ25HLElBQUlBLDBCQUEwQkgsV0FBVztRQUN2Q0csd0JBQXdCRCxTQUFVLEdBQUc7UUFFckNBLFVBQVVILE9BQVEsR0FBRztRQUVyQkEsUUFBUUUsMkJBQVksRUFBRSxHQUFHO0lBQzNCO0lBRUEsSUFBTUssUUFBUUMseUNBQXlDTCxTQUFTQyx3QkFDMURLLGVBQWVaLGVBQWVHLE9BQU9PO0lBRTNDLE9BQU9FO0FBQ1Q7SUFFQSxXQUFlO0lBQ2JiLHlCQUFBQTtJQUNBRix1Q0FBQUE7SUFDQUMsaURBQUFBO0FBQ0Y7QUFFQSxTQUFTYSx5Q0FBeUNMLE9BQU8sRUFBRUMscUJBQXFCO0lBQzlFLElBQU1NLHVCQUF1Qk4sc0JBQXNCTyxVQUFVO0lBRTdEUixVQUFVLEFBQ1IscUJBQUdPLDZCQUNILHFCQUFHUDtJQUdMLElBQU1JLFFBQVFSLGlCQUFpQkk7SUFFL0IsT0FBT0k7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbGV4ZXJzLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBOb21pbmFsTGV4ZXIgfSBmcm9tIFwib2NjYW0tZ3JhbW1hcnNcIjtcbmltcG9ydCB7IGxleGVyc1V0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1jdXN0b20tZ3JhbW1hcnNcIjtcblxuY29uc3QgeyBsZXhlckZyb21Ob3RoaW5nLCBsZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIsIGxleGVyRnJvbUVudHJpZXNBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIgfSA9IGxleGVyc1V0aWxpdGllcztcblxuZXhwb3J0IGZ1bmN0aW9uIG5vbWluYWxMZXhlckZyb21Ob3RoaW5nKENsYXNzKSB7XG4gIGlmIChDbGFzcyA9PT0gdW5kZWZpbmVkKSB7XG4gICAgQ2xhc3MgPSBOb21pbmFsTGV4ZXI7IC8vL1xuICB9XG5cbiAgY29uc3QgbGV4ZXIgPSBsZXhlckZyb21Ob3RoaW5nKENsYXNzKSxcbiAgICAgICAgbm9taW5hbExleGVyID0gbGV4ZXI7IC8vL1xuXG4gIHJldHVybiBub21pbmFsTGV4ZXI7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKENsYXNzLCBjb21iaW5lZEN1c3RvbUdyYW1tYXIpIHtcbiAgaWYgKGNvbWJpbmVkQ3VzdG9tR3JhbW1hciA9PT0gdW5kZWZpbmVkKSB7XG4gICAgY29tYmluZWRDdXN0b21HcmFtbWFyID0gQ2xhc3M7ICAvLy9cblxuICAgIENsYXNzID0gTm9taW5hbExleGVyOyAvLy9cbiAgfVxuXG4gIGNvbnN0IGxleGVyID0gbGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKENsYXNzLCBjb21iaW5lZEN1c3RvbUdyYW1tYXIpLFxuICAgICAgICBub21pbmFsTGV4ZXIgPSBsZXhlcjsgLy8vXG5cbiAgcmV0dXJuIG5vbWluYWxMZXhlcjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vbWluYWxMZXhlckZyb21FbnRyaWVzQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyKENsYXNzLCBlbnRyaWVzLCBjb21iaW5lZEN1c3RvbUdyYW1tYXIpIHtcbiAgaWYgKGNvbWJpbmVkQ3VzdG9tR3JhbW1hciA9PT0gdW5kZWZpbmVkKSB7XG4gICAgY29tYmluZWRDdXN0b21HcmFtbWFyID0gZW50cmllczsgIC8vL1xuXG4gICAgZW50cmllcyA9IENsYXNzOyAgLy8vXG5cbiAgICBDbGFzcyA9IE5vbWluYWxMZXhlcjsgLy8vXG4gIH1cblxuICBjb25zdCBsZXhlciA9IGxleGVyRnJvbUVudHJpZXNBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIoQ2xhc3MsIGVudHJpZXMsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hciksXG4gICAgICAgIG5vbWluYWxMZXhlciA9IGxleGVyOyAvLy9cblxuICByZXR1cm4gbm9taW5hbExleGVyO1xufVxuXG5leHBvcnQgZGVmYXVsdCB7XG4gIG5vbWluYWxMZXhlckZyb21Ob3RoaW5nLFxuICBub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyLFxuICBub21pbmFsTGV4ZXJGcm9tRW50cmllc0FuZENvbWJpbmVkQ3VzdG9tR3JhbW1hclxufTtcbiJdLCJuYW1lcyI6WyJub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyIiwibm9taW5hbExleGVyRnJvbUVudHJpZXNBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJub21pbmFsTGV4ZXJGcm9tTm90aGluZyIsImxleGVyRnJvbU5vdGhpbmciLCJsZXhlcnNVdGlsaXRpZXMiLCJsZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIiLCJsZXhlckZyb21FbnRyaWVzQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyIiwiQ2xhc3MiLCJ1bmRlZmluZWQiLCJOb21pbmFsTGV4ZXIiLCJsZXhlciIsIm5vbWluYWxMZXhlciIsImNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsImVudHJpZXMiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQThDQTtlQUFBOztRQTVCZ0JBO2VBQUFBOztRQWFBQztlQUFBQTs7UUF4QkFDO2VBQUFBOzs7NkJBTGE7bUNBQ0c7QUFFaEMsSUFBUUMsbUJBQStGQyxvQ0FBZSxDQUE5R0Qsa0JBQWtCRSxpQ0FBNkVELG9DQUFlLENBQTVGQyxnQ0FBZ0NDLDJDQUE2Q0Ysb0NBQWUsQ0FBNURFO0FBRW5ELFNBQVNKLHdCQUF3QkssS0FBSztJQUMzQyxJQUFJQSxVQUFVQyxXQUFXO1FBQ3ZCRCxRQUFRRSwyQkFBWSxFQUFFLEdBQUc7SUFDM0I7SUFFQSxJQUFNQyxRQUFRUCxpQkFBaUJJLFFBQ3pCSSxlQUFlRCxPQUFPLEdBQUc7SUFFL0IsT0FBT0M7QUFDVDtBQUVPLFNBQVNYLHNDQUFzQ08sS0FBSyxFQUFFSyxxQkFBcUI7SUFDaEYsSUFBSUEsMEJBQTBCSixXQUFXO1FBQ3ZDSSx3QkFBd0JMLE9BQVEsR0FBRztRQUVuQ0EsUUFBUUUsMkJBQVksRUFBRSxHQUFHO0lBQzNCO0lBRUEsSUFBTUMsUUFBUUwsK0JBQStCRSxPQUFPSyx3QkFDOUNELGVBQWVELE9BQU8sR0FBRztJQUUvQixPQUFPQztBQUNUO0FBRU8sU0FBU1YsZ0RBQWdETSxLQUFLLEVBQUVNLE9BQU8sRUFBRUQscUJBQXFCO0lBQ25HLElBQUlBLDBCQUEwQkosV0FBVztRQUN2Q0ksd0JBQXdCQyxTQUFVLEdBQUc7UUFFckNBLFVBQVVOLE9BQVEsR0FBRztRQUVyQkEsUUFBUUUsMkJBQVksRUFBRSxHQUFHO0lBQzNCO0lBRUEsSUFBTUMsUUFBUUoseUNBQXlDQyxPQUFPTSxTQUFTRCx3QkFDakVELGVBQWVELE9BQU8sR0FBRztJQUUvQixPQUFPQztBQUNUO0lBRUEsV0FBZTtJQUNiVCx5QkFBQUE7SUFDQUYsdUNBQUFBO0lBQ0FDLGlEQUFBQTtBQUNGIn0=

package/lib/utilities/parsers.js

@@ -32,19 +32,13 @@ _export(exports, {
     }
 });
 var _occamgrammars = require("occam-grammars");
-var _occamparsers = require("occam-parsers");
-var _combined = /*#__PURE__*/ _interop_require_default(require("../customGrammar/combined"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var rulesFromBNF = _occamparsers.parserUtilities.rulesFromBNF, parserFromRules = _occamparsers.parserUtilities.parserFromRules, parserFromRulesAndStartRuleName = _occamparsers.parserUtilities.parserFromRulesAndStartRuleName;
+var _occamcustomgrammars = require("occam-custom-grammars");
+var parserFromNothing = _occamcustomgrammars.parsersUtilities.parserFromNothing, parserFromStartRuleName = _occamcustomgrammars.parsersUtilities.parserFromStartRuleName, parserFromCombinedCustomGrammar = _occamcustomgrammars.parsersUtilities.parserFromCombinedCustomGrammar, parserFromBNFAndCombinedCustomGrammar = _occamcustomgrammars.parsersUtilities.parserFromBNFAndCombinedCustomGrammar, parserFromStartRuleNameAndCombinedCustomGrammar = _occamcustomgrammars.parsersUtilities.parserFromStartRuleNameAndCombinedCustomGrammar, parserFromBNFStartRuleNameAndCombinedCustomGrammar = _occamcustomgrammars.parsersUtilities.parserFromBNFStartRuleNameAndCombinedCustomGrammar;
 function nominalParserFromNothing(Class) {
     if (Class === undefined) {
         Class = _occamgrammars.NominalParser; ///
     }
-    var bnf = Class.bnf, combinedCustomGrammar = _combined.default.fromNothing(), rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar), nominalParser = parserFromRules(Class, rules);
+    var parser = parserFromNothing(Class), nominalParser = parser; ///
     return nominalParser;
 }
 function nominalParserFromStartRuleName(Class, startRuleName) {
@@ -52,7 +46,7 @@ function nominalParserFromStartRuleName(Class, startRuleName) {
         startRuleName = Class; ///
         Class = _occamgrammars.NominalParser; ///
     }
-    var bnf = Class.bnf, combinedCustomGrammar = _combined.default.fromNothing(), rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar), nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);
+    var parser = parserFromStartRuleName(Class, startRuleName), nominalParser = parser; ///
     return nominalParser;
 }
 function nominalParserFromCombinedCustomGrammar(Class, combinedCustomGrammar) {
@@ -60,7 +54,7 @@ function nominalParserFromCombinedCustomGrammar(Class, combinedCustomGrammar) {
         combinedCustomGrammar = Class; ///
         Class = _occamgrammars.NominalParser; ///
     }
-    var bnf = Class.bnf, rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar), nominalParser = parserFromRules(Class, rules);
+    var parser = parserFromCombinedCustomGrammar(Class, combinedCustomGrammar), nominalParser = parser; ///
     return nominalParser;
 }
 function nominalParserFromBNFAndCombinedCustomGrammar(Class, bnf, combinedCustomGrammar) {
@@ -69,7 +63,7 @@ function nominalParserFromBNFAndCombinedCustomGrammar(Class, bnf, combinedCustom
         bnf = Class; ///
         Class = _occamgrammars.NominalParser; ///
     }
-    var rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar), nominalParser = parserFromRules(Class, rules);
+    var parser = parserFromBNFAndCombinedCustomGrammar(Class, bnf, combinedCustomGrammar), nominalParser = parser; ///
     return nominalParser;
 }
 function nominalParserFromStartRuleNameAndCombinedCustomGrammar(Class, startRuleName, combinedCustomGrammar) {
@@ -78,7 +72,7 @@ function nominalParserFromStartRuleNameAndCombinedCustomGrammar(Class, startRule
         startRuleName = Class; ///
         Class = _occamgrammars.NominalParser; ///
     }
-    var bnf = Class.bnf, rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar), nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);
+    var parser = parserFromStartRuleNameAndCombinedCustomGrammar(Class, startRuleName, combinedCustomGrammar), nominalParser = parser; ///
     return nominalParser;
 }
 function nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar(Class, bnf, startRuleName, combinedCustomGrammar) {
@@ -88,7 +82,7 @@ function nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar(Class, bnf, s
         bnf = Class; ///
         Class = _occamgrammars.NominalParser; ///
     }
-    var rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar), nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);
+    var parser = parserFromBNFStartRuleNameAndCombinedCustomGrammar(Class, bnf, startRuleName, combinedCustomGrammar), nominalParser = parser; ///
     return nominalParser;
 }
 var _default = {
@@ -99,10 +93,5 @@ var _default = {
     nominalParserFromStartRuleNameAndCombinedCustomGrammar: nominalParserFromStartRuleNameAndCombinedCustomGrammar,
     nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar: nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar
 };
-function rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar) {
-    var rules = rulesFromBNF(bnf);
-    rules = combinedCustomGrammar.postProcess(rules);
-    return rules;
-}
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/parsers.js"],"sourcesContent":["\"use strict\";\n\nimport { NominalParser } from \"occam-grammars\";\nimport { parserUtilities } from \"occam-parsers\";\n\nimport CombinedCustomGrammar from \"../customGrammar/combined\";\n\nconst { rulesFromBNF, parserFromRules, parserFromRulesAndStartRuleName } = parserUtilities;\n\nexport function nominalParserFromNothing(Class) {\n  if (Class === undefined) {\n    Class = NominalParser;  ///\n  }\n\n  const { bnf } = Class,\n        combinedCustomGrammar = CombinedCustomGrammar.fromNothing(),\n        rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),\n        nominalParser = parserFromRules(Class, rules);\n\n  return nominalParser;\n}\n\nexport function nominalParserFromStartRuleName(Class, startRuleName) {\n  if (startRuleName === undefined) {\n    startRuleName = Class;  ///\n\n    Class = NominalParser;  ///\n  }\n\n  const { bnf } = Class,\n        combinedCustomGrammar = CombinedCustomGrammar.fromNothing(),\n        rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),\n        nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);\n\n  return nominalParser;\n}\n\nexport function nominalParserFromCombinedCustomGrammar(Class, combinedCustomGrammar) {\n  if (combinedCustomGrammar === undefined) {\n    combinedCustomGrammar = Class;  ///\n\n    Class = NominalParser;  ///\n  }\n\n  const { bnf } = Class,\n        rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),\n        nominalParser = parserFromRules(Class, rules);\n\n  return nominalParser;\n}\n\nexport function nominalParserFromBNFAndCombinedCustomGrammar(Class, bnf, combinedCustomGrammar) {\n  if (combinedCustomGrammar === undefined) {\n    combinedCustomGrammar = bnf;  ///\n\n    bnf = Class;  ///\n\n    Class = NominalParser;  ///\n  }\n\n  const rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),\n        nominalParser = parserFromRules(Class, rules);\n\n  return nominalParser;\n}\n\nexport function nominalParserFromStartRuleNameAndCombinedCustomGrammar(Class, startRuleName, combinedCustomGrammar) {\n  if (combinedCustomGrammar === undefined) {\n    combinedCustomGrammar = startRuleName;  ///\n\n    startRuleName = Class;  ///\n\n    Class = NominalParser;  ///\n  }\n\n  const { bnf } = Class,\n        rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),\n        nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);\n\n  return nominalParser;\n}\n\nexport function nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar(Class, bnf, startRuleName, combinedCustomGrammar) {\n  if (combinedCustomGrammar === undefined) {\n    combinedCustomGrammar = startRuleName;  ///\n\n    startRuleName = bnf;  ///\n\n    bnf = Class;  ///\n\n    Class = NominalParser;  ///\n  }\n\n  const rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),\n        nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);\n\n  return nominalParser;\n}\n\nexport default {\n  nominalParserFromNothing,\n  nominalParserFromStartRuleName,\n  nominalParserFromCombinedCustomGrammar,\n  nominalParserFromBNFAndCombinedCustomGrammar,\n  nominalParserFromStartRuleNameAndCombinedCustomGrammar,\n  nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar\n};\n\nfunction rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar) {\n  let rules = rulesFromBNF(bnf);\n\n  rules = combinedCustomGrammar.postProcess(rules);\n\n  return rules;\n}\n"],"names":["nominalParserFromBNFAndCombinedCustomGrammar","nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar","nominalParserFromCombinedCustomGrammar","nominalParserFromNothing","nominalParserFromStartRuleName","nominalParserFromStartRuleNameAndCombinedCustomGrammar","rulesFromBNF","parserUtilities","parserFromRules","parserFromRulesAndStartRuleName","Class","undefined","NominalParser","bnf","combinedCustomGrammar","CombinedCustomGrammar","fromNothing","rules","rulesFromBNFAndCombinedCustomGrammar","nominalParser","startRuleName","postProcess"],"mappings":"AAAA;;;;;;;;;;;QAmGA;eAAA;;QAhDgBA;eAAAA;;QA+BAC;eAAAA;;QA7CAC;eAAAA;;QA5BAC;eAAAA;;QAaAC;eAAAA;;QA4CAC;eAAAA;;;6BAhEc;4BACE;+DAEE;;;;;;AAElC,IAAQC,eAAmEC,6BAAe,CAAlFD,cAAcE,kBAAqDD,6BAAe,CAApEC,iBAAiBC,kCAAoCF,6BAAe,CAAnDE;AAEhC,SAASN,yBAAyBO,KAAK;IAC5C,IAAIA,UAAUC,WAAW;QACvBD,QAAQE,4BAAa,EAAG,GAAG;IAC7B;IAEA,IAAM,AAAEC,MAAQH,MAARG,KACFC,wBAAwBC,iBAAqB,CAACC,WAAW,IACzDC,QAAQC,qCAAqCL,KAAKC,wBAClDK,gBAAgBX,gBAAgBE,OAAOO;IAE7C,OAAOE;AACT;AAEO,SAASf,+BAA+BM,KAAK,EAAEU,aAAa;IACjE,IAAIA,kBAAkBT,WAAW;QAC/BS,gBAAgBV,OAAQ,GAAG;QAE3BA,QAAQE,4BAAa,EAAG,GAAG;IAC7B;IAEA,IAAM,AAAEC,MAAQH,MAARG,KACFC,wBAAwBC,iBAAqB,CAACC,WAAW,IACzDC,QAAQC,qCAAqCL,KAAKC,wBAClDK,gBAAgBV,gCAAgCC,OAAOO,OAAOG;IAEpE,OAAOD;AACT;AAEO,SAASjB,uCAAuCQ,KAAK,EAAEI,qBAAqB;IACjF,IAAIA,0BAA0BH,WAAW;QACvCG,wBAAwBJ,OAAQ,GAAG;QAEnCA,QAAQE,4BAAa,EAAG,GAAG;IAC7B;IAEA,IAAM,AAAEC,MAAQH,MAARG,KACFI,QAAQC,qCAAqCL,KAAKC,wBAClDK,gBAAgBX,gBAAgBE,OAAOO;IAE7C,OAAOE;AACT;AAEO,SAASnB,6CAA6CU,KAAK,EAAEG,GAAG,EAAEC,qBAAqB;IAC5F,IAAIA,0BAA0BH,WAAW;QACvCG,wBAAwBD,KAAM,GAAG;QAEjCA,MAAMH,OAAQ,GAAG;QAEjBA,QAAQE,4BAAa,EAAG,GAAG;IAC7B;IAEA,IAAMK,QAAQC,qCAAqCL,KAAKC,wBAClDK,gBAAgBX,gBAAgBE,OAAOO;IAE7C,OAAOE;AACT;AAEO,SAASd,uDAAuDK,KAAK,EAAEU,aAAa,EAAEN,qBAAqB;IAChH,IAAIA,0BAA0BH,WAAW;QACvCG,wBAAwBM,eAAgB,GAAG;QAE3CA,gBAAgBV,OAAQ,GAAG;QAE3BA,QAAQE,4BAAa,EAAG,GAAG;IAC7B;IAEA,IAAM,AAAEC,MAAQH,MAARG,KACFI,QAAQC,qCAAqCL,KAAKC,wBAClDK,gBAAgBV,gCAAgCC,OAAOO,OAAOG;IAEpE,OAAOD;AACT;AAEO,SAASlB,0DAA0DS,KAAK,EAAEG,GAAG,EAAEO,aAAa,EAAEN,qBAAqB;IACxH,IAAIA,0BAA0BH,WAAW;QACvCG,wBAAwBM,eAAgB,GAAG;QAE3CA,gBAAgBP,KAAM,GAAG;QAEzBA,MAAMH,OAAQ,GAAG;QAEjBA,QAAQE,4BAAa,EAAG,GAAG;IAC7B;IAEA,IAAMK,QAAQC,qCAAqCL,KAAKC,wBAClDK,gBAAgBV,gCAAgCC,OAAOO,OAAOG;IAEpE,OAAOD;AACT;IAEA,WAAe;IACbhB,0BAAAA;IACAC,gCAAAA;IACAF,wCAAAA;IACAF,8CAAAA;IACAK,wDAAAA;IACAJ,2DAAAA;AACF;AAEA,SAASiB,qCAAqCL,GAAG,EAAEC,qBAAqB;IACtE,IAAIG,QAAQX,aAAaO;IAEzBI,QAAQH,sBAAsBO,WAAW,CAACJ;IAE1C,OAAOA;AACT"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcGFyc2Vycy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgTm9taW5hbFBhcnNlciB9IGZyb20gXCJvY2NhbS1ncmFtbWFyc1wiO1xuaW1wb3J0IHsgcGFyc2Vyc1V0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1jdXN0b20tZ3JhbW1hcnNcIjtcblxuY29uc3QgeyBwYXJzZXJGcm9tTm90aGluZyxcbiAgICAgICAgcGFyc2VyRnJvbVN0YXJ0UnVsZU5hbWUsXG4gICAgICAgIHBhcnNlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIsXG4gICAgICAgIHBhcnNlckZyb21CTkZBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIsXG4gICAgICAgIHBhcnNlckZyb21TdGFydFJ1bGVOYW1lQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyLFxuICAgICAgICBwYXJzZXJGcm9tQk5GU3RhcnRSdWxlTmFtZUFuZENvbWJpbmVkQ3VzdG9tR3JhbW1hciB9ID0gcGFyc2Vyc1V0aWxpdGllcztcblxuZXhwb3J0IGZ1bmN0aW9uIG5vbWluYWxQYXJzZXJGcm9tTm90aGluZyhDbGFzcykge1xuICBpZiAoQ2xhc3MgPT09IHVuZGVmaW5lZCkge1xuICAgIENsYXNzID0gTm9taW5hbFBhcnNlcjsgIC8vL1xuICB9XG5cbiAgY29uc3QgcGFyc2VyID0gcGFyc2VyRnJvbU5vdGhpbmcoQ2xhc3MpLFxuICAgICAgICBub21pbmFsUGFyc2VyID0gcGFyc2VyOyAvLy9cblxuICByZXR1cm4gbm9taW5hbFBhcnNlcjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vbWluYWxQYXJzZXJGcm9tU3RhcnRSdWxlTmFtZShDbGFzcywgc3RhcnRSdWxlTmFtZSkge1xuICBpZiAoc3RhcnRSdWxlTmFtZSA9PT0gdW5kZWZpbmVkKSB7XG4gICAgc3RhcnRSdWxlTmFtZSA9IENsYXNzOyAgLy8vXG5cbiAgICBDbGFzcyA9IE5vbWluYWxQYXJzZXI7ICAvLy9cbiAgfVxuXG4gIGNvbnN0IHBhcnNlciA9ICBwYXJzZXJGcm9tU3RhcnRSdWxlTmFtZShDbGFzcywgc3RhcnRSdWxlTmFtZSksXG4gICAgICAgIG5vbWluYWxQYXJzZXIgPSBwYXJzZXI7IC8vL1xuXG4gIHJldHVybiBub21pbmFsUGFyc2VyO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbm9taW5hbFBhcnNlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIoQ2xhc3MsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikge1xuICBpZiAoY29tYmluZWRDdXN0b21HcmFtbWFyID09PSB1bmRlZmluZWQpIHtcbiAgICBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBDbGFzczsgIC8vL1xuXG4gICAgQ2xhc3MgPSBOb21pbmFsUGFyc2VyOyAgLy8vXG4gIH1cblxuICBjb25zdCBwYXJzZXIgPSBwYXJzZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKENsYXNzLCBjb21iaW5lZEN1c3RvbUdyYW1tYXIpLFxuICAgICAgICBub21pbmFsUGFyc2VyID0gcGFyc2VyOyAvLy9cblxuICByZXR1cm4gbm9taW5hbFBhcnNlcjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vbWluYWxQYXJzZXJGcm9tQk5GQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyKENsYXNzLCBibmYsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikge1xuICBpZiAoY29tYmluZWRDdXN0b21HcmFtbWFyID09PSB1bmRlZmluZWQpIHtcbiAgICBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBibmY7ICAvLy9cblxuICAgIGJuZiA9IENsYXNzOyAgLy8vXG5cbiAgICBDbGFzcyA9IE5vbWluYWxQYXJzZXI7ICAvLy9cbiAgfVxuXG4gIGNvbnN0IHBhcnNlciA9IHBhcnNlckZyb21CTkZBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIoQ2xhc3MsIGJuZiwgY29tYmluZWRDdXN0b21HcmFtbWFyKSxcbiAgICAgICAgbm9taW5hbFBhcnNlciA9IHBhcnNlcjsgLy8vXG5cbiAgcmV0dXJuIG5vbWluYWxQYXJzZXI7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBub21pbmFsUGFyc2VyRnJvbVN0YXJ0UnVsZU5hbWVBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIoQ2xhc3MsIHN0YXJ0UnVsZU5hbWUsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikge1xuICBpZiAoY29tYmluZWRDdXN0b21HcmFtbWFyID09PSB1bmRlZmluZWQpIHtcbiAgICBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBzdGFydFJ1bGVOYW1lOyAgLy8vXG5cbiAgICBzdGFydFJ1bGVOYW1lID0gQ2xhc3M7ICAvLy9cblxuICAgIENsYXNzID0gTm9taW5hbFBhcnNlcjsgIC8vL1xuICB9XG5cbiAgY29uc3QgcGFyc2VyID0gcGFyc2VyRnJvbVN0YXJ0UnVsZU5hbWVBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIoQ2xhc3MsIHN0YXJ0UnVsZU5hbWUsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hciksXG4gICAgICAgIG5vbWluYWxQYXJzZXIgPSBwYXJzZXI7IC8vL1xuXG4gIHJldHVybiBub21pbmFsUGFyc2VyO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbm9taW5hbFBhcnNlckZyb21CTkZTdGFydFJ1bGVOYW1lQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyKENsYXNzLCBibmYsIHN0YXJ0UnVsZU5hbWUsIGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikge1xuICBpZiAoY29tYmluZWRDdXN0b21HcmFtbWFyID09PSB1bmRlZmluZWQpIHtcbiAgICBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBzdGFydFJ1bGVOYW1lOyAgLy8vXG5cbiAgICBzdGFydFJ1bGVOYW1lID0gYm5mOyAgLy8vXG5cbiAgICBibmYgPSBDbGFzczsgIC8vL1xuXG4gICAgQ2xhc3MgPSBOb21pbmFsUGFyc2VyOyAgLy8vXG4gIH1cblxuICBjb25zdCBwYXJzZXIgPSBwYXJzZXJGcm9tQk5GU3RhcnRSdWxlTmFtZUFuZENvbWJpbmVkQ3VzdG9tR3JhbW1hcihDbGFzcywgYm5mLCBzdGFydFJ1bGVOYW1lLCBjb21iaW5lZEN1c3RvbUdyYW1tYXIpLFxuICAgICAgICBub21pbmFsUGFyc2VyID0gcGFyc2VyOyAvLy9cblxuICByZXR1cm4gbm9taW5hbFBhcnNlcjtcbn1cblxuZXhwb3J0IGRlZmF1bHQge1xuICBub21pbmFsUGFyc2VyRnJvbU5vdGhpbmcsXG4gIG5vbWluYWxQYXJzZXJGcm9tU3RhcnRSdWxlTmFtZSxcbiAgbm9taW5hbFBhcnNlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIsXG4gIG5vbWluYWxQYXJzZXJGcm9tQk5GQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyLFxuICBub21pbmFsUGFyc2VyRnJvbVN0YXJ0UnVsZU5hbWVBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIsXG4gIG5vbWluYWxQYXJzZXJGcm9tQk5GU3RhcnRSdWxlTmFtZUFuZENvbWJpbmVkQ3VzdG9tR3JhbW1hclxufTtcbiJdLCJuYW1lcyI6WyJub21pbmFsUGFyc2VyRnJvbUJORkFuZENvbWJpbmVkQ3VzdG9tR3JhbW1hciIsIm5vbWluYWxQYXJzZXJGcm9tQk5GU3RhcnRSdWxlTmFtZUFuZENvbWJpbmVkQ3VzdG9tR3JhbW1hciIsIm5vbWluYWxQYXJzZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyIiwibm9taW5hbFBhcnNlckZyb21Ob3RoaW5nIiwibm9taW5hbFBhcnNlckZyb21TdGFydFJ1bGVOYW1lIiwibm9taW5hbFBhcnNlckZyb21TdGFydFJ1bGVOYW1lQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyIiwicGFyc2VyRnJvbU5vdGhpbmciLCJwYXJzZXJzVXRpbGl0aWVzIiwicGFyc2VyRnJvbVN0YXJ0UnVsZU5hbWUiLCJwYXJzZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyIiwicGFyc2VyRnJvbUJORkFuZENvbWJpbmVkQ3VzdG9tR3JhbW1hciIsInBhcnNlckZyb21TdGFydFJ1bGVOYW1lQW5kQ29tYmluZWRDdXN0b21HcmFtbWFyIiwicGFyc2VyRnJvbUJORlN0YXJ0UnVsZU5hbWVBbmRDb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJDbGFzcyIsInVuZGVmaW5lZCIsIk5vbWluYWxQYXJzZXIiLCJwYXJzZXIiLCJub21pbmFsUGFyc2VyIiwic3RhcnRSdWxlTmFtZSIsImNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsImJuZiJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBZ0dBO2VBQUE7O1FBL0NnQkE7ZUFBQUE7O1FBOEJBQztlQUFBQTs7UUEzQ0FDO2VBQUFBOztRQXhCQUM7ZUFBQUE7O1FBV0FDO2VBQUFBOztRQXlDQUM7ZUFBQUE7Ozs2QkE5RGM7bUNBQ0c7QUFFakMsSUFBUUMsb0JBS3VEQyxxQ0FBZ0IsQ0FMdkVELG1CQUNBRSwwQkFJdURELHFDQUFnQixDQUp2RUMseUJBQ0FDLGtDQUd1REYscUNBQWdCLENBSHZFRSxpQ0FDQUMsd0NBRXVESCxxQ0FBZ0IsQ0FGdkVHLHVDQUNBQyxrREFDdURKLHFDQUFnQixDQUR2RUksaURBQ0FDLHFEQUF1REwscUNBQWdCLENBQXZFSztBQUVELFNBQVNULHlCQUF5QlUsS0FBSztJQUM1QyxJQUFJQSxVQUFVQyxXQUFXO1FBQ3ZCRCxRQUFRRSw0QkFBYSxFQUFHLEdBQUc7SUFDN0I7SUFFQSxJQUFNQyxTQUFTVixrQkFBa0JPLFFBQzNCSSxnQkFBZ0JELFFBQVEsR0FBRztJQUVqQyxPQUFPQztBQUNUO0FBRU8sU0FBU2IsK0JBQStCUyxLQUFLLEVBQUVLLGFBQWE7SUFDakUsSUFBSUEsa0JBQWtCSixXQUFXO1FBQy9CSSxnQkFBZ0JMLE9BQVEsR0FBRztRQUUzQkEsUUFBUUUsNEJBQWEsRUFBRyxHQUFHO0lBQzdCO0lBRUEsSUFBTUMsU0FBVVIsd0JBQXdCSyxPQUFPSyxnQkFDekNELGdCQUFnQkQsUUFBUSxHQUFHO0lBRWpDLE9BQU9DO0FBQ1Q7QUFFTyxTQUFTZix1Q0FBdUNXLEtBQUssRUFBRU0scUJBQXFCO0lBQ2pGLElBQUlBLDBCQUEwQkwsV0FBVztRQUN2Q0ssd0JBQXdCTixPQUFRLEdBQUc7UUFFbkNBLFFBQVFFLDRCQUFhLEVBQUcsR0FBRztJQUM3QjtJQUVBLElBQU1DLFNBQVNQLGdDQUFnQ0ksT0FBT00sd0JBQ2hERixnQkFBZ0JELFFBQVEsR0FBRztJQUVqQyxPQUFPQztBQUNUO0FBRU8sU0FBU2pCLDZDQUE2Q2EsS0FBSyxFQUFFTyxHQUFHLEVBQUVELHFCQUFxQjtJQUM1RixJQUFJQSwwQkFBMEJMLFdBQVc7UUFDdkNLLHdCQUF3QkMsS0FBTSxHQUFHO1FBRWpDQSxNQUFNUCxPQUFRLEdBQUc7UUFFakJBLFFBQVFFLDRCQUFhLEVBQUcsR0FBRztJQUM3QjtJQUVBLElBQU1DLFNBQVNOLHNDQUFzQ0csT0FBT08sS0FBS0Qsd0JBQzNERixnQkFBZ0JELFFBQVEsR0FBRztJQUVqQyxPQUFPQztBQUNUO0FBRU8sU0FBU1osdURBQXVEUSxLQUFLLEVBQUVLLGFBQWEsRUFBRUMscUJBQXFCO0lBQ2hILElBQUlBLDBCQUEwQkwsV0FBVztRQUN2Q0ssd0JBQXdCRCxlQUFnQixHQUFHO1FBRTNDQSxnQkFBZ0JMLE9BQVEsR0FBRztRQUUzQkEsUUFBUUUsNEJBQWEsRUFBRyxHQUFHO0lBQzdCO0lBRUEsSUFBTUMsU0FBU0wsZ0RBQWdERSxPQUFPSyxlQUFlQyx3QkFDL0VGLGdCQUFnQkQsUUFBUSxHQUFHO0lBRWpDLE9BQU9DO0FBQ1Q7QUFFTyxTQUFTaEIsMERBQTBEWSxLQUFLLEVBQUVPLEdBQUcsRUFBRUYsYUFBYSxFQUFFQyxxQkFBcUI7SUFDeEgsSUFBSUEsMEJBQTBCTCxXQUFXO1FBQ3ZDSyx3QkFBd0JELGVBQWdCLEdBQUc7UUFFM0NBLGdCQUFnQkUsS0FBTSxHQUFHO1FBRXpCQSxNQUFNUCxPQUFRLEdBQUc7UUFFakJBLFFBQVFFLDRCQUFhLEVBQUcsR0FBRztJQUM3QjtJQUVBLElBQU1DLFNBQVNKLG1EQUFtREMsT0FBT08sS0FBS0YsZUFBZUMsd0JBQ3ZGRixnQkFBZ0JELFFBQVEsR0FBRztJQUVqQyxPQUFPQztBQUNUO0lBRUEsV0FBZTtJQUNiZCwwQkFBQUE7SUFDQUMsZ0NBQUFBO0lBQ0FGLHdDQUFBQTtJQUNBRiw4Q0FBQUE7SUFDQUssd0RBQUFBO0lBQ0FKLDJEQUFBQTtBQUNGIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-nominal",
   "author": "James Smith",
-  "version": "0.0.6",
+  "version": "1.0.0",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-nominal",
   "description": "Occam's Nominal language.",
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "necessary": "^17.0.9",
+    "occam-custom-grammars": "^6.0.0",
     "occam-grammar-utilities": "^8.0.394",
     "occam-grammars": "^1.3.510",
     "occam-lexers": "^23.1.34",
@@ -19,19 +20,11 @@
   },
   "devDependencies": {
     "@swc/core": "1.13.20",
-    "esbuild": "0.11.14",
-    "easy": "^24.1.1",
-    "easy-layout": "^6.0.287",
-    "easy-with-style": "^3.0.537",
-    "express": "^4.17.1",
-    "juxtapose": "^4.0.130",
-    "lively-cli": "^2.0.77",
     "watchful-cli": "^1.7.67"
   },
   "scripts": {
-    "start": "node ./bin/main.js",
     "clean": "rm -rf ./lib",
-    "watchful": "watchful -m --transpiler=swc --bundler=esbuild --source-directory=./src --lib-directory=./lib --entry-file=example.js --bundle-file=./example.js --wait=100",
+    "watchful": "watchful -m --transpiler=swc --source-directory=./src --lib-directory=./lib --pause=100",
     "batch": "npm run watchful batch --",
     "batch-debug": "npm run watchful batch -- --debug",
     "incremental": "npm run watchful incremental --",

package/src/index.js

@@ -1,14 +1,4 @@
 "use strict";
 
-export { DEFAULT_CUSTOM_GRAMMAR_NAME } from "./grammarNames";
-
-export { default as ruleNames } from "./ruleNames";
-export { default as vocabularyNames } from "./vocabularyNames";
-
-export { default as CustomGrammar } from "./customGrammar";
-export { default as defaultCustomGrammar } from "./customGrammar/default";
-export { default as CombinedCustomGrammar } from "./customGrammar/combined";
-
 export { default as lexersUtilities } from "./utilities/lexers";
 export { default as parsersUtilities } from "./utilities/parsers";
-export { default as customGrammarUtilities } from "./utilities/customGrammar";

package/src/utilities/lexers.js

@@ -1,21 +1,17 @@
 "use strict";
 
 import { NominalLexer } from "occam-grammars";
-import { lexerUtilities } from "occam-lexers";
+import { lexersUtilities } from "occam-custom-grammars";
 
-import CombinedCustomGrammar from "../customGrammar/combined";
-
-const { lexerFromRules, rulesFromEntries } = lexerUtilities;
+const { lexerFromNothing, lexerFromCombinedCustomGrammar, lexerFromEntriesAndCombinedCustomGrammar } = lexersUtilities;
 
 export function nominalLexerFromNothing(Class) {
   if (Class === undefined) {
     Class = NominalLexer; ///
   }
 
-  const { entries } = Class,
-        combinedCustomGrammar = CombinedCustomGrammar.fromNothing(),
-        rules = rulesFromEntriesAndCombinedCustomGrammar(entries, combinedCustomGrammar),
-        nominalLexer = lexerFromRules(Class, rules);
+  const lexer = lexerFromNothing(Class),
+        nominalLexer = lexer; ///
 
   return nominalLexer;
 }
@@ -27,9 +23,8 @@ export function nominalLexerFromCombinedCustomGrammar(Class, combinedCustomGramm
     Class = NominalLexer; ///
   }
 
-  const { entries } = Class,
-        rules = rulesFromEntriesAndCombinedCustomGrammar(entries, combinedCustomGrammar),
-        nominalLexer = lexerFromRules(Class, rules);
+  const lexer = lexerFromCombinedCustomGrammar(Class, combinedCustomGrammar),
+        nominalLexer = lexer; ///
 
   return nominalLexer;
 }
@@ -43,8 +38,8 @@ export function nominalLexerFromEntriesAndCombinedCustomGrammar(Class, entries,
     Class = NominalLexer; ///
   }
 
-  const rules = rulesFromEntriesAndCombinedCustomGrammar(entries, combinedCustomGrammar),
-        nominalLexer = lexerFromRules(Class, rules);
+  const lexer = lexerFromEntriesAndCombinedCustomGrammar(Class, entries, combinedCustomGrammar),
+        nominalLexer = lexer; ///
 
   return nominalLexer;
 }
@@ -54,16 +49,3 @@ export default {
   nominalLexerFromCombinedCustomGrammar,
   nominalLexerFromEntriesAndCombinedCustomGrammar
 };
-
-function rulesFromEntriesAndCombinedCustomGrammar(entries, combinedCustomGrammar) {
-  const customGrammarEntries = combinedCustomGrammar.getEntries();
-
-  entries = [ ///
-    ...customGrammarEntries,
-    ...entries
-  ];
-
-  const rules = rulesFromEntries(entries);
-
-  return rules;
-}

package/src/utilities/parsers.js

@@ -1,21 +1,22 @@
 "use strict";
 
 import { NominalParser } from "occam-grammars";
-import { parserUtilities } from "occam-parsers";
+import { parsersUtilities } from "occam-custom-grammars";
 
-import CombinedCustomGrammar from "../customGrammar/combined";
-
-const { rulesFromBNF, parserFromRules, parserFromRulesAndStartRuleName } = parserUtilities;
+const { parserFromNothing,
+        parserFromStartRuleName,
+        parserFromCombinedCustomGrammar,
+        parserFromBNFAndCombinedCustomGrammar,
+        parserFromStartRuleNameAndCombinedCustomGrammar,
+        parserFromBNFStartRuleNameAndCombinedCustomGrammar } = parsersUtilities;
 
 export function nominalParserFromNothing(Class) {
   if (Class === undefined) {
     Class = NominalParser;  ///
   }
 
-  const { bnf } = Class,
-        combinedCustomGrammar = CombinedCustomGrammar.fromNothing(),
-        rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),
-        nominalParser = parserFromRules(Class, rules);
+  const parser = parserFromNothing(Class),
+        nominalParser = parser; ///
 
   return nominalParser;
 }
@@ -27,10 +28,8 @@ export function nominalParserFromStartRuleName(Class, startRuleName) {
     Class = NominalParser;  ///
   }
 
-  const { bnf } = Class,
-        combinedCustomGrammar = CombinedCustomGrammar.fromNothing(),
-        rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),
-        nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);
+  const parser =  parserFromStartRuleName(Class, startRuleName),
+        nominalParser = parser; ///
 
   return nominalParser;
 }
@@ -42,9 +41,8 @@ export function nominalParserFromCombinedCustomGrammar(Class, combinedCustomGram
     Class = NominalParser;  ///
   }
 
-  const { bnf } = Class,
-        rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),
-        nominalParser = parserFromRules(Class, rules);
+  const parser = parserFromCombinedCustomGrammar(Class, combinedCustomGrammar),
+        nominalParser = parser; ///
 
   return nominalParser;
 }
@@ -58,8 +56,8 @@ export function nominalParserFromBNFAndCombinedCustomGrammar(Class, bnf, combine
     Class = NominalParser;  ///
   }
 
-  const rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),
-        nominalParser = parserFromRules(Class, rules);
+  const parser = parserFromBNFAndCombinedCustomGrammar(Class, bnf, combinedCustomGrammar),
+        nominalParser = parser; ///
 
   return nominalParser;
 }
@@ -73,9 +71,8 @@ export function nominalParserFromStartRuleNameAndCombinedCustomGrammar(Class, st
     Class = NominalParser;  ///
   }
 
-  const { bnf } = Class,
-        rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),
-        nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);
+  const parser = parserFromStartRuleNameAndCombinedCustomGrammar(Class, startRuleName, combinedCustomGrammar),
+        nominalParser = parser; ///
 
   return nominalParser;
 }
@@ -91,8 +88,8 @@ export function nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar(Class,
     Class = NominalParser;  ///
   }
 
-  const rules = rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar),
-        nominalParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);
+  const parser = parserFromBNFStartRuleNameAndCombinedCustomGrammar(Class, bnf, startRuleName, combinedCustomGrammar),
+        nominalParser = parser; ///
 
   return nominalParser;
 }
@@ -105,11 +102,3 @@ export default {
   nominalParserFromStartRuleNameAndCombinedCustomGrammar,
   nominalParserFromBNFStartRuleNameAndCombinedCustomGrammar
 };
-
-function rulesFromBNFAndCombinedCustomGrammar(bnf, combinedCustomGrammar) {
-  let rules = rulesFromBNF(bnf);
-
-  rules = combinedCustomGrammar.postProcess(rules);
-
-  return rules;
-}

package/lib/constants.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get BASE_TYPE_SYMBOL () {
-        return BASE_TYPE_SYMBOL;
-    },
-    get EMPTY_STRING () {
-        return EMPTY_STRING;
-    },
-    get NONSENSE_RULE_NAME () {
-        return NONSENSE_RULE_NAME;
-    },
-    get STUFF_RULE_NAME () {
-        return STUFF_RULE_NAME;
-    },
-    get UNASSIGNED_TYPE () {
-        return UNASSIGNED_TYPE;
-    },
-    get VERTICAL_BAR () {
-        return VERTICAL_BAR;
-    },
-    get VERTICAL_SPACE () {
-        return VERTICAL_SPACE;
-    }
-});
-var EMPTY_STRING = "";
-var VERTICAL_BAR = "|";
-var VERTICAL_SPACE = "\n\n";
-var UNASSIGNED_TYPE = "unassigned";
-var STUFF_RULE_NAME = "stuff";
-var BASE_TYPE_SYMBOL = "<>";
-var NONSENSE_RULE_NAME = "nonsense";
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdGFudHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBjb25zdCBFTVBUWV9TVFJJTkcgPSBcIlwiO1xuZXhwb3J0IGNvbnN0IFZFUlRJQ0FMX0JBUiA9IFwifFwiO1xuZXhwb3J0IGNvbnN0IFZFUlRJQ0FMX1NQQUNFID0gYFxuXG5gXG5leHBvcnQgY29uc3QgVU5BU1NJR05FRF9UWVBFID0gXCJ1bmFzc2lnbmVkXCI7XG5leHBvcnQgY29uc3QgU1RVRkZfUlVMRV9OQU1FID0gXCJzdHVmZlwiO1xuZXhwb3J0IGNvbnN0IEJBU0VfVFlQRV9TWU1CT0wgPSBcIjw+XCI7XG5leHBvcnQgY29uc3QgTk9OU0VOU0VfUlVMRV9OQU1FID0gXCJub25zZW5zZVwiO1xuIl0sIm5hbWVzIjpbIkJBU0VfVFlQRV9TWU1CT0wiLCJFTVBUWV9TVFJJTkciLCJOT05TRU5TRV9SVUxFX05BTUUiLCJTVFVGRl9SVUxFX05BTUUiLCJVTkFTU0lHTkVEX1RZUEUiLCJWRVJUSUNBTF9CQVIiLCJWRVJUSUNBTF9TUEFDRSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBU2FBO2VBQUFBOztRQVBBQztlQUFBQTs7UUFRQUM7ZUFBQUE7O1FBRkFDO2VBQUFBOztRQURBQztlQUFBQTs7UUFKQUM7ZUFBQUE7O1FBQ0FDO2VBQUFBOzs7QUFGTixJQUFNTCxlQUFlO0FBQ3JCLElBQU1JLGVBQWU7QUFDckIsSUFBTUMsaUJBQWlCO0FBR3ZCLElBQU1GLGtCQUFrQjtBQUN4QixJQUFNRCxrQkFBa0I7QUFDeEIsSUFBTUgsbUJBQW1CO0FBQ3pCLElBQU1FLHFCQUFxQiJ9