occam-nominal 1.0.121 → 1.0.123

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.
@@ -9,18 +9,18 @@ Object.defineProperty(exports, "default", {
9
9
  }
10
10
  });
11
11
  const _occamlanguages = require("occam-languages");
12
- const _occamnominal = require("occam-nominal");
13
12
  const _lexer = /*#__PURE__*/ _interop_require_default(require("../nominal/lexer"));
14
13
  const _parser = /*#__PURE__*/ _interop_require_default(require("../nominal/parser"));
15
14
  const _type = require("../utilities/type");
16
15
  const _metaTypes = require("../metaTypes");
16
+ const _lexers = require("../utilities/lexers");
17
+ const _parsers = require("../utilities/parsers");
17
18
  function _interop_require_default(obj) {
18
19
  return obj && obj.__esModule ? obj : {
19
20
  default: obj
20
21
  };
21
22
  }
22
- const { nominalLexerFromNothing } = _occamnominal.lexersUtilities, { nominalParserFromNothing } = _occamnominal.parsersUtilities;
23
- const nominalLexer = nominalLexerFromNothing(_lexer.default), nominalParser = nominalParserFromNothing(_parser.default); ///
23
+ const nominalLexer = (0, _lexers.nominalLexerFromNothing)(_lexer.default), nominalParser = (0, _parsers.nominalParserFromNothing)(_parser.default); ///
24
24
  let baseType = null;
