occam-nominal 1.0.476 → 1.0.477

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.
@@ -92,19 +92,19 @@ class ValidateStatementPass extends _occamlanguages.ContinuationPass {
92
92
  const validateTermPass = new ValidateTermPass(), validateStatementPass = new ValidateStatementPass();
93
93
  function validateTermAsProperty(term, context, forward, back) {
94
94
  const termNode = term.getNode(), termChildNodes = termNode.getChildNodes(); ///
95
- return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);
95
+ return validateTermPass.descend(termChildNodes, context, forward, back);
96
96
  }
97
97
  function validateTermAsGenerator(term, context, forward, back) {
98
98
  const termNode = term.getNode(), termChildNodes = termNode.getChildNodes(); ///
99
- return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);
99
+ return validateTermPass.descend(termChildNodes, context, forward, back);
100
100
  }
101
101
  function validateTermAsConstructor(term, context, forward, back) {
102
102
  const termNode = term.getNode(), termChildNodes = termNode.getChildNodes(); ///
103
- return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);
103
+ return validateTermPass.descend(termChildNodes, context, forward, back);
104
104
  }
105
105
  function validateStatementAsCombinator(statement, context, forward, back) {
106
106
  const statementNode = statement.getNode(), statementChildNodes = statementNode.getChildNodes(); ///
107
107
  return validateStatementPass.descend(statementChildNodes, context, forward, back);
108
108
  }
109
109
 
