occam-custom-grammars 5.0.310 → 5.0.312

package/lib/combinedCustomGrammar.js

@@ -85,6 +85,10 @@ var CombinedCustomGrammar = /*#__PURE__*/ function() {
         {
             key: "fromCustomGrammars",
             value: function fromCustomGrammars(customGrammars) {
+                var defaultCustomGrammar = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : defaultCustomGrammar;
+                customGrammars = [
+                    defaultCustomGrammar
+                ].concat(_toConsumableArray(customGrammars)); ///
                 var rules = rulesFromCustomGrammarsAndDefaultBNF(customGrammars), entries = entriesFromCustomGrammars(customGrammars), combinedCustomGrammar = new CombinedCustomGrammar(rules, entries);
                 return combinedCustomGrammar;
             }
@@ -92,10 +96,25 @@ var CombinedCustomGrammar = /*#__PURE__*/ function() {
     ]);
     return CombinedCustomGrammar;
 }();
+function rulesFromCustomGrammarsAndDefaultBNF(customGrammars) {
+    var bnfs = customGrammars.map(function(customGrammar) {
+        var bnf = customGrammar.getBNF();
+        return bnf;
+    }), bnf = bnfs.join(_constants.EMPTY_STRING), rules = rulesFromBNF(bnf);
+    combineRules(rules);
+    return rules;
+}
+function entriesFromCustomGrammars(customGrammars) {
+    var patternNames = [
+        _patternNames.TYPE_PATTERN_NAME,
+        _patternNames.OPERATOR_PATTERN_NAME
+    ], entries = patternNames.map(function(patternName) {
+        var entry = entryFromCustomGrammars(customGrammars, patternName);
+        return entry;
+    });
+    return entries;
+}
 function entryFromCustomGrammars(customGrammars, patternName) {
-    customGrammars = [
-        _defaultCustomGrammar.default
-    ].concat(_toConsumableArray(customGrammars)); ///
     var patterns = customGrammars.reduce(function(patterns, customGrammar) {
         var pattern = customGrammar.getPattern(patternName);
         if (pattern) {
@@ -133,26 +152,5 @@ function combineRules(rules) {
         length = rules.length;
     }
 }
-function entriesFromCustomGrammars(customGrammars) {
-    var patternNames = [
-        _patternNames.TYPE_PATTERN_NAME,
-        _patternNames.OPERATOR_PATTERN_NAME
-    ], entries = patternNames.map(function(patternName) {
-        var entry = entryFromCustomGrammars(customGrammars, patternName);
-        return entry;
-    });
-    return entries;
-}
-function rulesFromCustomGrammarsAndDefaultBNF(customGrammars) {
-    customGrammars = [
-        _defaultCustomGrammar.default
-    ].concat(_toConsumableArray(customGrammars)); ///
-    var bnfs = customGrammars.map(function(customGrammar) {
-        var bnf = customGrammar.getBNF();
-        return bnf;
-    }), bnf = bnfs.join(_constants.EMPTY_STRING), rules = rulesFromBNF(bnf);
-    combineRules(rules);
-    return rules;
-}
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/combinedCustomGrammar.js"],"sourcesContent":["\"use strict\";\n\nimport { parserUtilities } from \"occam-parsers\";\n\nimport defaultCustomGrammar from \"./defaultCustomGrammar\";\n\nimport { EMPTY_STRING, VERTICAL_BAR } from \"./constants\";\nimport { TYPE_PATTERN_NAME, OPERATOR_PATTERN_NAME } from \"./patternNames\";\n\nconst { rulesFromBNF } = parserUtilities;\n\nexport default class CombinedCustomGrammar {\n  constructor(rules, entries) {\n    this.rules = rules;\n    this.entries = entries;\n  }\n  \n  getRules() {\n    return this.rules;\n  }\n\n  getEntries() {\n    return this.entries;\n  }\n\n  static fromCustomGrammars(customGrammars) {\n    const rules = rulesFromCustomGrammarsAndDefaultBNF(customGrammars),\n          entries = entriesFromCustomGrammars(customGrammars),\n          combinedCustomGrammar = new CombinedCustomGrammar(rules, entries);\n    \n    return combinedCustomGrammar;\n  }\n}\n\nfunction entryFromCustomGrammars(customGrammars, patternName) {\n  customGrammars = [ defaultCustomGrammar, ...customGrammars ]; ///\n\n  const patterns = customGrammars.reduce((patterns, customGrammar) => {\n    const pattern = customGrammar.getPattern(patternName);\n\n    if (pattern) {  ///\n      patterns.push(pattern);\n    }\n\n    return patterns;\n  }, []);\n\n  patterns.reverse();\n\n  const patternsString = patterns.join(VERTICAL_BAR), ///\n        pattern = (patternName === TYPE_PATTERN_NAME) ?\n                    `^(?:${patternsString})\\\\b` :\n                      `^(?:${patternsString})`;\n\n  const entry = {};\n\n  entry[patternName] = pattern;\n\n  return entry;\n}\n\nfunction combineRules(rules) {\n  let outerIndex = 0,\n        length = rules.length;\n\n  while (outerIndex < length) {\n    const outerRule = rules[outerIndex],\n          outerRuleName = outerRule.getName();\n\n    let outerRuleDefinitions = outerRule.getDefinitions();\n\n    let innerIndex = outerIndex + 1;\n\n    while (innerIndex < length) {\n      const innerRule = rules[innerIndex],\n            innerRuleName = innerRule.getName();\n\n      if (innerRuleName === outerRuleName) {\n        const innerRuleDefinitions = innerRule.getDefinitions();\n\n        outerRuleDefinitions = [  ///\n          ...innerRuleDefinitions,\n          ...outerRuleDefinitions\n        ];\n\n        outerRule.replaceAllDefinitions(...outerRuleDefinitions);\n\n        const start = innerIndex, ///\n              deleteCount = 1;\n\n        rules.splice(start, deleteCount);\n\n        length = rules.length;\n      } else {\n        innerIndex++;\n      }\n    }\n\n    outerIndex++;\n\n    length = rules.length;\n  }\n}\n\nfunction entriesFromCustomGrammars(customGrammars) {\n  const patternNames = [\n          TYPE_PATTERN_NAME,\n          OPERATOR_PATTERN_NAME\n        ],\n        entries = patternNames.map((patternName) => {\n          const entry = entryFromCustomGrammars(customGrammars, patternName);\n\n          return entry;\n       });\n\n  return entries;\n}\n\nfunction rulesFromCustomGrammarsAndDefaultBNF(customGrammars) {\n  customGrammars = [ defaultCustomGrammar, ...customGrammars ]; ///\n\n  const bnfs = customGrammars.map((customGrammar) => {\n          const bnf = customGrammar.getBNF();\n\n          return bnf;\n        }),\n        bnf = bnfs.join(EMPTY_STRING),\n        rules = rulesFromBNF(bnf);\n\n  combineRules(rules)\n\n  return rules;\n}\n"],"names":["CombinedCustomGrammar","rulesFromBNF","parserUtilities","rules","entries","getRules","getEntries","fromCustomGrammars","customGrammars","rulesFromCustomGrammarsAndDefaultBNF","entriesFromCustomGrammars","combinedCustomGrammar","entryFromCustomGrammars","patternName","defaultCustomGrammar","patterns","reduce","customGrammar","pattern","getPattern","push","reverse","patternsString","join","VERTICAL_BAR","TYPE_PATTERN_NAME","entry","combineRules","outerIndex","length","outerRule","outerRuleName","getName","outerRuleDefinitions","getDefinitions","innerIndex","innerRule","innerRuleName","innerRuleDefinitions","replaceAllDefinitions","start","deleteCount","splice","patternNames","OPERATOR_PATTERN_NAME","map","bnfs","bnf","getBNF","EMPTY_STRING"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/combinedCustomGrammar.js"],"sourcesContent":["\"use strict\";\n\nimport { parserUtilities } from \"occam-parsers\";\n\nimport defaultCustomGrammar from \"./defaultCustomGrammar\";\n\nimport { EMPTY_STRING, VERTICAL_BAR } from \"./constants\";\nimport { TYPE_PATTERN_NAME, OPERATOR_PATTERN_NAME } from \"./patternNames\";\n\nconst { rulesFromBNF } = parserUtilities;\n\nexport default class CombinedCustomGrammar {\n  constructor(rules, entries) {\n    this.rules = rules;\n    this.entries = entries;\n  }\n  \n  getRules() {\n    return this.rules;\n  }\n\n  getEntries() {\n    return this.entries;\n  }\n\n  static fromCustomGrammars(customGrammars, defaultCustomGrammar = defaultCustomGrammar) {\n    customGrammars = [ defaultCustomGrammar, ...customGrammars ]; ///\n\n    const rules = rulesFromCustomGrammarsAndDefaultBNF(customGrammars),\n          entries = entriesFromCustomGrammars(customGrammars),\n          combinedCustomGrammar = new CombinedCustomGrammar(rules, entries);\n    \n    return combinedCustomGrammar;\n  }\n}\n\nfunction rulesFromCustomGrammarsAndDefaultBNF(customGrammars) {\n  const bnfs = customGrammars.map((customGrammar) => {\n          const bnf = customGrammar.getBNF();\n\n          return bnf;\n        }),\n        bnf = bnfs.join(EMPTY_STRING),\n        rules = rulesFromBNF(bnf);\n\n  combineRules(rules)\n\n  return rules;\n}\n\nfunction entriesFromCustomGrammars(customGrammars) {\n  const patternNames = [\n          TYPE_PATTERN_NAME,\n          OPERATOR_PATTERN_NAME\n        ],\n        entries = patternNames.map((patternName) => {\n          const entry = entryFromCustomGrammars(customGrammars, patternName);\n\n          return entry;\n        });\n\n  return entries;\n}\n\nfunction entryFromCustomGrammars(customGrammars, patternName) {\n  const patterns = customGrammars.reduce((patterns, customGrammar) => {\n    const pattern = customGrammar.getPattern(patternName);\n\n    if (pattern) {  ///\n      patterns.push(pattern);\n    }\n\n    return patterns;\n  }, []);\n\n  patterns.reverse();\n\n  const patternsString = patterns.join(VERTICAL_BAR), ///\n        pattern = (patternName === TYPE_PATTERN_NAME) ?\n                   `^(?:${patternsString})\\\\b` :\n                     `^(?:${patternsString})`;\n\n  const entry = {};\n\n  entry[patternName] = pattern;\n\n  return entry;\n}\n\nfunction combineRules(rules) {\n  let outerIndex = 0,\n      length = rules.length;\n\n  while (outerIndex < length) {\n    const outerRule = rules[outerIndex],\n          outerRuleName = outerRule.getName();\n\n    let outerRuleDefinitions = outerRule.getDefinitions();\n\n    let innerIndex = outerIndex + 1;\n\n    while (innerIndex < length) {\n      const innerRule = rules[innerIndex],\n            innerRuleName = innerRule.getName();\n\n      if (innerRuleName === outerRuleName) {\n        const innerRuleDefinitions = innerRule.getDefinitions();\n\n        outerRuleDefinitions = [  ///\n          ...innerRuleDefinitions,\n          ...outerRuleDefinitions\n        ];\n\n        outerRule.replaceAllDefinitions(...outerRuleDefinitions);\n\n        const start = innerIndex, ///\n              deleteCount = 1;\n\n        rules.splice(start, deleteCount);\n\n        length = rules.length;\n      } else {\n        innerIndex++;\n      }\n    }\n\n    outerIndex++;\n\n    length = rules.length;\n  }\n}\n"],"names":["CombinedCustomGrammar","rulesFromBNF","parserUtilities","rules","entries","getRules","getEntries","fromCustomGrammars","customGrammars","defaultCustomGrammar","rulesFromCustomGrammarsAndDefaultBNF","entriesFromCustomGrammars","combinedCustomGrammar","bnfs","map","customGrammar","bnf","getBNF","join","EMPTY_STRING","combineRules","patternNames","TYPE_PATTERN_NAME","OPERATOR_PATTERN_NAME","patternName","entry","entryFromCustomGrammars","patterns","reduce","pattern","getPattern","push","reverse","patternsString","VERTICAL_BAR","outerIndex","length","outerRule","outerRuleName","getName","outerRuleDefinitions","getDefinitions","innerIndex","innerRule","innerRuleName","innerRuleDefinitions","replaceAllDefinitions","start","deleteCount","splice"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-custom-grammars",
   "author": "James Smith",
-  "version": "5.0.310",
+  "version": "5.0.312",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-custom-grammars",
   "description": "Occam's custom grammars.",
@@ -12,7 +12,7 @@
   "dependencies": {
     "necessary": "^11.0.40",
     "occam-grammar-utilities": "^7.0.60",
-    "occam-grammars": "^1.0.278",
+    "occam-grammars": "^1.0.280",
     "occam-lexers": "^16.0.59",
     "occam-parsers": "^16.0.113"
   },

package/src/combinedCustomGrammar.js

@@ -23,7 +23,9 @@ export default class CombinedCustomGrammar {
     return this.entries;
   }
 
-  static fromCustomGrammars(customGrammars) {
+  static fromCustomGrammars(customGrammars, defaultCustomGrammar = defaultCustomGrammar) {
+    customGrammars = [ defaultCustomGrammar, ...customGrammars ]; ///
+
     const rules = rulesFromCustomGrammarsAndDefaultBNF(customGrammars),
           entries = entriesFromCustomGrammars(customGrammars),
           combinedCustomGrammar = new CombinedCustomGrammar(rules, entries);
@@ -32,9 +34,35 @@ export default class CombinedCustomGrammar {
   }
 }
 
-function entryFromCustomGrammars(customGrammars, patternName) {
-  customGrammars = [ defaultCustomGrammar, ...customGrammars ]; ///
+function rulesFromCustomGrammarsAndDefaultBNF(customGrammars) {
+  const bnfs = customGrammars.map((customGrammar) => {
+          const bnf = customGrammar.getBNF();
+
+          return bnf;
+        }),
+        bnf = bnfs.join(EMPTY_STRING),
+        rules = rulesFromBNF(bnf);
+
+  combineRules(rules)
+
+  return rules;
+}
 
+function entriesFromCustomGrammars(customGrammars) {
+  const patternNames = [
+          TYPE_PATTERN_NAME,
+          OPERATOR_PATTERN_NAME
+        ],
+        entries = patternNames.map((patternName) => {
+          const entry = entryFromCustomGrammars(customGrammars, patternName);
+
+          return entry;
+        });
+
+  return entries;
+}
+
+function entryFromCustomGrammars(customGrammars, patternName) {
   const patterns = customGrammars.reduce((patterns, customGrammar) => {
     const pattern = customGrammar.getPattern(patternName);
 
@@ -49,8 +77,8 @@ function entryFromCustomGrammars(customGrammars, patternName) {
 
   const patternsString = patterns.join(VERTICAL_BAR), ///
         pattern = (patternName === TYPE_PATTERN_NAME) ?
-                    `^(?:${patternsString})\\b` :
-                      `^(?:${patternsString})`;
+                   `^(?:${patternsString})\\b` :
+                     `^(?:${patternsString})`;
 
   const entry = {};
 
@@ -61,7 +89,7 @@ function entryFromCustomGrammars(customGrammars, patternName) {
 
 function combineRules(rules) {
   let outerIndex = 0,
-        length = rules.length;
+      length = rules.length;
 
   while (outerIndex < length) {
     const outerRule = rules[outerIndex],
@@ -101,33 +129,3 @@ function combineRules(rules) {
     length = rules.length;
   }
 }
-
-function entriesFromCustomGrammars(customGrammars) {
-  const patternNames = [
-          TYPE_PATTERN_NAME,
-          OPERATOR_PATTERN_NAME
-        ],
-        entries = patternNames.map((patternName) => {
-          const entry = entryFromCustomGrammars(customGrammars, patternName);
-
-          return entry;
-       });
-
-  return entries;
-}
-
-function rulesFromCustomGrammarsAndDefaultBNF(customGrammars) {
-  customGrammars = [ defaultCustomGrammar, ...customGrammars ]; ///
-
-  const bnfs = customGrammars.map((customGrammar) => {
-          const bnf = customGrammar.getBNF();
-
-          return bnf;
-        }),
-        bnf = bnfs.join(EMPTY_STRING),
-        rules = rulesFromBNF(bnf);
-
-  combineRules(rules)
-
-  return rules;
-}