25
25
  class NominalContext extends _occamlanguages.Context {
26
26
  constructor(context, lexer, parser){
@@ -54,4 +54,4 @@ class NominalContext extends _occamlanguages.Context {
54
54
  }
55
55
  }
56
56
 
57
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250ZXh0L25vbWluYWwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IENvbnRleHQgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5pbXBvcnQgeyBsZXhlcnNVdGlsaXRpZXMsIHBhcnNlcnNVdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tbm9taW5hbFwiO1xuXG5pbXBvcnQgTm9taW5hbExleGVyIGZyb20gXCIuLi9ub21pbmFsL2xleGVyXCI7XG5pbXBvcnQgTm9taW5hbFBhcnNlciBmcm9tIFwiLi4vbm9taW5hbC9wYXJzZXJcIjtcblxuaW1wb3J0IHsgYmFzZVR5cGVGcm9tTm90aGluZyB9IGZyb20gXCIuLi91dGlsaXRpZXMvdHlwZVwiO1xuaW1wb3J0IHsgZmluZE1ldGFUeXBlQnlNZXRhVHlwZU5hbWUgfSBmcm9tIFwiLi4vbWV0YVR5cGVzXCI7XG5cbmNvbnN0IHsgbm9taW5hbExleGVyRnJvbU5vdGhpbmcgfSA9IGxleGVyc1V0aWxpdGllcyxcbiAgICAgIHsgbm9taW5hbFBhcnNlckZyb21Ob3RoaW5nIH0gPSBwYXJzZXJzVXRpbGl0aWVzO1xuXG5jb25zdCBub21pbmFsTGV4ZXIgPSBub21pbmFsTGV4ZXJGcm9tTm90aGluZyhOb21pbmFsTGV4ZXIpLFxuICAgICAgbm9taW5hbFBhcnNlciA9IG5vbWluYWxQYXJzZXJGcm9tTm90aGluZyhOb21pbmFsUGFyc2VyKTsgLy8vXG5cbmxldCBiYXNlVHlwZSA9IG51bGw7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIE5vbWluYWxDb250ZXh0IGV4dGVuZHMgQ29udGV4dCB7XG4gIGNvbnN0cnVjdG9yKGNvbnRleHQsIGxleGVyLCBwYXJzZXIpIHtcbiAgICBzdXBlcihjb250ZXh0KTtcblxuICAgIHRoaXMubGV4ZXIgPSBsZXhlcjtcbiAgICB0aGlzLnBhcnNlciA9IHBhcnNlcjtcbiAgfVxuXG4gIGdldExleGVyKCkge1xuICAgIHJldHVybiB0aGlzLmxleGVyO1xuICB9XG5cbiAgZ2V0UGFyc2VyKCkge1xuICAgIHJldHVybiB0aGlzLnBhcnNlcjtcbiAgfVxuXG4gIGZpbmRUeXBlQnlOb21pbmFsVHlwZU5hbWUobm9taW5hbFR5cGVOYW1lKSB7XG4gICAgbGV0IHR5cGUgPSBudWxsO1xuXG4gICAgaWYgKGJhc2VUeXBlID09PSBudWxsKSB7XG4gICAgICBiYXNlVHlwZSA9IGJhc2VUeXBlRnJvbU5vdGhpbmcoKTtcbiAgICB9XG5cbiAgICBjb25zdCBjb21wYXJlc1RvTm9taW5hbFR5cGVOYW1lID0gYmFzZVR5cGUuY29tcGFyZU5vbWluYWxUeXBlTmFtZShub21pbmFsVHlwZU5hbWUpO1xuXG4gICAgaWYgKGNvbXBhcmVzVG9Ob21pbmFsVHlwZU5hbWUpIHtcbiAgICAgIHR5cGUgPSBiYXNlVHlwZTsgIC8vL1xuICAgIH1cblxuICAgIHJldHVybiB0eXBlO1xuICB9XG5cbiAgZmluZE1ldGFUeXBlQnlNZXRhVHlwZU5hbWUobWV0YVR5cGVOYW1lKSB7IHJldHVybiBmaW5kTWV0YVR5cGVCeU1ldGFUeXBlTmFtZShtZXRhVHlwZU5hbWUpOyB9XG5cbiAgc3RhdGljIGZyb21Ob3RoaW5nKCkge1xuICAgIGNvbnN0IGNvbnRleHQgPSBudWxsLFxuICAgICAgICAgIGxleGVyID0gbm9taW5hbExleGVyLCAvLy9cbiAgICAgICAgICBwYXJzZXIgPSBub21pbmFsUGFyc2VyLCAvLy9cbiAgICAgICAgICBub21pbmFsQ29udGV4dCA9IENvbnRleHQuZnJvbU5vdGhpbmcoTm9taW5hbENvbnRleHQsIGxleGVyLCBwYXJzZXIsIGNvbnRleHQpO1xuXG4gICAgcmV0dXJuIG5vbWluYWxDb250ZXh0O1xuICB9XG59XG4iXSwibmFtZXMiOlsiTm9taW5hbENvbnRleHQiLCJub21pbmFsTGV4ZXJGcm9tTm90aGluZyIsImxleGVyc1V0aWxpdGllcyIsIm5vbWluYWxQYXJzZXJGcm9tTm90aGluZyIsInBhcnNlcnNVdGlsaXRpZXMiLCJub21pbmFsTGV4ZXIiLCJOb21pbmFsTGV4ZXIiLCJub21pbmFsUGFyc2VyIiwiTm9taW5hbFBhcnNlciIsImJhc2VUeXBlIiwiQ29udGV4dCIsImNvbnRleHQiLCJsZXhlciIsInBhcnNlciIsImdldExleGVyIiwiZ2V0UGFyc2VyIiwiZmluZFR5cGVCeU5vbWluYWxUeXBlTmFtZSIsIm5vbWluYWxUeXBlTmFtZSIsInR5cGUiLCJiYXNlVHlwZUZyb21Ob3RoaW5nIiwiY29tcGFyZXNUb05vbWluYWxUeXBlTmFtZSIsImNvbXBhcmVOb21pbmFsVHlwZU5hbWUiLCJmaW5kTWV0YVR5cGVCeU1ldGFUeXBlTmFtZSIsIm1ldGFUeXBlTmFtZSIsImZyb21Ob3RoaW5nIiwibm9taW5hbENvbnRleHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQW1CQTs7O2VBQXFCQTs7O2dDQWpCRzs4QkFDMEI7OERBRXpCOytEQUNDO3NCQUVVOzJCQUNPOzs7Ozs7QUFFM0MsTUFBTSxFQUFFQyx1QkFBdUIsRUFBRSxHQUFHQyw2QkFBZSxFQUM3QyxFQUFFQyx3QkFBd0IsRUFBRSxHQUFHQyw4QkFBZ0I7QUFFckQsTUFBTUMsZUFBZUosd0JBQXdCSyxjQUFZLEdBQ25EQyxnQkFBZ0JKLHlCQUF5QkssZUFBYSxHQUFHLEdBQUc7QUFFbEUsSUFBSUMsV0FBVztBQUVBLE1BQU1ULHVCQUF1QlUsdUJBQU87SUFDakQsWUFBWUMsT0FBTyxFQUFFQyxLQUFLLEVBQUVDLE1BQU0sQ0FBRTtRQUNsQyxLQUFLLENBQUNGO1FBRU4sSUFBSSxDQUFDQyxLQUFLLEdBQUdBO1FBQ2IsSUFBSSxDQUFDQyxNQUFNLEdBQUdBO0lBQ2hCO0lBRUFDLFdBQVc7UUFDVCxPQUFPLElBQUksQ0FBQ0YsS0FBSztJQUNuQjtJQUVBRyxZQUFZO1FBQ1YsT0FBTyxJQUFJLENBQUNGLE1BQU07SUFDcEI7SUFFQUcsMEJBQTBCQyxlQUFlLEVBQUU7UUFDekMsSUFBSUMsT0FBTztRQUVYLElBQUlULGFBQWEsTUFBTTtZQUNyQkEsV0FBV1UsSUFBQUEseUJBQW1CO1FBQ2hDO1FBRUEsTUFBTUMsNEJBQTRCWCxTQUFTWSxzQkFBc0IsQ0FBQ0o7UUFFbEUsSUFBSUcsMkJBQTJCO1lBQzdCRixPQUFPVCxVQUFXLEdBQUc7UUFDdkI7UUFFQSxPQUFPUztJQUNUO0lBRUFJLDJCQUEyQkMsWUFBWSxFQUFFO1FBQUUsT0FBT0QsSUFBQUEscUNBQTBCLEVBQUNDO0lBQWU7SUFFNUYsT0FBT0MsY0FBYztRQUNuQixNQUFNYixVQUFVLE1BQ1ZDLFFBQVFQLGNBQ1JRLFNBQVNOLGVBQ1RrQixpQkFBaUJmLHVCQUFPLENBQUNjLFdBQVcsQ0FBQ3hCLGdCQUFnQlksT0FBT0MsUUFBUUY7UUFFMUUsT0FBT2M7SUFDVDtBQUNGIn0=
57
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250ZXh0L25vbWluYWwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IENvbnRleHQgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5cbmltcG9ydCBOb21pbmFsTGV4ZXIgZnJvbSBcIi4uL25vbWluYWwvbGV4ZXJcIjtcbmltcG9ydCBOb21pbmFsUGFyc2VyIGZyb20gXCIuLi9ub21pbmFsL3BhcnNlclwiO1xuXG5pbXBvcnQgeyBiYXNlVHlwZUZyb21Ob3RoaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy90eXBlXCI7XG5pbXBvcnQgeyBmaW5kTWV0YVR5cGVCeU1ldGFUeXBlTmFtZSB9IGZyb20gXCIuLi9tZXRhVHlwZXNcIjtcblxuaW1wb3J0IHsgbm9taW5hbExleGVyRnJvbU5vdGhpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2xleGVyc1wiO1xuaW1wb3J0IHsgbm9taW5hbFBhcnNlckZyb21Ob3RoaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9wYXJzZXJzXCI7XG5cbmNvbnN0IG5vbWluYWxMZXhlciA9IG5vbWluYWxMZXhlckZyb21Ob3RoaW5nKE5vbWluYWxMZXhlciksXG4gICAgICBub21pbmFsUGFyc2VyID0gbm9taW5hbFBhcnNlckZyb21Ob3RoaW5nKE5vbWluYWxQYXJzZXIpOyAvLy9cblxubGV0IGJhc2VUeXBlID0gbnVsbDtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgTm9taW5hbENvbnRleHQgZXh0ZW5kcyBDb250ZXh0IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgbGV4ZXIsIHBhcnNlcikge1xuICAgIHN1cGVyKGNvbnRleHQpO1xuXG4gICAgdGhpcy5sZXhlciA9IGxleGVyO1xuICAgIHRoaXMucGFyc2VyID0gcGFyc2VyO1xuICB9XG5cbiAgZ2V0TGV4ZXIoKSB7XG4gICAgcmV0dXJuIHRoaXMubGV4ZXI7XG4gIH1cblxuICBnZXRQYXJzZXIoKSB7XG4gICAgcmV0dXJuIHRoaXMucGFyc2VyO1xuICB9XG5cbiAgZmluZFR5cGVCeU5vbWluYWxUeXBlTmFtZShub21pbmFsVHlwZU5hbWUpIHtcbiAgICBsZXQgdHlwZSA9IG51bGw7XG5cbiAgICBpZiAoYmFzZVR5cGUgPT09IG51bGwpIHtcbiAgICAgIGJhc2VUeXBlID0gYmFzZVR5cGVGcm9tTm90aGluZygpO1xuICAgIH1cblxuICAgIGNvbnN0IGNvbXBhcmVzVG9Ob21pbmFsVHlwZU5hbWUgPSBiYXNlVHlwZS5jb21wYXJlTm9taW5hbFR5cGVOYW1lKG5vbWluYWxUeXBlTmFtZSk7XG5cbiAgICBpZiAoY29tcGFyZXNUb05vbWluYWxUeXBlTmFtZSkge1xuICAgICAgdHlwZSA9IGJhc2VUeXBlOyAgLy8vXG4gICAgfVxuXG4gICAgcmV0dXJuIHR5cGU7XG4gIH1cblxuICBmaW5kTWV0YVR5cGVCeU1ldGFUeXBlTmFtZShtZXRhVHlwZU5hbWUpIHsgcmV0dXJuIGZpbmRNZXRhVHlwZUJ5TWV0YVR5cGVOYW1lKG1ldGFUeXBlTmFtZSk7IH1cblxuICBzdGF0aWMgZnJvbU5vdGhpbmcoKSB7XG4gICAgY29uc3QgY29udGV4dCA9IG51bGwsXG4gICAgICAgICAgbGV4ZXIgPSBub21pbmFsTGV4ZXIsIC8vL1xuICAgICAgICAgIHBhcnNlciA9IG5vbWluYWxQYXJzZXIsIC8vL1xuICAgICAgICAgIG5vbWluYWxDb250ZXh0ID0gQ29udGV4dC5mcm9tTm90aGluZyhOb21pbmFsQ29udGV4dCwgbGV4ZXIsIHBhcnNlciwgY29udGV4dCk7XG5cbiAgICByZXR1cm4gbm9taW5hbENvbnRleHQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJOb21pbmFsQ29udGV4dCIsIm5vbWluYWxMZXhlciIsIm5vbWluYWxMZXhlckZyb21Ob3RoaW5nIiwiTm9taW5hbExleGVyIiwibm9taW5hbFBhcnNlciIsIm5vbWluYWxQYXJzZXJGcm9tTm90aGluZyIsIk5vbWluYWxQYXJzZXIiLCJiYXNlVHlwZSIsIkNvbnRleHQiLCJjb250ZXh0IiwibGV4ZXIiLCJwYXJzZXIiLCJnZXRMZXhlciIsImdldFBhcnNlciIsImZpbmRUeXBlQnlOb21pbmFsVHlwZU5hbWUiLCJub21pbmFsVHlwZU5hbWUiLCJ0eXBlIiwiYmFzZVR5cGVGcm9tTm90aGluZyIsImNvbXBhcmVzVG9Ob21pbmFsVHlwZU5hbWUiLCJjb21wYXJlTm9taW5hbFR5cGVOYW1lIiwiZmluZE1ldGFUeXBlQnlNZXRhVHlwZU5hbWUiLCJtZXRhVHlwZU5hbWUiLCJmcm9tTm90aGluZyIsIm5vbWluYWxDb250ZXh0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFrQkE7OztlQUFxQkE7OztnQ0FoQkc7OERBRUM7K0RBQ0M7c0JBRVU7MkJBQ087d0JBRUg7eUJBQ0M7Ozs7OztBQUV6QyxNQUFNQyxlQUFlQyxJQUFBQSwrQkFBdUIsRUFBQ0MsY0FBWSxHQUNuREMsZ0JBQWdCQyxJQUFBQSxpQ0FBd0IsRUFBQ0MsZUFBYSxHQUFHLEdBQUc7QUFFbEUsSUFBSUMsV0FBVztBQUVBLE1BQU1QLHVCQUF1QlEsdUJBQU87SUFDakQsWUFBWUMsT0FBTyxFQUFFQyxLQUFLLEVBQUVDLE1BQU0sQ0FBRTtRQUNsQyxLQUFLLENBQUNGO1FBRU4sSUFBSSxDQUFDQyxLQUFLLEdBQUdBO1FBQ2IsSUFBSSxDQUFDQyxNQUFNLEdBQUdBO0lBQ2hCO0lBRUFDLFdBQVc7UUFDVCxPQUFPLElBQUksQ0FBQ0YsS0FBSztJQUNuQjtJQUVBRyxZQUFZO1FBQ1YsT0FBTyxJQUFJLENBQUNGLE1BQU07SUFDcEI7SUFFQUcsMEJBQTBCQyxlQUFlLEVBQUU7UUFDekMsSUFBSUMsT0FBTztRQUVYLElBQUlULGFBQWEsTUFBTTtZQUNyQkEsV0FBV1UsSUFBQUEseUJBQW1CO1FBQ2hDO1FBRUEsTUFBTUMsNEJBQTRCWCxTQUFTWSxzQkFBc0IsQ0FBQ0o7UUFFbEUsSUFBSUcsMkJBQTJCO1lBQzdCRixPQUFPVCxVQUFXLEdBQUc7UUFDdkI7UUFFQSxPQUFPUztJQUNUO0lBRUFJLDJCQUEyQkMsWUFBWSxFQUFFO1FBQUUsT0FBT0QsSUFBQUEscUNBQTBCLEVBQUNDO0lBQWU7SUFFNUYsT0FBT0MsY0FBYztRQUNuQixNQUFNYixVQUFVLE1BQ1ZDLFFBQVFULGNBQ1JVLFNBQVNQLGVBQ1RtQixpQkFBaUJmLHVCQUFPLENBQUNjLFdBQVcsQ0FBQ3RCLGdCQUFnQlUsT0FBT0MsUUFBUUY7UUFFMUUsT0FBT2M7SUFDVDtBQUNGIn0=
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-nominal",
3
3
  "author": "James Smith",
4
- "version": "1.0.121",
4
+ "version": "1.0.123",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-nominal",
7
7
  "description": "Occam's Nominal language.",
@@ -13,12 +13,13 @@
13
13
  "necessary": "^17.2.10",
14
14
  "occam-custom-grammars": "^6.0.46",
15
15
  "occam-grammars": "^1.3.538",
16
- "occam-languages": "^0.0.225",
16
+ "occam-languages": "^0.0.227",
17
17
  "occam-lexers": "^23.1.58",
18
18
  "occam-parsers": "^23.1.64"
19
19
  },
