highmark-occam 1.0.85 → 1.0.87

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/document/furtle.js +3 -3
  2. package/lib/document/nominal.js +3 -3
  3. package/package.json +2 -3
  4. package/src/document/furtle.js +2 -3
  5. package/src/document/nominal.js +2 -3
package/lib/document/furtle.js CHANGED
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "default", {
8
8
  return FurtleDocument;
9
9
  }
10
10
  });
11
- const _occamfurtle = require("occam-furtle");
11
+ const _occamlanguages = require("occam-languages");
12
12
  const _document = /*#__PURE__*/ _interop_require_default(require("../document"));
13
13
  const _error = /*#__PURE__*/ _interop_require_default(require("../token/overlay/common/error"));
14
14
  const _nonsense = /*#__PURE__*/ _interop_require_default(require("../token/overlay/common/nonsense"));
@@ -20,7 +20,7 @@ function _interop_require_default(obj) {
20
20
  default: obj
21
21
  };
22
22
  }
23
- const { furtleLexerFromNothing } = _occamfurtle.lexersUtilities, { furtleParserFromNothing } = _occamfurtle.parsersUtilities;
23
+ const { furtleLexerFromNothing, furtleParserFromNothing } = _occamlanguages.furtleUtilities;
24
24
  const furtleLexer = furtleLexerFromNothing(), furtleParser = furtleParserFromNothing();