110
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/process/validate.js"],"sourcesContent":["\"use strict\";\n\nimport { queryUtilities } from \"occam-query\";\nimport { ContinuationPass } from \"occam-languages\";\n\nimport { declare } from \"../utilities/state\";\nimport { termFromTermNode, statementFromStatementNode } from \"../utilities/element\";\n\nconst { nodeQuery } = queryUtilities;\n\nconst termNodeQuery = nodeQuery(\"/term\"),\n      typeNodeQuery = nodeQuery(\"/type\"),\n      statementNodeQuery = nodeQuery(\"/statement\");\n\nclass ValidateTermPass extends ContinuationPass {\n  static maps = [\n    {\n      nodeQuery: termNodeQuery,\n      run: (termNode, context, forward, back) => {\n        const term = termFromTermNode(termNode, context);\n\n        return declare((state) => {\n          return term.validate(state, context, (term, context, bcak) => {\n            return forward(context, back);\n          }, back);\n        });\n      }\n    },\n    {\n      nodeQuery: typeNodeQuery,\n      run: (typeNode, context, forward, back) => {\n        const nominalTypeName = typeNode.getNominalTypeName(),\n              typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);\n\n        if (!typePresent) {\n          return back();\n        }\n\n        return forward(context, back);\n      }\n    }\n  ];\n}\n\nclass ValidateStatementPass extends ContinuationPass {\n  static maps = [\n    {\n      nodeQuery: statementNodeQuery,\n      run: (statementNode, context, forward, back) => {\n        const statement = statementFromStatementNode(statementNode, context);\n\n        return declare((state) => {\n          return statement.validate(state, context, (statement, context, back) => {\n            return forward(context, back);\n          }, back);\n        });\n      }\n    },\n    {\n      nodeQuery: termNodeQuery,\n      run: (termNode, context, forward, back) => {\n        const term = termFromTermNode(termNode, context);\n\n        return declare((state) => {\n          return term.validate(state, context, (term, context, back) => {\n            return forward(context, back);\n          });\n        });\n      }\n    },\n    {\n      nodeQuery: typeNodeQuery,\n      run: (typeNode, context, forward, back) => {\n        const nominalTypeName = typeNode.getNominalTypeName(),\n              typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);\n\n        if (!typePresent) {\n          return back();\n        }\n\n        return forward(context, back);\n      }\n    }\n  ];\n}\n\nconst validateTermPass = new ValidateTermPass(),\n      validateStatementPass = new ValidateStatementPass();\n\nexport function validateTermAsProperty(term, context, forward, back) {\n  const termNode = term.getNode(),\n        termChildNodes = termNode.getChildNodes();  ///\n\n  return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);\n}\n\nexport function validateTermAsGenerator(term, context, forward, back) {\n  const termNode = term.getNode(),\n        termChildNodes = termNode.getChildNodes();  ///\n\n  return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);\n}\n\nexport function validateTermAsConstructor(term, context, forward, back) {\n  const termNode = term.getNode(),\n        termChildNodes = termNode.getChildNodes();  ///\n\n  return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);\n}\n\nexport function validateStatementAsCombinator(statement, context, forward, back) {\n  const statementNode = statement.getNode(),\n        statementChildNodes = statementNode.getChildNodes();  ///\n\n  return validateStatementPass.descend(statementChildNodes, context, forward, back);\n}\n"],"names":["validateStatementAsCombinator","validateTermAsConstructor","validateTermAsGenerator","validateTermAsProperty","nodeQuery","queryUtilities","termNodeQuery","typeNodeQuery","statementNodeQuery","ValidateTermPass","ContinuationPass","maps","run","termNode","context","forward","back","term","termFromTermNode","declare","state","validate","bcak","typeNode","nominalTypeName","getNominalTypeName","typePresent","isTypePresentByNominalTypeName","ValidateStatementPass","statementNode","statement","statementFromStatementNode","validateTermPass","validateStatementPass","getNode","termChildNodes","getChildNodes","descend","statementChildNodes"],"mappings":"AAAA;;;;;;;;;;;QA8GgBA;eAAAA;;QAPAC;eAAAA;;QAPAC;eAAAA;;QAPAC;eAAAA;;;4BAvFe;gCACE;uBAET;yBACqC;AAE7D,MAAM,EAAEC,SAAS,EAAE,GAAGC,0BAAc;AAEpC,MAAMC,gBAAgBF,UAAU,UAC1BG,gBAAgBH,UAAU,UAC1BI,qBAAqBJ,UAAU;AAErC,MAAMK,yBAAyBC,gCAAgB;IAC7C,OAAOC,OAAO;QACZ;YACEP,WAAWE;YACXM,KAAK,CAACC,UAAUC,SAASC,SAASC;gBAChC,MAAMC,OAAOC,IAAAA,yBAAgB,EAACL,UAAUC;gBAExC,OAAOK,IAAAA,cAAO,EAAC,CAACC;oBACd,OAAOH,KAAKI,QAAQ,CAACD,OAAON,SAAS,CAACG,MAAMH,SAASQ;wBACnD,OAAOP,QAAQD,SAASE;oBAC1B,GAAGA;gBACL;YACF;QACF;QACA;YACEZ,WAAWG;YACXK,KAAK,CAACW,UAAUT,SAASC,SAASC;gBAChC,MAAMQ,kBAAkBD,SAASE,kBAAkB,IAC7CC,cAAcZ,QAAQa,8BAA8B,CAACH;gBAE3D,IAAI,CAACE,aAAa;oBAChB,OAAOV;gBACT;gBAEA,OAAOD,QAAQD,SAASE;YAC1B;QACF;KACD,CAAC;AACJ;AAEA,MAAMY,8BAA8BlB,gCAAgB;IAClD,OAAOC,OAAO;QACZ;YACEP,WAAWI;YACXI,KAAK,CAACiB,eAAef,SAASC,SAASC;gBACrC,MAAMc,YAAYC,IAAAA,mCAA0B,EAACF,eAAef;gBAE5D,OAAOK,IAAAA,cAAO,EAAC,CAACC;oBACd,OAAOU,UAAUT,QAAQ,CAACD,OAAON,SAAS,CAACgB,WAAWhB,SAASE;wBAC7D,OAAOD,QAAQD,SAASE;oBAC1B,GAAGA;gBACL;YACF;QACF;QACA;YACEZ,WAAWE;YACXM,KAAK,CAACC,UAAUC,SAASC,SAASC;gBAChC,MAAMC,OAAOC,IAAAA,yBAAgB,EAACL,UAAUC;gBAExC,OAAOK,IAAAA,cAAO,EAAC,CAACC;oBACd,OAAOH,KAAKI,QAAQ,CAACD,OAAON,SAAS,CAACG,MAAMH,SAASE;wBACnD,OAAOD,QAAQD,SAASE;oBAC1B;gBACF;YACF;QACF;QACA;YACEZ,WAAWG;YACXK,KAAK,CAACW,UAAUT,SAASC,SAASC;gBAChC,MAAMQ,kBAAkBD,SAASE,kBAAkB,IAC7CC,cAAcZ,QAAQa,8BAA8B,CAACH;gBAE3D,IAAI,CAACE,aAAa;oBAChB,OAAOV;gBACT;gBAEA,OAAOD,QAAQD,SAASE;YAC1B;QACF;KACD,CAAC;AACJ;AAEA,MAAMgB,mBAAmB,IAAIvB,oBACvBwB,wBAAwB,IAAIL;AAE3B,SAASzB,uBAAuBc,IAAI,EAAEH,OAAO,EAAEC,OAAO,EAAEC,IAAI;IACjE,MAAMH,WAAWI,KAAKiB,OAAO,IACvBC,iBAAiBtB,SAASuB,aAAa,IAAK,GAAG;IAErD,OAAOJ,iBAAiBK,OAAO,CAACF,gBAAgBrB,SAASC,SAASC,MAAMD,SAASC;AACnF;AAEO,SAASd,wBAAwBe,IAAI,EAAEH,OAAO,EAAEC,OAAO,EAAEC,IAAI;IAClE,MAAMH,WAAWI,KAAKiB,OAAO,IACvBC,iBAAiBtB,SAASuB,aAAa,IAAK,GAAG;IAErD,OAAOJ,iBAAiBK,OAAO,CAACF,gBAAgBrB,SAASC,SAASC,MAAMD,SAASC;AACnF;AAEO,SAASf,0BAA0BgB,IAAI,EAAEH,OAAO,EAAEC,OAAO,EAAEC,IAAI;IACpE,MAAMH,WAAWI,KAAKiB,OAAO,IACvBC,iBAAiBtB,SAASuB,aAAa,IAAK,GAAG;IAErD,OAAOJ,iBAAiBK,OAAO,CAACF,gBAAgBrB,SAASC,SAASC,MAAMD,SAASC;AACnF;AAEO,SAAShB,8BAA8B8B,SAAS,EAAEhB,OAAO,EAAEC,OAAO,EAAEC,IAAI;IAC7E,MAAMa,gBAAgBC,UAAUI,OAAO,IACjCI,sBAAsBT,cAAcO,aAAa,IAAK,GAAG;IAE/D,OAAOH,sBAAsBI,OAAO,CAACC,qBAAqBxB,SAASC,SAASC;AAC9E"}
110
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/process/validate.js"],"sourcesContent":["\"use strict\";\n\nimport { queryUtilities } from \"occam-query\";\nimport { ContinuationPass } from \"occam-languages\";\n\nimport { declare } from \"../utilities/state\";\nimport { termFromTermNode, statementFromStatementNode } from \"../utilities/element\";\n\nconst { nodeQuery } = queryUtilities;\n\nconst termNodeQuery = nodeQuery(\"/term\"),\n      typeNodeQuery = nodeQuery(\"/type\"),\n      statementNodeQuery = nodeQuery(\"/statement\");\n\nclass ValidateTermPass extends ContinuationPass {\n  static maps = [\n    {\n      nodeQuery: termNodeQuery,\n      run: (termNode, context, forward, back) => {\n        const term = termFromTermNode(termNode, context);\n\n        return declare((state) => {\n          return term.validate(state, context, (term, context, bcak) => {\n            return forward(context, back);\n          }, back);\n        });\n      }\n    },\n    {\n      nodeQuery: typeNodeQuery,\n      run: (typeNode, context, forward, back) => {\n        const nominalTypeName = typeNode.getNominalTypeName(),\n              typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);\n\n        if (!typePresent) {\n          return back();\n        }\n\n        return forward(context, back);\n      }\n    }\n  ];\n}\n\nclass ValidateStatementPass extends ContinuationPass {\n  static maps = [\n    {\n      nodeQuery: statementNodeQuery,\n      run: (statementNode, context, forward, back) => {\n        const statement = statementFromStatementNode(statementNode, context);\n\n        return declare((state) => {\n          return statement.validate(state, context, (statement, context, back) => {\n            return forward(context, back);\n          }, back);\n        });\n      }\n    },\n    {\n      nodeQuery: termNodeQuery,\n      run: (termNode, context, forward, back) => {\n        const term = termFromTermNode(termNode, context);\n\n        return declare((state) => {\n          return term.validate(state, context, (term, context, back) => {\n            return forward(context, back);\n          });\n        });\n      }\n    },\n    {\n      nodeQuery: typeNodeQuery,\n      run: (typeNode, context, forward, back) => {\n        const nominalTypeName = typeNode.getNominalTypeName(),\n              typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);\n\n        if (!typePresent) {\n          return back();\n        }\n\n        return forward(context, back);\n      }\n    }\n  ];\n}\n\nconst validateTermPass = new ValidateTermPass(),\n      validateStatementPass = new ValidateStatementPass();\n\nexport function validateTermAsProperty(term, context, forward, back) {\n  const termNode = term.getNode(),\n        termChildNodes = termNode.getChildNodes();  ///\n\n  return validateTermPass.descend(termChildNodes, context, forward, back);\n}\n\nexport function validateTermAsGenerator(term, context, forward, back) {\n  const termNode = term.getNode(),\n        termChildNodes = termNode.getChildNodes();  ///\n\n  return validateTermPass.descend(termChildNodes, context, forward, back);\n}\n\nexport function validateTermAsConstructor(term, context, forward, back) {\n  const termNode = term.getNode(),\n        termChildNodes = termNode.getChildNodes();  ///\n\n  return validateTermPass.descend(termChildNodes, context, forward, back);\n}\n\nexport function validateStatementAsCombinator(statement, context, forward, back) {\n  const statementNode = statement.getNode(),\n        statementChildNodes = statementNode.getChildNodes();  ///\n\n  return validateStatementPass.descend(statementChildNodes, context, forward, back);\n}\n"],"names":["validateStatementAsCombinator","validateTermAsConstructor","validateTermAsGenerator","validateTermAsProperty","nodeQuery","queryUtilities","termNodeQuery","typeNodeQuery","statementNodeQuery","ValidateTermPass","ContinuationPass","maps","run","termNode","context","forward","back","term","termFromTermNode","declare","state","validate","bcak","typeNode","nominalTypeName","getNominalTypeName","typePresent","isTypePresentByNominalTypeName","ValidateStatementPass","statementNode","statement","statementFromStatementNode","validateTermPass","validateStatementPass","getNode","termChildNodes","getChildNodes","descend","statementChildNodes"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-nominal",
3
3
  "author": "James Smith",
4
- "version": "1.0.476",
4
+ "version": "1.0.477",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-nominal",
7
7
  "description": "Occam's Nominal language.",
@@ -11,9 +11,9 @@
11
11
  },