20
20
  "devDependencies": {
21
21
  "@swc/core": "1.13.20",
22
+ "decaf-cli": "^1.0.26",
22
23
  "watchful-cli": "^1.7.91"
23
24
  },
24
25
  "scripts": {
@@ -31,7 +32,8 @@
31
32
  "build": "npm run clean && npm run batch",
32
33
  "build-debug": "npm run clean && npm run batch-debug",
33
34
  "watch": "npm run clean && npm run batch && npm run incremental",
34
- "watch-debug": "npm run clean && npm run batch-debug && npm run incremental-debug"
35
+ "watch-debug": "npm run clean && npm run batch-debug && npm run incremental-debug",
36
+ "test": "decaf test -f"
35
37
  },
36
38
  "files": [
37
39
  "src",
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
 
3
3
  import { Context } from "occam-languages";
4
- import { lexersUtilities, parsersUtilities } from "occam-nominal";
5
4
 
6
5
  import NominalLexer from "../nominal/lexer";
7
6
  import NominalParser from "../nominal/parser";
@@ -9,8 +8,8 @@ import NominalParser from "../nominal/parser";
9
8
  import { baseTypeFromNothing } from "../utilities/type";
10
9
  import { findMetaTypeByMetaTypeName } from "../metaTypes";
11
10
 
12
- const { nominalLexerFromNothing } = lexersUtilities,
13
- { nominalParserFromNothing } = parsersUtilities;
11
+ import { nominalLexerFromNothing } from "../utilities/lexers";
12
+ import { nominalParserFromNothing } from "../utilities/parsers";
14
13
 
15
14
  const nominalLexer = nominalLexerFromNothing(NominalLexer),
16
15
  nominalParser = nominalParserFromNothing(NominalParser); ///