25
25
  class FurtleDocument extends _document.default {
26
26
  static overlayTokenMap = {
@@ -35,4 +35,4 @@ class FurtleDocument extends _document.default {
35
35
  }
36
36
  }
37
37
 
38
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kb2N1bWVudC9mdXJ0bGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGxleGVyc1V0aWxpdGllcywgcGFyc2Vyc1V0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1mdXJ0bGVcIjtcblxuaW1wb3J0IERvY3VtZW50IGZyb20gXCIuLi9kb2N1bWVudFwiO1xuaW1wb3J0IEVycm9yT3ZlcmxheVRva2VuIGZyb20gXCIuLi90b2tlbi9vdmVybGF5L2NvbW1vbi9lcnJvclwiO1xuaW1wb3J0IE5vbnNlbnNlT3ZlcmxheVRva2VuIGZyb20gXCIuLi90b2tlbi9vdmVybGF5L2NvbW1vbi9ub25zZW5zZVwiO1xuaW1wb3J0IExhYmVsTmFtZU92ZXJsYXlUb2tlbiBmcm9tIFwiLi4vdG9rZW4vb3ZlcmxheS9jb21tb24vbGFiZWxOYW1lXCI7XG5pbXBvcnQgUmVmZXJlbmNlTmFtZU92ZXJsYXlUb2tlbiBmcm9tIFwiLi4vdG9rZW4vb3ZlcmxheS9jb21tb24vcmVmZXJlbmNlTmFtZVwiO1xuXG5pbXBvcnQgeyBGVVJUTEVfRE9DVU1FTlRfVFlQRSB9IGZyb20gXCIuLi9kb2N1bWVudFR5cGVzXCI7XG5cbmNvbnN0IHsgZnVydGxlTGV4ZXJGcm9tTm90aGluZyB9ID0gbGV4ZXJzVXRpbGl0aWVzLFxuICAgICAgeyBmdXJ0bGVQYXJzZXJGcm9tTm90aGluZyB9ID0gcGFyc2Vyc1V0aWxpdGllcztcblxuY29uc3QgZnVydGxlTGV4ZXIgPSBmdXJ0bGVMZXhlckZyb21Ob3RoaW5nKCksXG4gICAgICBmdXJ0bGVQYXJzZXIgPSBmdXJ0bGVQYXJzZXJGcm9tTm90aGluZygpO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBGdXJ0bGVEb2N1bWVudCBleHRlbmRzIERvY3VtZW50IHtcbiAgc3RhdGljIG92ZXJsYXlUb2tlbk1hcCA9IHtcbiAgICBcIi8vZXJyb3JcIjogRXJyb3JPdmVybGF5VG9rZW4sXG4gICAgXCIvL25vbnNlbnNlXCI6IE5vbnNlbnNlT3ZlcmxheVRva2VuLFxuICAgIFwiLy9sYWJlbC9AbmFtZVwiOiBMYWJlbE5hbWVPdmVybGF5VG9rZW4sXG4gICAgXCIvL3JlZmVyZW5jZS9AbmFtZVwiOiBSZWZlcmVuY2VOYW1lT3ZlcmxheVRva2VuXG4gIH07XG5cbiAgc3RhdGljIGZyb21Db250ZW50KGNvbnRlbnQpIHtcbiAgICBjb25zdCB0eXBlID0gRlVSVExFX0RPQ1VNRU5UX1RZUEUsXG4gICAgICAgICAgbGV4ZXIgPSBmdXJ0bGVMZXhlciwgIC8vL1xuICAgICAgICAgIHBhcnNlciA9IGZ1cnRsZVBhcnNlciwgIC8vL1xuICAgICAgICAgIGZ1cnRsZURvY3VtZW50ID0gRG9jdW1lbnQuZnJvbUNvbnRlbnRUeXBlTGV4ZXJBbmRQYXJzZXIoRnVydGxlRG9jdW1lbnQsIGNvbnRlbnQsIHR5cGUsIGxleGVyLCBwYXJzZXIpO1xuXG4gICAgcmV0dXJuIGZ1cnRsZURvY3VtZW50O1xuICB9XG59XG4iXSwibmFtZXMiOlsiRnVydGxlRG9jdW1lbnQiLCJmdXJ0bGVMZXhlckZyb21Ob3RoaW5nIiwibGV4ZXJzVXRpbGl0aWVzIiwiZnVydGxlUGFyc2VyRnJvbU5vdGhpbmciLCJwYXJzZXJzVXRpbGl0aWVzIiwiZnVydGxlTGV4ZXIiLCJmdXJ0bGVQYXJzZXIiLCJEb2N1bWVudCIsIm92ZXJsYXlUb2tlbk1hcCIsIkVycm9yT3ZlcmxheVRva2VuIiwiTm9uc2Vuc2VPdmVybGF5VG9rZW4iLCJMYWJlbE5hbWVPdmVybGF5VG9rZW4iLCJSZWZlcmVuY2VOYW1lT3ZlcmxheVRva2VuIiwiZnJvbUNvbnRlbnQiLCJjb250ZW50IiwidHlwZSIsIkZVUlRMRV9ET0NVTUVOVF9UWVBFIiwibGV4ZXIiLCJwYXJzZXIiLCJmdXJ0bGVEb2N1bWVudCIsImZyb21Db250ZW50VHlwZUxleGVyQW5kUGFyc2VyIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFrQkE7OztlQUFxQkE7Ozs2QkFoQjZCO2lFQUU3Qjs4REFDUztpRUFDRztrRUFDQztzRUFDSTsrQkFFRDs7Ozs7O0FBRXJDLE1BQU0sRUFBRUMsc0JBQXNCLEVBQUUsR0FBR0MsNEJBQWUsRUFDNUMsRUFBRUMsdUJBQXVCLEVBQUUsR0FBR0MsNkJBQWdCO0FBRXBELE1BQU1DLGNBQWNKLDBCQUNkSyxlQUFlSDtBQUVOLE1BQU1ILHVCQUF1Qk8saUJBQVE7SUFDbEQsT0FBT0Msa0JBQWtCO1FBQ3ZCLFdBQVdDLGNBQWlCO1FBQzVCLGNBQWNDLGlCQUFvQjtRQUNsQyxpQkFBaUJDLGtCQUFxQjtRQUN0QyxxQkFBcUJDLHNCQUF5QjtJQUNoRCxFQUFFO0lBRUYsT0FBT0MsWUFBWUMsT0FBTyxFQUFFO1FBQzFCLE1BQU1DLE9BQU9DLG1DQUFvQixFQUMzQkMsUUFBUVosYUFDUmEsU0FBU1osY0FDVGEsaUJBQWlCWixpQkFBUSxDQUFDYSw2QkFBNkIsQ0FBQ3BCLGdCQUFnQmMsU0FBU0MsTUFBTUUsT0FBT0M7UUFFcEcsT0FBT0M7SUFDVDtBQUNGIn0=
38
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kb2N1bWVudC9mdXJ0bGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGZ1cnRsZVV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IERvY3VtZW50IGZyb20gXCIuLi9kb2N1bWVudFwiO1xuaW1wb3J0IEVycm9yT3ZlcmxheVRva2VuIGZyb20gXCIuLi90b2tlbi9vdmVybGF5L2NvbW1vbi9lcnJvclwiO1xuaW1wb3J0IE5vbnNlbnNlT3ZlcmxheVRva2VuIGZyb20gXCIuLi90b2tlbi9vdmVybGF5L2NvbW1vbi9ub25zZW5zZVwiO1xuaW1wb3J0IExhYmVsTmFtZU92ZXJsYXlUb2tlbiBmcm9tIFwiLi4vdG9rZW4vb3ZlcmxheS9jb21tb24vbGFiZWxOYW1lXCI7XG5pbXBvcnQgUmVmZXJlbmNlTmFtZU92ZXJsYXlUb2tlbiBmcm9tIFwiLi4vdG9rZW4vb3ZlcmxheS9jb21tb24vcmVmZXJlbmNlTmFtZVwiO1xuXG5pbXBvcnQgeyBGVVJUTEVfRE9DVU1FTlRfVFlQRSB9IGZyb20gXCIuLi9kb2N1bWVudFR5cGVzXCI7XG5cbmNvbnN0IHsgZnVydGxlTGV4ZXJGcm9tTm90aGluZywgZnVydGxlUGFyc2VyRnJvbU5vdGhpbmcgfSA9IGZ1cnRsZVV0aWxpdGllcztcblxuY29uc3QgZnVydGxlTGV4ZXIgPSBmdXJ0bGVMZXhlckZyb21Ob3RoaW5nKCksXG4gICAgICBmdXJ0bGVQYXJzZXIgPSBmdXJ0bGVQYXJzZXJGcm9tTm90aGluZygpO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBGdXJ0bGVEb2N1bWVudCBleHRlbmRzIERvY3VtZW50IHtcbiAgc3RhdGljIG92ZXJsYXlUb2tlbk1hcCA9IHtcbiAgICBcIi8vZXJyb3JcIjogRXJyb3JPdmVybGF5VG9rZW4sXG4gICAgXCIvL25vbnNlbnNlXCI6IE5vbnNlbnNlT3ZlcmxheVRva2VuLFxuICAgIFwiLy9sYWJlbC9AbmFtZVwiOiBMYWJlbE5hbWVPdmVybGF5VG9rZW4sXG4gICAgXCIvL3JlZmVyZW5jZS9AbmFtZVwiOiBSZWZlcmVuY2VOYW1lT3ZlcmxheVRva2VuXG4gIH07XG5cbiAgc3RhdGljIGZyb21Db250ZW50KGNvbnRlbnQpIHtcbiAgICBjb25zdCB0eXBlID0gRlVSVExFX0RPQ1VNRU5UX1RZUEUsXG4gICAgICAgICAgbGV4ZXIgPSBmdXJ0bGVMZXhlciwgIC8vL1xuICAgICAgICAgIHBhcnNlciA9IGZ1cnRsZVBhcnNlciwgIC8vL1xuICAgICAgICAgIGZ1cnRsZURvY3VtZW50ID0gRG9jdW1lbnQuZnJvbUNvbnRlbnRUeXBlTGV4ZXJBbmRQYXJzZXIoRnVydGxlRG9jdW1lbnQsIGNvbnRlbnQsIHR5cGUsIGxleGVyLCBwYXJzZXIpO1xuXG4gICAgcmV0dXJuIGZ1cnRsZURvY3VtZW50O1xuICB9XG59XG4iXSwibmFtZXMiOlsiRnVydGxlRG9jdW1lbnQiLCJmdXJ0bGVMZXhlckZyb21Ob3RoaW5nIiwiZnVydGxlUGFyc2VyRnJvbU5vdGhpbmciLCJmdXJ0bGVVdGlsaXRpZXMiLCJmdXJ0bGVMZXhlciIsImZ1cnRsZVBhcnNlciIsIkRvY3VtZW50Iiwib3ZlcmxheVRva2VuTWFwIiwiRXJyb3JPdmVybGF5VG9rZW4iLCJOb25zZW5zZU92ZXJsYXlUb2tlbiIsIkxhYmVsTmFtZU92ZXJsYXlUb2tlbiIsIlJlZmVyZW5jZU5hbWVPdmVybGF5VG9rZW4iLCJmcm9tQ29udGVudCIsImNvbnRlbnQiLCJ0eXBlIiwiRlVSVExFX0RPQ1VNRU5UX1RZUEUiLCJsZXhlciIsInBhcnNlciIsImZ1cnRsZURvY3VtZW50IiwiZnJvbUNvbnRlbnRUeXBlTGV4ZXJBbmRQYXJzZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQWlCQTs7O2VBQXFCQTs7O2dDQWZXO2lFQUVYOzhEQUNTO2lFQUNHO2tFQUNDO3NFQUNJOytCQUVEOzs7Ozs7QUFFckMsTUFBTSxFQUFFQyxzQkFBc0IsRUFBRUMsdUJBQXVCLEVBQUUsR0FBR0MsK0JBQWU7QUFFM0UsTUFBTUMsY0FBY0gsMEJBQ2RJLGVBQWVIO0FBRU4sTUFBTUYsdUJBQXVCTSxpQkFBUTtJQUNsRCxPQUFPQyxrQkFBa0I7UUFDdkIsV0FBV0MsY0FBaUI7UUFDNUIsY0FBY0MsaUJBQW9CO1FBQ2xDLGlCQUFpQkMsa0JBQXFCO1FBQ3RDLHFCQUFxQkMsc0JBQXlCO0lBQ2hELEVBQUU7SUFFRixPQUFPQyxZQUFZQyxPQUFPLEVBQUU7UUFDMUIsTUFBTUMsT0FBT0MsbUNBQW9CLEVBQzNCQyxRQUFRWixhQUNSYSxTQUFTWixjQUNUYSxpQkFBaUJaLGlCQUFRLENBQUNhLDZCQUE2QixDQUFDbkIsZ0JBQWdCYSxTQUFTQyxNQUFNRSxPQUFPQztRQUVwRyxPQUFPQztJQUNUO0FBQ0YifQ==
package/lib/document/nominal.js CHANGED
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "default", {
8
8
  return NominalDocument;
9
9
  }
10
10
  });