12
12
  "dependencies": {
13
13
  "necessary": "^17.6.3",
14
- "occam-furtle": "^3.0.477",
14
+ "occam-furtle": "^3.0.478",
15
15
  "occam-grammar-utilities": "^8.1.22",
16
- "occam-languages": "^3.0.36",
16
+ "occam-languages": "^3.0.38",
17
17
  "occam-query": "^4.1.206"
18
18
  },
19
19
  "devDependencies": {
@@ -91,21 +91,21 @@ export function validateTermAsProperty(term, context, forward, back) {
91
91
  const termNode = term.getNode(),
92
92
  termChildNodes = termNode.getChildNodes(); ///
93
93
 
94
- return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);
94
+ return validateTermPass.descend(termChildNodes, context, forward, back);
95
95
  }
96
96
 
97
97
  export function validateTermAsGenerator(term, context, forward, back) {
98
98
  const termNode = term.getNode(),
99
99
  termChildNodes = termNode.getChildNodes(); ///
100
100
 
101
- return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);
101
+ return validateTermPass.descend(termChildNodes, context, forward, back);
102
102
  }
103
103
 
104
104
  export function validateTermAsConstructor(term, context, forward, back) {
105
105
  const termNode = term.getNode(),
106
106
  termChildNodes = termNode.getChildNodes(); ///
107
107
 
108
- return validateTermPass.descend(termChildNodes, context, forward, back, forward, back);
108
+ return validateTermPass.descend(termChildNodes, context, forward, back);
109
109
  }
110
110
 
111
111
  export function validateStatementAsCombinator(statement, context, forward, back) {