11
- const _occamnominal = require("occam-nominal");
11
+ const _occamlanguages = require("occam-languages");
12
12
  const _document = /*#__PURE__*/ _interop_require_default(require("../document"));
13
13
  const _error = /*#__PURE__*/ _interop_require_default(require("../token/overlay/common/error"));
14
14
  const _stuff = /*#__PURE__*/ _interop_require_default(require("../token/overlay/common/stuff"));
@@ -23,7 +23,7 @@ function _interop_require_default(obj) {
23
23
  default: obj
24
24
  };
25
25
  }
26
- const { nominalLexerFromNothing, nominalLexerFromCombinedCustomGrammar } = _occamnominal.lexersUtilities, { nominalParserFromNothing, nominalParserFromCombinedCustomGrammar } = _occamnominal.parsersUtilities;
26
+ const { nominalLexerFromNothing, nominalLexerFromCombinedCustomGrammar, nominalParserFromNothing, nominalParserFromCombinedCustomGrammar } = _occamlanguages.nominalUtilities;
27
27
  class NominalDocument extends _document.default {
28
28
  static overlayTokenMap = {
29
29
  "//error": _error.default,
@@ -47,4 +47,4 @@ function nominalParserrFromCombinedCustomGrammar(combinedCustomGrammar) {
47
47
  return nominalParser;
48
48
  }
49
49
 
50
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kb2N1bWVudC9ub21pbmFsLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBsZXhlcnNVdGlsaXRpZXMsIHBhcnNlcnNVdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbm9taW5hbFwiO1xuXG5pbXBvcnQgRG9jdW1lbnQgZnJvbSBcIi4uL2RvY3VtZW50XCI7XG5pbXBvcnQgRXJyb3JPdmVybGF5VG9rZW4gZnJvbSBcIi4uL3Rva2VuL292ZXJsYXkvY29tbW9uL2Vycm9yXCI7XG5pbXBvcnQgU3R1ZmZPdmVybGF5VG9rZW4gZnJvbSBcIi4uL3Rva2VuL292ZXJsYXkvY29tbW9uL3N0dWZmXCI7XG5pbXBvcnQgTm9uc2Vuc2VPdmVybGF5VG9rZW4gZnJvbSBcIi4uL3Rva2VuL292ZXJsYXkvY29tbW9uL25vbnNlbnNlXCI7XG5pbXBvcnQgTGFiZWxOYW1lT3ZlcmxheVRva2VuIGZyb20gXCIuLi90b2tlbi9vdmVybGF5L2NvbW1vbi9sYWJlbE5hbWVcIjtcbmltcG9ydCBSZWZlcmVuY2VOYW1lT3ZlcmxheVRva2VuIGZyb20gXCIuLi90b2tlbi9vdmVybGF5L2NvbW1vbi9yZWZlcmVuY2VOYW1lXCI7XG5pbXBvcnQgUHJvY2VkdXJlUmVmZXJlbmNlTmFtZU92ZXJsYXlUb2tlbiBmcm9tIFwiLi4vdG9rZW4vb3ZlcmxheS9jb21tb24vcHJvY2VkdXJlUmVmZXJlbmNlTmFtZVwiO1xuXG5pbXBvcnQgeyBOT01JTkFMX0RPQ1VNRU5UX1RZUEUgfSBmcm9tIFwiLi4vZG9jdW1lbnRUeXBlc1wiO1xuaW1wb3J0IHsgY29tYmluZWRDdXN0b21HcmFtbWFyRnJvbVJlbGVhc2VOYW1lIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9jdXN0b21HcmFtbWFyc1wiO1xuXG5jb25zdCB7IG5vbWluYWxMZXhlckZyb21Ob3RoaW5nLCBub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyIH0gPSBsZXhlcnNVdGlsaXRpZXMsXG4gICAgICB7IG5vbWluYWxQYXJzZXJGcm9tTm90aGluZywgbm9taW5hbFBhcnNlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIgfSA9IHBhcnNlcnNVdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIE5vbWluYWxEb2N1bWVudCBleHRlbmRzIERvY3VtZW50IHtcbiAgc3RhdGljIG92ZXJsYXlUb2tlbk1hcCA9IHtcbiAgICBcIi8vZXJyb3JcIjogRXJyb3JPdmVybGF5VG9rZW4sXG4gICAgXCIvL3N0dWZmXCI6IFN0dWZmT3ZlcmxheVRva2VuLFxuICAgIFwiLy9ub25zZW5zZVwiOiBOb25zZW5zZU92ZXJsYXlUb2tlbixcbiAgICBcIi8vbGFiZWwvbWV0YXZhcmlhYmxlL0BuYW1lXCI6IExhYmVsTmFtZU92ZXJsYXlUb2tlbixcbiAgICBcIi8vcHJvY2VkdXJlUmVmZXJlbmNlL0BuYW1lXCI6IFByb2NlZHVyZVJlZmVyZW5jZU5hbWVPdmVybGF5VG9rZW4sXG4gICAgXCIvL3JlZmVyZW5jZS9tZXRhdmFyaWFibGUvQG5hbWVcIjogUmVmZXJlbmNlTmFtZU92ZXJsYXlUb2tlblxuICB9O1xuXG4gIHN0YXRpYyBmcm9tQ29udGVudEFuZFJlbGVhc2VOYW1lKGNvbnRlbnQsIHJlbGVhc2VOYW1lKSB7XG4gICAgY29uc3QgdHlwZSA9IE5PTUlOQUxfRE9DVU1FTlRfVFlQRSxcbiAgICAgICAgICBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBjb21iaW5lZEN1c3RvbUdyYW1tYXJGcm9tUmVsZWFzZU5hbWUocmVsZWFzZU5hbWUpLFxuICAgICAgICAgIG5vbWluYWxMZXhlciA9IG5vbWluYWxMZXhlcnJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKGNvbWJpbmVkQ3VzdG9tR3JhbW1hciksXG4gICAgICAgICAgbm9taW5hbFBhcnNlciA9IG5vbWluYWxQYXJzZXJyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hcihjb21iaW5lZEN1c3RvbUdyYW1tYXIpLFxuICAgICAgICAgIGxleGVyID0gbm9taW5hbExleGVyLCAvLy9cbiAgICAgICAgICBwYXJzZXIgPSBub21pbmFsUGFyc2VyLCAvLy9cbiAgICAgICAgICBub21pbmFsRG9jdW1lbnQgPSBEb2N1bWVudC5mcm9tQ29udGVudFR5cGVMZXhlckFuZFBhcnNlcihOb21pbmFsRG9jdW1lbnQsIGNvbnRlbnQsIHR5cGUsIGxleGVyLCBwYXJzZXIsIHJlbGVhc2VOYW1lKTtcblxuICAgIHJldHVybiBub21pbmFsRG9jdW1lbnQ7XG4gIH1cbn1cblxuZnVuY3Rpb24gbm9taW5hbExleGVyckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIoY29tYmluZWRDdXN0b21HcmFtbWFyKSB7XG4gIGNvbnN0IG5vbWluYWxMZXhlciA9IChjb21iaW5lZEN1c3RvbUdyYW1tYXIgIT09IG51bGwpID9cbiAgICAgICAgICAgICAgICAgICAgICAgICBub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikgOlxuICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9taW5hbExleGVyRnJvbU5vdGhpbmcoKTtcblxuICByZXR1cm4gbm9taW5hbExleGVyO1xufVxuXG5mdW5jdGlvbiBub21pbmFsUGFyc2VyckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIoY29tYmluZWRDdXN0b21HcmFtbWFyKSB7XG4gIGNvbnN0IG5vbWluYWxQYXJzZXIgPSAoY29tYmluZWRDdXN0b21HcmFtbWFyICE9PSBudWxsKSA/XG4gICAgICAgICAgICAgICAgICAgICAgICAgIG5vbWluYWxQYXJzZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikgOlxuICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vbWluYWxQYXJzZXJGcm9tTm90aGluZygpO1xuXG4gIHJldHVybiBub21pbmFsUGFyc2VyO1xufVxuIl0sIm5hbWVzIjpbIk5vbWluYWxEb2N1bWVudCIsIm5vbWluYWxMZXhlckZyb21Ob3RoaW5nIiwibm9taW5hbExleGVyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsImxleGVyc1V0aWxpdGllcyIsIm5vbWluYWxQYXJzZXJGcm9tTm90aGluZyIsIm5vbWluYWxQYXJzZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyIiwicGFyc2Vyc1V0aWxpdGllcyIsIkRvY3VtZW50Iiwib3ZlcmxheVRva2VuTWFwIiwiRXJyb3JPdmVybGF5VG9rZW4iLCJTdHVmZk92ZXJsYXlUb2tlbiIsIk5vbnNlbnNlT3ZlcmxheVRva2VuIiwiTGFiZWxOYW1lT3ZlcmxheVRva2VuIiwiUHJvY2VkdXJlUmVmZXJlbmNlTmFtZU92ZXJsYXlUb2tlbiIsIlJlZmVyZW5jZU5hbWVPdmVybGF5VG9rZW4iLCJmcm9tQ29udGVudEFuZFJlbGVhc2VOYW1lIiwiY29udGVudCIsInJlbGVhc2VOYW1lIiwidHlwZSIsIk5PTUlOQUxfRE9DVU1FTlRfVFlQRSIsImNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsImNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21SZWxlYXNlTmFtZSIsIm5vbWluYWxMZXhlciIsIm5vbWluYWxMZXhlcnJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyIiwibm9taW5hbFBhcnNlciIsIm5vbWluYWxQYXJzZXJyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsImxleGVyIiwicGFyc2VyIiwibm9taW5hbERvY3VtZW50IiwiZnJvbUNvbnRlbnRUeXBlTGV4ZXJBbmRQYXJzZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQWtCQTs7O2VBQXFCQTs7OzhCQWhCNkI7aUVBRTdCOzhEQUNTOzhEQUNBO2lFQUNHO2tFQUNDO3NFQUNJOytFQUNTOytCQUVUO2dDQUNlOzs7Ozs7QUFFckQsTUFBTSxFQUFFQyx1QkFBdUIsRUFBRUMscUNBQXFDLEVBQUUsR0FBR0MsNkJBQWUsRUFDcEYsRUFBRUMsd0JBQXdCLEVBQUVDLHNDQUFzQyxFQUFFLEdBQUdDLDhCQUFnQjtBQUU5RSxNQUFNTix3QkFBd0JPLGlCQUFRO0lBQ25ELE9BQU9DLGtCQUFrQjtRQUN2QixXQUFXQyxjQUFpQjtRQUM1QixXQUFXQyxjQUFpQjtRQUM1QixjQUFjQyxpQkFBb0I7UUFDbEMsOEJBQThCQyxrQkFBcUI7UUFDbkQsOEJBQThCQywrQkFBa0M7UUFDaEUsa0NBQWtDQyxzQkFBeUI7SUFDN0QsRUFBRTtJQUVGLE9BQU9DLDBCQUEwQkMsT0FBTyxFQUFFQyxXQUFXLEVBQUU7UUFDckQsTUFBTUMsT0FBT0Msb0NBQXFCLEVBQzVCQyx3QkFBd0JDLElBQUFBLG9EQUFvQyxFQUFDSixjQUM3REssZUFBZUMsdUNBQXVDSCx3QkFDdERJLGdCQUFnQkMsd0NBQXdDTCx3QkFDeERNLFFBQVFKLGNBQ1JLLFNBQVNILGVBQ1RJLGtCQUFrQnJCLGlCQUFRLENBQUNzQiw2QkFBNkIsQ0FBQzdCLGlCQUFpQmdCLFNBQVNFLE1BQU1RLE9BQU9DLFFBQVFWO1FBRTlHLE9BQU9XO0lBQ1Q7QUFDRjtBQUVBLFNBQVNMLHVDQUF1Q0gscUJBQXFCO0lBQ25FLE1BQU1FLGVBQWUsQUFBQ0YsMEJBQTBCLE9BQ3pCbEIsc0NBQXNDa0IseUJBQ3BDbkI7SUFFekIsT0FBT3FCO0FBQ1Q7QUFFQSxTQUFTRyx3Q0FBd0NMLHFCQUFxQjtJQUNwRSxNQUFNSSxnQkFBZ0IsQUFBQ0osMEJBQTBCLE9BQ3pCZix1Q0FBdUNlLHlCQUNyQ2hCO0lBRTFCLE9BQU9vQjtBQUNUIn0=
50
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kb2N1bWVudC9ub21pbmFsLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub21pbmFsVXRpbGl0aWVzIH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiO1xuXG5pbXBvcnQgRG9jdW1lbnQgZnJvbSBcIi4uL2RvY3VtZW50XCI7XG5pbXBvcnQgRXJyb3JPdmVybGF5VG9rZW4gZnJvbSBcIi4uL3Rva2VuL292ZXJsYXkvY29tbW9uL2Vycm9yXCI7XG5pbXBvcnQgU3R1ZmZPdmVybGF5VG9rZW4gZnJvbSBcIi4uL3Rva2VuL292ZXJsYXkvY29tbW9uL3N0dWZmXCI7XG5pbXBvcnQgTm9uc2Vuc2VPdmVybGF5VG9rZW4gZnJvbSBcIi4uL3Rva2VuL292ZXJsYXkvY29tbW9uL25vbnNlbnNlXCI7XG5pbXBvcnQgTGFiZWxOYW1lT3ZlcmxheVRva2VuIGZyb20gXCIuLi90b2tlbi9vdmVybGF5L2NvbW1vbi9sYWJlbE5hbWVcIjtcbmltcG9ydCBSZWZlcmVuY2VOYW1lT3ZlcmxheVRva2VuIGZyb20gXCIuLi90b2tlbi9vdmVybGF5L2NvbW1vbi9yZWZlcmVuY2VOYW1lXCI7XG5pbXBvcnQgUHJvY2VkdXJlUmVmZXJlbmNlTmFtZU92ZXJsYXlUb2tlbiBmcm9tIFwiLi4vdG9rZW4vb3ZlcmxheS9jb21tb24vcHJvY2VkdXJlUmVmZXJlbmNlTmFtZVwiO1xuXG5pbXBvcnQgeyBOT01JTkFMX0RPQ1VNRU5UX1RZUEUgfSBmcm9tIFwiLi4vZG9jdW1lbnRUeXBlc1wiO1xuaW1wb3J0IHsgY29tYmluZWRDdXN0b21HcmFtbWFyRnJvbVJlbGVhc2VOYW1lIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9jdXN0b21HcmFtbWFyc1wiO1xuXG5jb25zdCB7IG5vbWluYWxMZXhlckZyb21Ob3RoaW5nLCBub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyLCBub21pbmFsUGFyc2VyRnJvbU5vdGhpbmcsIG5vbWluYWxQYXJzZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyIH0gPSBub21pbmFsVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBOb21pbmFsRG9jdW1lbnQgZXh0ZW5kcyBEb2N1bWVudCB7XG4gIHN0YXRpYyBvdmVybGF5VG9rZW5NYXAgPSB7XG4gICAgXCIvL2Vycm9yXCI6IEVycm9yT3ZlcmxheVRva2VuLFxuICAgIFwiLy9zdHVmZlwiOiBTdHVmZk92ZXJsYXlUb2tlbixcbiAgICBcIi8vbm9uc2Vuc2VcIjogTm9uc2Vuc2VPdmVybGF5VG9rZW4sXG4gICAgXCIvL2xhYmVsL21ldGF2YXJpYWJsZS9AbmFtZVwiOiBMYWJlbE5hbWVPdmVybGF5VG9rZW4sXG4gICAgXCIvL3Byb2NlZHVyZVJlZmVyZW5jZS9AbmFtZVwiOiBQcm9jZWR1cmVSZWZlcmVuY2VOYW1lT3ZlcmxheVRva2VuLFxuICAgIFwiLy9yZWZlcmVuY2UvbWV0YXZhcmlhYmxlL0BuYW1lXCI6IFJlZmVyZW5jZU5hbWVPdmVybGF5VG9rZW5cbiAgfTtcblxuICBzdGF0aWMgZnJvbUNvbnRlbnRBbmRSZWxlYXNlTmFtZShjb250ZW50LCByZWxlYXNlTmFtZSkge1xuICAgIGNvbnN0IHR5cGUgPSBOT01JTkFMX0RPQ1VNRU5UX1RZUEUsXG4gICAgICAgICAgY29tYmluZWRDdXN0b21HcmFtbWFyID0gY29tYmluZWRDdXN0b21HcmFtbWFyRnJvbVJlbGVhc2VOYW1lKHJlbGVhc2VOYW1lKSxcbiAgICAgICAgICBub21pbmFsTGV4ZXIgPSBub21pbmFsTGV4ZXJyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hcihjb21iaW5lZEN1c3RvbUdyYW1tYXIpLFxuICAgICAgICAgIG5vbWluYWxQYXJzZXIgPSBub21pbmFsUGFyc2VyckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIoY29tYmluZWRDdXN0b21HcmFtbWFyKSxcbiAgICAgICAgICBsZXhlciA9IG5vbWluYWxMZXhlciwgLy8vXG4gICAgICAgICAgcGFyc2VyID0gbm9taW5hbFBhcnNlciwgLy8vXG4gICAgICAgICAgbm9taW5hbERvY3VtZW50ID0gRG9jdW1lbnQuZnJvbUNvbnRlbnRUeXBlTGV4ZXJBbmRQYXJzZXIoTm9taW5hbERvY3VtZW50LCBjb250ZW50LCB0eXBlLCBsZXhlciwgcGFyc2VyLCByZWxlYXNlTmFtZSk7XG5cbiAgICByZXR1cm4gbm9taW5hbERvY3VtZW50O1xuICB9XG59XG5cbmZ1bmN0aW9uIG5vbWluYWxMZXhlcnJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikge1xuICBjb25zdCBub21pbmFsTGV4ZXIgPSAoY29tYmluZWRDdXN0b21HcmFtbWFyICE9PSBudWxsKSA/XG4gICAgICAgICAgICAgICAgICAgICAgICAgbm9taW5hbExleGVyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hcihjb21iaW5lZEN1c3RvbUdyYW1tYXIpIDpcbiAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vbWluYWxMZXhlckZyb21Ob3RoaW5nKCk7XG5cbiAgcmV0dXJuIG5vbWluYWxMZXhlcjtcbn1cblxuZnVuY3Rpb24gbm9taW5hbFBhcnNlcnJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKGNvbWJpbmVkQ3VzdG9tR3JhbW1hcikge1xuICBjb25zdCBub21pbmFsUGFyc2VyID0gKGNvbWJpbmVkQ3VzdG9tR3JhbW1hciAhPT0gbnVsbCkgP1xuICAgICAgICAgICAgICAgICAgICAgICAgICBub21pbmFsUGFyc2VyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hcihjb21iaW5lZEN1c3RvbUdyYW1tYXIpIDpcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBub21pbmFsUGFyc2VyRnJvbU5vdGhpbmcoKTtcblxuICByZXR1cm4gbm9taW5hbFBhcnNlcjtcbn1cbiJdLCJuYW1lcyI6WyJOb21pbmFsRG9jdW1lbnQiLCJub21pbmFsTGV4ZXJGcm9tTm90aGluZyIsIm5vbWluYWxMZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIiLCJub21pbmFsUGFyc2VyRnJvbU5vdGhpbmciLCJub21pbmFsUGFyc2VyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsIm5vbWluYWxVdGlsaXRpZXMiLCJEb2N1bWVudCIsIm92ZXJsYXlUb2tlbk1hcCIsIkVycm9yT3ZlcmxheVRva2VuIiwiU3R1ZmZPdmVybGF5VG9rZW4iLCJOb25zZW5zZU92ZXJsYXlUb2tlbiIsIkxhYmVsTmFtZU92ZXJsYXlUb2tlbiIsIlByb2NlZHVyZVJlZmVyZW5jZU5hbWVPdmVybGF5VG9rZW4iLCJSZWZlcmVuY2VOYW1lT3ZlcmxheVRva2VuIiwiZnJvbUNvbnRlbnRBbmRSZWxlYXNlTmFtZSIsImNvbnRlbnQiLCJyZWxlYXNlTmFtZSIsInR5cGUiLCJOT01JTkFMX0RPQ1VNRU5UX1RZUEUiLCJjb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJjb21iaW5lZEN1c3RvbUdyYW1tYXJGcm9tUmVsZWFzZU5hbWUiLCJub21pbmFsTGV4ZXIiLCJub21pbmFsTGV4ZXJyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsIm5vbWluYWxQYXJzZXIiLCJub21pbmFsUGFyc2VyckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIiLCJsZXhlciIsInBhcnNlciIsIm5vbWluYWxEb2N1bWVudCIsImZyb21Db250ZW50VHlwZUxleGVyQW5kUGFyc2VyIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFpQkE7OztlQUFxQkE7OztnQ0FmWTtpRUFFWjs4REFDUzs4REFDQTtpRUFDRztrRUFDQztzRUFDSTsrRUFDUzsrQkFFVDtnQ0FDZTs7Ozs7O0FBRXJELE1BQU0sRUFBRUMsdUJBQXVCLEVBQUVDLHFDQUFxQyxFQUFFQyx3QkFBd0IsRUFBRUMsc0NBQXNDLEVBQUUsR0FBR0MsZ0NBQWdCO0FBRTlJLE1BQU1MLHdCQUF3Qk0saUJBQVE7SUFDbkQsT0FBT0Msa0JBQWtCO1FBQ3ZCLFdBQVdDLGNBQWlCO1FBQzVCLFdBQVdDLGNBQWlCO1FBQzVCLGNBQWNDLGlCQUFvQjtRQUNsQyw4QkFBOEJDLGtCQUFxQjtRQUNuRCw4QkFBOEJDLCtCQUFrQztRQUNoRSxrQ0FBa0NDLHNCQUF5QjtJQUM3RCxFQUFFO0lBRUYsT0FBT0MsMEJBQTBCQyxPQUFPLEVBQUVDLFdBQVcsRUFBRTtRQUNyRCxNQUFNQyxPQUFPQyxvQ0FBcUIsRUFDNUJDLHdCQUF3QkMsSUFBQUEsb0RBQW9DLEVBQUNKLGNBQzdESyxlQUFlQyx1Q0FBdUNILHdCQUN0REksZ0JBQWdCQyx3Q0FBd0NMLHdCQUN4RE0sUUFBUUosY0FDUkssU0FBU0gsZUFDVEksa0JBQWtCckIsaUJBQVEsQ0FBQ3NCLDZCQUE2QixDQUFDNUIsaUJBQWlCZSxTQUFTRSxNQUFNUSxPQUFPQyxRQUFRVjtRQUU5RyxPQUFPVztJQUNUO0FBQ0Y7QUFFQSxTQUFTTCx1Q0FBdUNILHFCQUFxQjtJQUNuRSxNQUFNRSxlQUFlLEFBQUNGLDBCQUEwQixPQUN6QmpCLHNDQUFzQ2lCLHlCQUNwQ2xCO0lBRXpCLE9BQU9vQjtBQUNUO0FBRUEsU0FBU0csd0NBQXdDTCxxQkFBcUI7SUFDcEUsTUFBTUksZ0JBQWdCLEFBQUNKLDBCQUEwQixPQUN6QmYsdUNBQXVDZSx5QkFDckNoQjtJQUUxQixPQUFPb0I7QUFDVCJ9
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "highmark-occam",
3
3
  "author": "James Smith",
4
- "version": "1.0.85",
4
+ "version": "1.0.87",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/highmark-occam",
7
7
  "description": "Highmark support for Occam.",
@@ -14,10 +14,9 @@
14
14
  "easy-with-style": "^3.0.564",
15
15
  "highmark-markdown": "^1.2.158",
16
16
  "occam-custom-grammars": "^6.0.66",
17
- "occam-furtle": "^3.0.280",
18
17
  "occam-grammars": "^1.3.561",
18
+ "occam-languages": "^0.0.260",
19
19
  "occam-lexers": "^23.1.67",
20
- "occam-nominal": "^1.0.184",
21
20
  "occam-parsers": "^23.1.77",
22
21
  "occam-query": "^4.1.182",
23
22
  "occam-styles": "^5.0.456",
package/src/document/furtle.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- import { lexersUtilities, parsersUtilities } from "occam-furtle";
3
+ import { furtleUtilities } from "occam-languages";
4
4
 
5
5
  import Document from "../document";
6
6
  import ErrorOverlayToken from "../token/overlay/common/error";
@@ -10,8 +10,7 @@ import ReferenceNameOverlayToken from "../token/overlay/common/referenceName";
10
10
 
11
11
  import { FURTLE_DOCUMENT_TYPE } from "../documentTypes";
12
12
 
13
- const { furtleLexerFromNothing } = lexersUtilities,
14
- { furtleParserFromNothing } = parsersUtilities;
13
+ const { furtleLexerFromNothing, furtleParserFromNothing } = furtleUtilities;
15
14
 
16
15
  const furtleLexer = furtleLexerFromNothing(),
17
16
  furtleParser = furtleParserFromNothing();
package/src/document/nominal.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- import { lexersUtilities, parsersUtilities } from "occam-nominal";
3
+ import { nominalUtilities } from "occam-languages";
4
4
 
5
5
  import Document from "../document";
6
6
  import ErrorOverlayToken from "../token/overlay/common/error";
@@ -13,8 +13,7 @@ import ProcedureReferenceNameOverlayToken from "../token/overlay/common/procedur
13
13
  import { NOMINAL_DOCUMENT_TYPE } from "../documentTypes";
14
14
  import { combinedCustomGrammarFromReleaseName } from "../utilities/customGrammars";
15
15
 
16
- const { nominalLexerFromNothing, nominalLexerFromCombinedCustomGrammar } = lexersUtilities,
17
- { nominalParserFromNothing, nominalParserFromCombinedCustomGrammar } = parsersUtilities;
16
+ const { nominalLexerFromNothing, nominalLexerFromCombinedCustomGrammar, nominalParserFromNothing, nominalParserFromCombinedCustomGrammar } = nominalUtilities;
18
17
 
19
18
  export default class NominalDocument extends Document {
20
19
  static overlayTokenMap = {