occam-verify-cli 0.0.939 → 0.0.941
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.
- package/lib/premise.js +3 -3
- package/lib/supposition.js +3 -3
- package/lib/verifier/metaLevel.js +7 -7
- package/lib/verifier/statementAsCombinator.js +13 -7
- package/lib/verifier/termAsConstructor.js +5 -5
- package/lib/verifier/topLevel.js +236 -0
- package/lib/verify/declaration/metavariable.js +70 -4
- package/lib/verify/declaration/type.js +36 -3
- package/lib/verify/declaration/variable.js +38 -3
- package/lib/verify/error.js +18 -0
- package/lib/verify/file.js +7 -21
- package/lib/verify/metavariable.js +4 -26
- package/lib/verify/statement.js +4 -26
- package/lib/verify/term.js +4 -23
- package/lib/verify/type.js +10 -57
- package/lib/verify/variable.js +10 -59
- package/package.json +5 -5
- package/src/premise.js +2 -2
- package/src/supposition.js +2 -2
- package/src/verifier/metaLevel.js +7 -9
- package/src/verifier/statementAsCombinator.js +18 -9
- package/src/verifier/termAsConstructor.js +6 -7
- package/src/verifier/topLevel.js +160 -0
- package/src/verify/declaration/metavariable.js +112 -2
- package/src/verify/declaration/type.js +48 -1
- package/src/verify/declaration/variable.js +50 -1
- package/src/verify/error.js +11 -0
- package/src/verify/file.js +8 -29
- package/src/verify/metavariable.js +0 -22
- package/src/verify/statement.js +0 -25
- package/src/verify/term.js +0 -19
- package/src/verify/type.js +6 -56
- package/src/verify/variable.js +6 -58
- package/lib/verify/declaration/topLevel.js +0 -75
- package/src/verify/declaration/topLevel.js +0 -101
package/lib/verify/term.js
CHANGED
|
@@ -2,18 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
default: function() {
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return _default;
|
|
14
|
-
},
|
|
15
|
-
verifyStandaloneTerm: function() {
|
|
16
|
-
return verifyStandaloneTerm;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
11
|
var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
|
|
@@ -48,17 +40,6 @@ function verifyTerm(termNode, terms, localContext, verifyAhead) {
|
|
|
48
40
|
}
|
|
49
41
|
return termVerified;
|
|
50
42
|
}
|
|
51
|
-
function verifyStandaloneTerm(termNode, localContext, verifyAhead) {
|
|
52
|
-
var standaloneTermVerified;
|
|
53
|
-
var termString = localContext.nodeAsString(termNode);
|
|
54
|
-
localContext.trace("Verifying the '".concat(termString, "' standalone term..."), termNode);
|
|
55
|
-
var terms = [], termVerified = verifyTerm(termNode, terms, localContext, verifyAhead);
|
|
56
|
-
standaloneTermVerified = termVerified; ///
|
|
57
|
-
if (standaloneTermVerified) {
|
|
58
|
-
localContext.debug("...verified the '".concat(termString, "' standalone term."), termNode);
|
|
59
|
-
}
|
|
60
|
-
return standaloneTermVerified;
|
|
61
|
-
}
|
|
62
43
|
Object.assign(_shim.default, {
|
|
63
44
|
verifyTerm: verifyTerm
|
|
64
45
|
});
|
|
@@ -157,4 +138,4 @@ function verifyTermAgainstConstructor(termNode, terms, constructor, localContext
|
|
|
157
138
|
return termVerifiedAgainstConstructor;
|
|
158
139
|
}
|
|
159
140
|
|
|
160
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport Term from \"../term\";\nimport bracketedConstructor from \"../constructor/bracketed\";\nimport termAgainstConstructorUnifier from \"../unifier/termAgainstConstructor\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/term/argument/term\"),\n      variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, terms, localContext, verifyAhead) {\n  let termVerified;\n\n  const termString = localContext.nodeAsString(termNode);\n\n  localContext.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsVariable,\n    verifyTermAgainstConstructors,\n    verifyTermAgainstBracketedConstructor\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, terms, localContext, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    localContext.debug(`...verified the '${termString}' term.`, termNode);\n  }\n\n  return termVerified;\n}\n\nexport function verifyStandaloneTerm(termNode, localContext, verifyAhead) {\n  let standaloneTermVerified;\n\n  const termString = localContext.nodeAsString(termNode);\n\n  localContext.trace(`Verifying the '${termString}' standalone term...`, termNode);\n\n  const terms = [],\n        termVerified = verifyTerm(termNode, terms, localContext, verifyAhead);\n\n  standaloneTermVerified = termVerified;  ///\n\n  if (standaloneTermVerified) {\n    localContext.debug(`...verified the '${termString}' standalone term.`, termNode);\n  }\n\n  return standaloneTermVerified;\n}\n\nObject.assign(shim, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nfunction verifyTermAsVariable(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const termString = localContext.nodeAsString(termNode);\n\n    localContext.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n    const variable = localContext.findVariableByVariableNode(variableNode);\n\n    if (variable !== null) {\n      let verifiedAhead;\n\n      const type = variable.getType(),\n            term = Term.fromTermNodeAndType(termNode, type);\n\n      terms.push(term);\n\n      verifiedAhead = verifyAhead();\n\n      if (!verifiedAhead) {\n        terms.pop();\n      }\n\n      termVerifiedAsVariable = verifiedAhead;  ///\n    }\n\n    if (termVerifiedAsVariable) {\n      localContext.debug(`...verified the '${termString}' term as a variable.`, termNode);\n    }\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction verifyTermAgainstConstructors(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAgainstConstructors = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode === null) {\n    const constructors = localContext.getConstructors();\n\n    termVerifiedAgainstConstructors = constructors.some((constructor) => {\n      const termVerifiedAgainstConstructor = verifyTermAgainstConstructor(termNode, terms, constructor, localContext, verifyAhead);\n\n      if (termVerifiedAgainstConstructor) {\n        return true;\n      }\n    });\n  }\n\n  return termVerifiedAgainstConstructors;\n}\n\nfunction verifyTermAgainstBracketedConstructor(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAgainstBracketedConstructor;\n\n  const termString = localContext.nodeAsString(termNode),\n        bracketedConstructorString = bracketedConstructor.getString();\n\n  localContext.trace(`Verifying the '${termString}' term against the '${bracketedConstructorString}' bracketed constructor...`, termNode);\n\n  const bracketedConstructorTermNode = bracketedConstructor.getTermNode(),\n        termNodeA = termNode,  ///\n        constructorTermNodeB = bracketedConstructorTermNode,  ///\n        unified = termAgainstConstructorUnifier.unify(termNodeA, constructorTermNodeB, localContext, () => {\n          let verifiedAhead;\n\n          const bracketedTermNode = termNode; ///\n\n          termNode = termNodeQuery(termNode); ///\n\n          if (termNode === null) {\n            verifiedAhead = false;\n          } else {\n            let type;\n\n            verifyTerm(termNode, terms, localContext, () => {\n              let verifiedAhead;\n\n              const firstTerm = first(terms),\n                    term = firstTerm; ///\n\n              type = term.getType();\n\n              verifiedAhead = true;\n\n              return verifiedAhead;\n            });\n\n            terms.pop();\n\n            termNode = bracketedTermNode; ///\n\n            const term = Term.fromTermNodeAndType(termNode, type);\n\n            terms.push(term);\n\n            verifiedAhead = verifyAhead();\n\n            if (!verifiedAhead) {\n              terms.pop();\n            }\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAgainstBracketedConstructor = unified;  ///\n\n  if (termVerifiedAgainstBracketedConstructor) {\n    localContext.debug(`...verified the '${termString}' term against the '${bracketedConstructorString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAgainstBracketedConstructor;\n}\n\nfunction verifyTermAgainstConstructor(termNode, terms, constructor, localContext, verifyAhead) {\n  let termVerifiedAgainstConstructor;\n\n  const termString = localContext.nodeAsString(termNode),\n        constructorString = constructor.getString();\n\n  localContext.trace(`Verifying the '${termString}' term against the '${constructorString}' constructor...`, termNode);\n\n  const constructorTermNode = constructor.getTermNode(),\n        termNodeA = termNode,  ///\n        constructorTermNodeB = constructorTermNode,  ///\n        unified = termAgainstConstructorUnifier.unify(termNodeA, constructorTermNodeB, localContext, () => {\n          let verifiedAhead;\n\n          const type = constructor.getType(),\n                term = Term.fromTermNodeAndType(termNode, type);\n\n          terms.push(term);\n\n          verifiedAhead = verifyAhead();\n\n          if (!verifiedAhead) {\n            terms.pop();\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAgainstConstructor = unified;  ///\n\n  if (termVerifiedAgainstConstructor) {\n    localContext.debug(`...verified the '${termString}' term against the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAgainstConstructor;\n}\n\n"],"names":["verifyStandaloneTerm","termNodeQuery","nodeQuery","variableNodeQuery","verifyTerm","termNode","terms","localContext","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsVariable","verifyTermAgainstConstructors","verifyTermAgainstBracketedConstructor","some","verifyTermFunction","debug","standaloneTermVerified","Object","assign","shim","termVerifiedAsVariable","variableNode","variable","findVariableByVariableNode","verifiedAhead","type","getType","term","Term","fromTermNodeAndType","push","pop","termVerifiedAgainstConstructors","constructors","getConstructors","constructor","termVerifiedAgainstConstructor","verifyTermAgainstConstructor","termVerifiedAgainstBracketedConstructor","bracketedConstructorString","bracketedConstructor","getString","bracketedConstructorTermNode","getTermNode","termNodeA","constructorTermNodeB","unified","termAgainstConstructorUnifier","unify","bracketedTermNode","firstTerm","first","constructorString","constructorTermNode"],"mappings":"AAAA;;;;;;;;;;;IAgEA,OAA0B;eAA1B;;IAvBgBA,oBAAoB;eAApBA;;;2DAvCC;2DACA;gEACgB;6EACS;qBAEpB;qBACI;;;;;;AAE1B,IAAMC,gBAAgBC,IAAAA,gBAAS,EAAC,wBAC1BC,oBAAoBD,IAAAA,gBAAS,EAAC;AAEpC,SAASE,WAAWC,QAAQ,EAAEC,KAAK,EAAEC,YAAY,EAAEC,WAAW;IAC5D,IAAIC;IAEJ,IAAMC,aAAaH,aAAaI,YAAY,CAACN;IAE7CE,aAAaK,KAAK,CAAC,AAAC,kBAA4B,OAAXF,YAAW,cAAYL;IAE5D,IAAMQ,sBAAsB;QAC1BC;QACAC;QACAC;KACD;IAEDP,eAAeI,oBAAoBI,IAAI,CAAC,SAACC;QACvC,IAAMT,eAAeS,mBAAmBb,UAAUC,OAAOC,cAAcC;QAEvE,IAAIC,cAAc;YAChB,OAAO;QACT;IACF;IAEA,IAAIA,cAAc;QAChBF,aAAaY,KAAK,CAAC,AAAC,oBAA8B,OAAXT,YAAW,YAAUL;IAC9D;IAEA,OAAOI;AACT;AAEO,SAAST,qBAAqBK,QAAQ,EAAEE,YAAY,EAAEC,WAAW;IACtE,IAAIY;IAEJ,IAAMV,aAAaH,aAAaI,YAAY,CAACN;IAE7CE,aAAaK,KAAK,CAAC,AAAC,kBAA4B,OAAXF,YAAW,yBAAuBL;IAEvE,IAAMC,QAAQ,EAAE,EACVG,eAAeL,WAAWC,UAAUC,OAAOC,cAAcC;IAE/DY,yBAAyBX,cAAe,GAAG;IAE3C,IAAIW,wBAAwB;QAC1Bb,aAAaY,KAAK,CAAC,AAAC,oBAA8B,OAAXT,YAAW,uBAAqBL;IACzE;IAEA,OAAOe;AACT;AAEAC,OAAOC,MAAM,CAACC,aAAI,EAAE;IAClBnB,YAAAA;AACF;IAEA,WAAeA;AAEf,SAASU,qBAAqBT,QAAQ,EAAEC,KAAK,EAAEC,YAAY,EAAEC,WAAW;IACtE,IAAIgB,yBAAyB;IAE7B,IAAMC,eAAetB,kBAAkBE;IAEvC,IAAIoB,iBAAiB,MAAM;QACzB,IAAMf,aAAaH,aAAaI,YAAY,CAACN;QAE7CE,aAAaK,KAAK,CAAC,AAAC,kBAA4B,OAAXF,YAAW,4BAA0BL;QAE1E,IAAMqB,WAAWnB,aAAaoB,0BAA0B,CAACF;QAEzD,IAAIC,aAAa,MAAM;YACrB,IAAIE;YAEJ,IAAMC,OAAOH,SAASI,OAAO,IACvBC,OAAOC,aAAI,CAACC,mBAAmB,CAAC5B,UAAUwB;YAEhDvB,MAAM4B,IAAI,CAACH;YAEXH,gBAAgBpB;YAEhB,IAAI,CAACoB,eAAe;gBAClBtB,MAAM6B,GAAG;YACX;YAEAX,yBAAyBI,eAAgB,GAAG;QAC9C;QAEA,IAAIJ,wBAAwB;YAC1BjB,aAAaY,KAAK,CAAC,AAAC,oBAA8B,OAAXT,YAAW,0BAAwBL;QAC5E;IACF;IAEA,OAAOmB;AACT;AAEA,SAAST,8BAA8BV,QAAQ,EAAEC,KAAK,EAAEC,YAAY,EAAEC,WAAW;IAC/E,IAAI4B,kCAAkC;IAEtC,IAAMX,eAAetB,kBAAkBE;IAEvC,IAAIoB,iBAAiB,MAAM;QACzB,IAAMY,eAAe9B,aAAa+B,eAAe;QAEjDF,kCAAkCC,aAAapB,IAAI,CAAC,SAACsB;YACnD,IAAMC,iCAAiCC,6BAA6BpC,UAAUC,OAAOiC,aAAahC,cAAcC;YAEhH,IAAIgC,gCAAgC;gBAClC,OAAO;YACT;QACF;IACF;IAEA,OAAOJ;AACT;AAEA,SAASpB,sCAAsCX,QAAQ,EAAEC,KAAK,EAAEC,YAAY,EAAEC,WAAW;IACvF,IAAIkC;IAEJ,IAAMhC,aAAaH,aAAaI,YAAY,CAACN,WACvCsC,6BAA6BC,kBAAoB,CAACC,SAAS;IAEjEtC,aAAaK,KAAK,CAAC,AAAC,kBAAkD+B,OAAjCjC,YAAW,wBAAiD,OAA3BiC,4BAA2B,+BAA6BtC;IAE9H,IAAMyC,+BAA+BF,kBAAoB,CAACG,WAAW,IAC/DC,YAAY3C,UACZ4C,uBAAuBH,8BACvBI,UAAUC,+BAA6B,CAACC,KAAK,CAACJ,WAAWC,sBAAsB1C,cAAc;QAC3F,IAAIqB;QAEJ,IAAMyB,oBAAoBhD,UAAU,GAAG;QAEvCA,WAAWJ,cAAcI,WAAW,GAAG;QAEvC,IAAIA,aAAa,MAAM;YACrBuB,gBAAgB;QAClB,OAAO;YACL,IAAIC;YAEJzB,WAAWC,UAAUC,OAAOC,cAAc;gBACxC,IAAIqB;gBAEJ,IAAM0B,YAAYC,IAAAA,YAAK,EAACjD,QAClByB,OAAOuB,WAAW,GAAG;gBAE3BzB,OAAOE,KAAKD,OAAO;gBAEnBF,gBAAgB;gBAEhB,OAAOA;YACT;YAEAtB,MAAM6B,GAAG;YAET9B,WAAWgD,mBAAmB,GAAG;YAEjC,IAAMtB,OAAOC,aAAI,CAACC,mBAAmB,CAAC5B,UAAUwB;YAEhDvB,MAAM4B,IAAI,CAACH;YAEXH,gBAAgBpB;YAEhB,IAAI,CAACoB,eAAe;gBAClBtB,MAAM6B,GAAG;YACX;QACF;QAEA,OAAOP;IACT;IAENc,0CAA0CQ,SAAU,GAAG;IAEvD,IAAIR,yCAAyC;QAC3CnC,aAAaY,KAAK,CAAC,AAAC,oBAAoDwB,OAAjCjC,YAAW,wBAAiD,OAA3BiC,4BAA2B,mBAAiBtC;IACtH;IAEA,OAAOqC;AACT;AAEA,SAASD,6BAA6BpC,QAAQ,EAAEC,KAAK,EAAEiC,WAAW,EAAEhC,YAAY,EAAEC,WAAW;IAC3F,IAAIgC;IAEJ,IAAM9B,aAAaH,aAAaI,YAAY,CAACN,WACvCmD,oBAAoBjB,YAAYM,SAAS;IAE/CtC,aAAaK,KAAK,CAAC,AAAC,kBAAkD4C,OAAjC9C,YAAW,wBAAwC,OAAlB8C,mBAAkB,qBAAmBnD;IAE3G,IAAMoD,sBAAsBlB,YAAYQ,WAAW,IAC7CC,YAAY3C,UACZ4C,uBAAuBQ,qBACvBP,UAAUC,+BAA6B,CAACC,KAAK,CAACJ,WAAWC,sBAAsB1C,cAAc;QAC3F,IAAIqB;QAEJ,IAAMC,OAAOU,YAAYT,OAAO,IAC1BC,OAAOC,aAAI,CAACC,mBAAmB,CAAC5B,UAAUwB;QAEhDvB,MAAM4B,IAAI,CAACH;QAEXH,gBAAgBpB;QAEhB,IAAI,CAACoB,eAAe;YAClBtB,MAAM6B,GAAG;QACX;QAEA,OAAOP;IACT;IAENY,iCAAiCU,SAAU,GAAG;IAE9C,IAAIV,gCAAgC;QAClCjC,aAAaY,KAAK,CAAC,AAAC,oBAAoDqC,OAAjC9C,YAAW,wBAAwC,OAAlB8C,mBAAkB,mBAAiBnD;IAC7G;IAEA,OAAOmC;AACT"}
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport Term from \"../term\";\nimport bracketedConstructor from \"../constructor/bracketed\";\nimport termAgainstConstructorUnifier from \"../unifier/termAgainstConstructor\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/term/argument/term\"),\n      variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, terms, localContext, verifyAhead) {\n  let termVerified;\n\n  const termString = localContext.nodeAsString(termNode);\n\n  localContext.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsVariable,\n    verifyTermAgainstConstructors,\n    verifyTermAgainstBracketedConstructor\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, terms, localContext, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    localContext.debug(`...verified the '${termString}' term.`, termNode);\n  }\n\n  return termVerified;\n}\n\nObject.assign(shim, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nfunction verifyTermAsVariable(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const termString = localContext.nodeAsString(termNode);\n\n    localContext.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n    const variable = localContext.findVariableByVariableNode(variableNode);\n\n    if (variable !== null) {\n      let verifiedAhead;\n\n      const type = variable.getType(),\n            term = Term.fromTermNodeAndType(termNode, type);\n\n      terms.push(term);\n\n      verifiedAhead = verifyAhead();\n\n      if (!verifiedAhead) {\n        terms.pop();\n      }\n\n      termVerifiedAsVariable = verifiedAhead;  ///\n    }\n\n    if (termVerifiedAsVariable) {\n      localContext.debug(`...verified the '${termString}' term as a variable.`, termNode);\n    }\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction verifyTermAgainstConstructors(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAgainstConstructors = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode === null) {\n    const constructors = localContext.getConstructors();\n\n    termVerifiedAgainstConstructors = constructors.some((constructor) => {\n      const termVerifiedAgainstConstructor = verifyTermAgainstConstructor(termNode, terms, constructor, localContext, verifyAhead);\n\n      if (termVerifiedAgainstConstructor) {\n        return true;\n      }\n    });\n  }\n\n  return termVerifiedAgainstConstructors;\n}\n\nfunction verifyTermAgainstBracketedConstructor(termNode, terms, localContext, verifyAhead) {\n  let termVerifiedAgainstBracketedConstructor;\n\n  const termString = localContext.nodeAsString(termNode),\n        bracketedConstructorString = bracketedConstructor.getString();\n\n  localContext.trace(`Verifying the '${termString}' term against the '${bracketedConstructorString}' bracketed constructor...`, termNode);\n\n  const bracketedConstructorTermNode = bracketedConstructor.getTermNode(),\n        termNodeA = termNode,  ///\n        constructorTermNodeB = bracketedConstructorTermNode,  ///\n        unified = termAgainstConstructorUnifier.unify(termNodeA, constructorTermNodeB, localContext, () => {\n          let verifiedAhead;\n\n          const bracketedTermNode = termNode; ///\n\n          termNode = termNodeQuery(termNode); ///\n\n          if (termNode === null) {\n            verifiedAhead = false;\n          } else {\n            let type;\n\n            verifyTerm(termNode, terms, localContext, () => {\n              let verifiedAhead;\n\n              const firstTerm = first(terms),\n                    term = firstTerm; ///\n\n              type = term.getType();\n\n              verifiedAhead = true;\n\n              return verifiedAhead;\n            });\n\n            terms.pop();\n\n            termNode = bracketedTermNode; ///\n\n            const term = Term.fromTermNodeAndType(termNode, type);\n\n            terms.push(term);\n\n            verifiedAhead = verifyAhead();\n\n            if (!verifiedAhead) {\n              terms.pop();\n            }\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAgainstBracketedConstructor = unified;  ///\n\n  if (termVerifiedAgainstBracketedConstructor) {\n    localContext.debug(`...verified the '${termString}' term against the '${bracketedConstructorString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAgainstBracketedConstructor;\n}\n\nfunction verifyTermAgainstConstructor(termNode, terms, constructor, localContext, verifyAhead) {\n  let termVerifiedAgainstConstructor;\n\n  const termString = localContext.nodeAsString(termNode),\n        constructorString = constructor.getString();\n\n  localContext.trace(`Verifying the '${termString}' term against the '${constructorString}' constructor...`, termNode);\n\n  const constructorTermNode = constructor.getTermNode(),\n        termNodeA = termNode,  ///\n        constructorTermNodeB = constructorTermNode,  ///\n        unified = termAgainstConstructorUnifier.unify(termNodeA, constructorTermNodeB, localContext, () => {\n          let verifiedAhead;\n\n          const type = constructor.getType(),\n                term = Term.fromTermNodeAndType(termNode, type);\n\n          terms.push(term);\n\n          verifiedAhead = verifyAhead();\n\n          if (!verifiedAhead) {\n            terms.pop();\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAgainstConstructor = unified;  ///\n\n  if (termVerifiedAgainstConstructor) {\n    localContext.debug(`...verified the '${termString}' term against the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAgainstConstructor;\n}\n\n"],"names":["termNodeQuery","nodeQuery","variableNodeQuery","verifyTerm","termNode","terms","localContext","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsVariable","verifyTermAgainstConstructors","verifyTermAgainstBracketedConstructor","some","verifyTermFunction","debug","Object","assign","shim","termVerifiedAsVariable","variableNode","variable","findVariableByVariableNode","verifiedAhead","type","getType","term","Term","fromTermNodeAndType","push","pop","termVerifiedAgainstConstructors","constructors","getConstructors","constructor","termVerifiedAgainstConstructor","verifyTermAgainstConstructor","termVerifiedAgainstBracketedConstructor","bracketedConstructorString","bracketedConstructor","getString","bracketedConstructorTermNode","getTermNode","termNodeA","constructorTermNodeB","unified","termAgainstConstructorUnifier","unify","bracketedTermNode","firstTerm","first","constructorString","constructorTermNode"],"mappings":"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"}
|
package/lib/verify/type.js
CHANGED
|
@@ -2,72 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
default: function() {
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return verifyType;
|
|
14
|
-
},
|
|
15
|
-
verifyStandaloneType: function() {
|
|
16
|
-
return verifyStandaloneType;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
|
-
|
|
20
|
-
var _name = require("../utilities/name");
|
|
21
|
-
function _interop_require_default(obj) {
|
|
22
|
-
return obj && obj.__esModule ? obj : {
|
|
23
|
-
default: obj
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
|
-
function verifyType(typeNode, superTypeNode, fileContext) {
|
|
11
|
+
function verifyType(typeNode, localContext, verifyAhead) {
|
|
27
12
|
var typeVerified = false;
|
|
28
|
-
var typeString = fileContext.nodeAsString(typeNode);
|
|
29
|
-
fileContext.trace("Verifying the '".concat(typeString, "' type..."), typeNode);
|
|
30
|
-
var typePresent = fileContext.isTypePresentByTypeNode(typeNode);
|
|
31
|
-
if (typePresent) {
|
|
32
|
-
var typeString1 = fileContext.nodeAsString(typeNode);
|
|
33
|
-
fileContext.debug("The type '".concat(typeString1, "' is already present."), typeNode);
|
|
34
|
-
} else {
|
|
35
|
-
var type;
|
|
36
|
-
var typeName = (0, _name.typeNameFromTypeNode)(typeNode);
|
|
37
|
-
if (superTypeNode === null) {
|
|
38
|
-
type = _type.default.fromTypeName(typeName);
|
|
39
|
-
} else {
|
|
40
|
-
var superType = fileContext.findTypeByTypeNode(superTypeNode);
|
|
41
|
-
if (superType === null) {
|
|
42
|
-
var superTypeString = fileContext.nodeAsString(superTypeNode);
|
|
43
|
-
fileContext.debug("The super-type '".concat(superTypeString, "' is not present."), typeNode);
|
|
44
|
-
} else {
|
|
45
|
-
type = _type.default.fromTypeNameAndSuperType(typeName, superType);
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
if (type !== null) {
|
|
49
|
-
fileContext.addType(type);
|
|
50
|
-
typeVerified = true;
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
if (typeVerified) {
|
|
54
|
-
fileContext.debug("...verified the '".concat(typeString, "' type."), typeNode);
|
|
55
|
-
}
|
|
56
|
-
return typeVerified;
|
|
57
|
-
}
|
|
58
|
-
function verifyStandaloneType(typeNode, localContext, verifyAhead) {
|
|
59
|
-
var standaloneTypeVerified = false;
|
|
60
13
|
var typeString = localContext.nodeAsString(typeNode);
|
|
61
|
-
localContext.trace("Verifying the '".concat(typeString, "'
|
|
14
|
+
localContext.trace("Verifying the '".concat(typeString, "' type..."), typeNode);
|
|
62
15
|
var typePresent = localContext.isTypePresentByTypeNode(typeNode);
|
|
63
16
|
if (typePresent) {
|
|
64
17
|
var verifiedAhead = verifyAhead();
|
|
65
|
-
|
|
18
|
+
typeVerified = verifiedAhead; ///
|
|
66
19
|
}
|
|
67
|
-
if (
|
|
68
|
-
localContext.debug("...verified the '".concat(typeString, "'
|
|
20
|
+
if (typeVerified) {
|
|
21
|
+
localContext.debug("...verified the '".concat(typeString, "' type."), typeNode);
|
|
69
22
|
}
|
|
70
|
-
return
|
|
23
|
+
return typeVerified;
|
|
71
24
|
}
|
|
72
25
|
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VHlwZSh0eXBlTm9kZSwgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgdHlwZVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgY29uc3QgdHlwZVN0cmluZyA9IGxvY2FsQ29udGV4dC5ub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gIGxvY2FsQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHt0eXBlU3RyaW5nfScgdHlwZS4uLmAsIHR5cGVOb2RlKTtcblxuICBjb25zdCB0eXBlUHJlc2VudCA9IGxvY2FsQ29udGV4dC5pc1R5cGVQcmVzZW50QnlUeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgaWYgKHR5cGVQcmVzZW50KSB7XG4gICAgY29uc3QgdmVyaWZpZWRBaGVhZCA9IHZlcmlmeUFoZWFkKCk7XG5cbiAgICB0eXBlVmVyaWZpZWQgPSB2ZXJpZmllZEFoZWFkOyAvLy9cbiAgfVxuXG4gIGlmICh0eXBlVmVyaWZpZWQpIHtcbiAgICBsb2NhbENvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt0eXBlU3RyaW5nfScgdHlwZS5gLCB0eXBlTm9kZSk7XG4gIH1cblxuICByZXR1cm4gdHlwZVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVR5cGUiLCJ0eXBlTm9kZSIsImxvY2FsQ29udGV4dCIsInZlcmlmeUFoZWFkIiwidHlwZVZlcmlmaWVkIiwidHlwZVN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRyYWNlIiwidHlwZVByZXNlbnQiLCJpc1R5cGVQcmVzZW50QnlUeXBlTm9kZSIsInZlcmlmaWVkQWhlYWQiLCJkZWJ1ZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBRUE7OztlQUF3QkE7OztBQUFULFNBQVNBLFdBQVdDLFFBQVEsRUFBRUMsWUFBWSxFQUFFQyxXQUFXO0lBQ3BFLElBQUlDLGVBQWU7SUFFbkIsSUFBTUMsYUFBYUgsYUFBYUksWUFBWSxDQUFDTDtJQUU3Q0MsYUFBYUssS0FBSyxDQUFDLEFBQUMsa0JBQTRCLE9BQVhGLFlBQVcsY0FBWUo7SUFFNUQsSUFBTU8sY0FBY04sYUFBYU8sdUJBQXVCLENBQUNSO0lBRXpELElBQUlPLGFBQWE7UUFDZixJQUFNRSxnQkFBZ0JQO1FBRXRCQyxlQUFlTSxlQUFlLEdBQUc7SUFDbkM7SUFFQSxJQUFJTixjQUFjO1FBQ2hCRixhQUFhUyxLQUFLLENBQUMsQUFBQyxvQkFBOEIsT0FBWE4sWUFBVyxZQUFVSjtJQUM5RDtJQUVBLE9BQU9HO0FBQ1QifQ==
|
package/lib/verify/variable.js
CHANGED
|
@@ -2,74 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
default: function() {
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return verifyVariable;
|
|
14
|
-
},
|
|
15
|
-
verifyStandaloneVariable: function() {
|
|
16
|
-
return verifyStandaloneVariable;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
|
-
|
|
20
|
-
var _variable1 = /*#__PURE__*/ _interop_require_default(require("../assignment/variable"));
|
|
21
|
-
var _type = require("../type");
|
|
22
|
-
function _interop_require_default(obj) {
|
|
23
|
-
return obj && obj.__esModule ? obj : {
|
|
24
|
-
default: obj
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
function verifyVariable(variableNode, typeNode, fileContext) {
|
|
11
|
+
function verifyVariable(variableNode, localContext, verifyAhead) {
|
|
28
12
|
var variableVerified = false;
|
|
29
|
-
var variableString = fileContext.nodeAsString(variableNode);
|
|
30
|
-
fileContext.trace("Verifying the '".concat(variableString, "' variable..."), variableNode);
|
|
31
|
-
var variablePresent = fileContext.isVariablePresentByVariableNode(variableNode);
|
|
32
|
-
if (variablePresent) {
|
|
33
|
-
fileContext.debug("The variable '".concat(variableString, "' is already present."), variableNode);
|
|
34
|
-
} else {
|
|
35
|
-
var variable;
|
|
36
|
-
if (typeNode === null) {
|
|
37
|
-
var type = _type.objectType;
|
|
38
|
-
variable = _variable.default.fromVariableNodeAndType(variableNode, type);
|
|
39
|
-
} else {
|
|
40
|
-
var type1 = fileContext.findTypeByTypeNode(typeNode);
|
|
41
|
-
if (type1 === null) {
|
|
42
|
-
var typeString = fileContext.nodeAsString(typeNode);
|
|
43
|
-
fileContext.debug("The '".concat(variableString, "' variable's '").concat(typeString, "' type is not present."), variableNode);
|
|
44
|
-
} else {
|
|
45
|
-
variable = _variable.default.fromVariableNodeAndType(variableNode, type1);
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
if (variable !== null) {
|
|
49
|
-
var variableAssignment = _variable1.default.fromVariable(variable), variableAssigned = variableAssignment.assign(fileContext);
|
|
50
|
-
if (variableAssigned) {
|
|
51
|
-
variableVerified = true;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
if (variableVerified) {
|
|
56
|
-
fileContext.debug("...verified the '".concat(variableString, "' variable."), variableNode);
|
|
57
|
-
}
|
|
58
|
-
return variableVerified;
|
|
59
|
-
}
|
|
60
|
-
function verifyStandaloneVariable(variableNode, localContext, verifyAhead) {
|
|
61
|
-
var standaloneVariableVerified = false;
|
|
62
13
|
var variableString = localContext.nodeAsString(variableNode);
|
|
63
|
-
localContext.trace("Verifying the '".concat(variableString, "'
|
|
14
|
+
localContext.trace("Verifying the '".concat(variableString, "' variable..."), variableNode);
|
|
64
15
|
var variablePresent = localContext.isVariablePresentByVariableNode(variableNode);
|
|
65
16
|
if (variablePresent) {
|
|
66
17
|
var verifiedAhead = verifyAhead();
|
|
67
|
-
|
|
18
|
+
variableVerified = verifiedAhead; ///
|
|
68
19
|
}
|
|
69
|
-
if (
|
|
70
|
-
localContext.debug("...verified the '".concat(variableString, "'
|
|
20
|
+
if (variableVerified) {
|
|
21
|
+
localContext.debug("...verified the '".concat(variableString, "' variable."), variableNode);
|
|
71
22
|
}
|
|
72
|
-
return
|
|
23
|
+
return variableVerified;
|
|
73
24
|
}
|
|
74
25
|
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVZhcmlhYmxlKHZhcmlhYmxlTm9kZSwgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgdmFyaWFibGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IHZhcmlhYmxlU3RyaW5nID0gbG9jYWxDb250ZXh0Lm5vZGVBc1N0cmluZyh2YXJpYWJsZU5vZGUpO1xuXG4gIGxvY2FsQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLi4uYCwgdmFyaWFibGVOb2RlKTtcblxuICBjb25zdCB2YXJpYWJsZVByZXNlbnQgPSBsb2NhbENvbnRleHQuaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpO1xuXG4gIGlmICh2YXJpYWJsZVByZXNlbnQpIHtcbiAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdmVyaWZ5QWhlYWQoKTtcblxuICAgIHZhcmlhYmxlVmVyaWZpZWQgPSB2ZXJpZmllZEFoZWFkOyAvLy9cbiAgfVxuXG4gIGlmICh2YXJpYWJsZVZlcmlmaWVkKSB7XG4gICAgbG9jYWxDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZS5gLCB2YXJpYWJsZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHZhcmlhYmxlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VmFyaWFibGUiLCJ2YXJpYWJsZU5vZGUiLCJsb2NhbENvbnRleHQiLCJ2ZXJpZnlBaGVhZCIsInZhcmlhYmxlVmVyaWZpZWQiLCJ2YXJpYWJsZVN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRyYWNlIiwidmFyaWFibGVQcmVzZW50IiwiaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTm9kZSIsInZlcmlmaWVkQWhlYWQiLCJkZWJ1ZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBRUE7OztlQUF3QkE7OztBQUFULFNBQVNBLGVBQWVDLFlBQVksRUFBRUMsWUFBWSxFQUFFQyxXQUFXO0lBQzVFLElBQUlDLG1CQUFtQjtJQUV2QixJQUFNQyxpQkFBaUJILGFBQWFJLFlBQVksQ0FBQ0w7SUFFakRDLGFBQWFLLEtBQUssQ0FBQyxBQUFDLGtCQUFnQyxPQUFmRixnQkFBZSxrQkFBZ0JKO0lBRXBFLElBQU1PLGtCQUFrQk4sYUFBYU8sK0JBQStCLENBQUNSO0lBRXJFLElBQUlPLGlCQUFpQjtRQUNuQixJQUFNRSxnQkFBZ0JQO1FBRXRCQyxtQkFBbUJNLGVBQWUsR0FBRztJQUN2QztJQUVBLElBQUlOLGtCQUFrQjtRQUNwQkYsYUFBYVMsS0FBSyxDQUFDLEFBQUMsb0JBQWtDLE9BQWZOLGdCQUFlLGdCQUFjSjtJQUN0RTtJQUVBLE9BQU9HO0FBQ1QifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.941",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
"url": "https://github.com/djalbat/occam-verify-cli"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"argumentative": "^2.0.
|
|
13
|
+
"argumentative": "^2.0.32",
|
|
14
14
|
"necessary": "^14.0.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
16
|
-
"occam-entities": "^1.0.
|
|
17
|
-
"occam-file-system": "^6.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.842",
|
|
16
|
+
"occam-entities": "^1.0.153",
|
|
17
|
+
"occam-file-system": "^6.0.193",
|
|
18
18
|
"occam-grammar-utilities": "^8.0.207",
|
|
19
19
|
"occam-query": "^3.1.174"
|
|
20
20
|
},
|
package/src/premise.js
CHANGED
|
@@ -47,7 +47,6 @@ export default class Premise {
|
|
|
47
47
|
|
|
48
48
|
if (subproofAssertionNode !== null) {
|
|
49
49
|
const fileContextA = fileContext, ///
|
|
50
|
-
localContextA = LocalContext.fromFileContext(fileContextA),
|
|
51
50
|
localContextB = localContext, ///
|
|
52
51
|
subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),
|
|
53
52
|
subproofLastProofStepStatementNode = subproofLastProofStepStatementNodeQuery(subproofNode),
|
|
@@ -58,7 +57,8 @@ export default class Premise {
|
|
|
58
57
|
subproofAssertionStatementNodes = subproofAssertionStatementNodesQuery(subproofAssertionNode);
|
|
59
58
|
|
|
60
59
|
subproofUnified = match(subproofAssertionStatementNodes, subproofStatementNodes, (subproofAssertionStatementNode, subproofStatementNode) => {
|
|
61
|
-
const
|
|
60
|
+
const localContextA = LocalContext.fromFileContext(fileContextA),
|
|
61
|
+
nodeA = subproofAssertionStatementNode, ///
|
|
62
62
|
nodeB = subproofStatementNode, ///
|
|
63
63
|
unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
|
|
64
64
|
|
package/src/supposition.js
CHANGED
|
@@ -47,7 +47,6 @@ export default class Supposition {
|
|
|
47
47
|
|
|
48
48
|
if (subproofAssertionNode !== null) {
|
|
49
49
|
const fileContextA = fileContext, ///
|
|
50
|
-
localContextA = LocalContext.fromFileContext(fileContextA),
|
|
51
50
|
localContextB = localContext, ///
|
|
52
51
|
subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),
|
|
53
52
|
subproofLastProofStepStatementNode = subproofLastProofStepStatementNodeQuery(subproofNode),
|
|
@@ -58,7 +57,8 @@ export default class Supposition {
|
|
|
58
57
|
subproofAssertionStatementNodes = subproofAssertionStatementNodesQuery(subproofAssertionNode);
|
|
59
58
|
|
|
60
59
|
subproofUnified = match(subproofAssertionStatementNodes, subproofStatementNodes, (subproofAssertionStatementNode, subproofStatementNode) => {
|
|
61
|
-
const
|
|
60
|
+
const localContextA = LocalContext.fromFileContext(fileContextA),
|
|
61
|
+
nodeA = subproofAssertionStatementNode, ///
|
|
62
62
|
nodeB = subproofStatementNode, ///
|
|
63
63
|
unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
|
|
64
64
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import Verifier from "../verifier";
|
|
4
|
+
import verifyTerm from "../verify/term";
|
|
5
|
+
import verifyVariable from "../verify/variable";
|
|
6
|
+
import verifyMetavariable from "../verify/metavariable";
|
|
4
7
|
|
|
5
8
|
import { nodeQuery } from "../utilities/query";
|
|
6
|
-
import { verifyStandaloneTerm } from "../verify/term";
|
|
7
|
-
import { verifyStandaloneVariable } from "../verify/variable";
|
|
8
|
-
import { verifyStandaloneMetavariable } from "../verify/metavariable";
|
|
9
9
|
|
|
10
10
|
const termNodeQuery = nodeQuery("/term!"),
|
|
11
11
|
variableNodeQuery = nodeQuery("/variable!"),
|
|
@@ -31,8 +31,7 @@ class MetaLevelVerifier extends Verifier {
|
|
|
31
31
|
{
|
|
32
32
|
nodeQuery: metavariableNodeQuery,
|
|
33
33
|
verify: (metavariableNode, localContext, verifyAhead) => {
|
|
34
|
-
const
|
|
35
|
-
metavariableVerified = standaloneMetavariableVerified; ///
|
|
34
|
+
const metavariableVerified = verifyMetavariable(metavariableNode, localContext, verifyAhead);
|
|
36
35
|
|
|
37
36
|
return metavariableVerified;
|
|
38
37
|
}
|
|
@@ -40,8 +39,7 @@ class MetaLevelVerifier extends Verifier {
|
|
|
40
39
|
{
|
|
41
40
|
nodeQuery: variableNodeQuery,
|
|
42
41
|
verify: (variableNode, localContext, verifyAhead) => {
|
|
43
|
-
const
|
|
44
|
-
variableVerified = standaloneVariableVerified; ///
|
|
42
|
+
const variableVerified = verifyVariable(variableNode, localContext, verifyAhead);
|
|
45
43
|
|
|
46
44
|
return variableVerified;
|
|
47
45
|
}
|
|
@@ -49,8 +47,8 @@ class MetaLevelVerifier extends Verifier {
|
|
|
49
47
|
{
|
|
50
48
|
nodeQuery: termNodeQuery,
|
|
51
49
|
verify: (termNode, localContext, verifyAhead) => {
|
|
52
|
-
const
|
|
53
|
-
termVerified =
|
|
50
|
+
const terms = [],
|
|
51
|
+
termVerified = verifyTerm(termNode, terms, localContext, verifyAhead);
|
|
54
52
|
|
|
55
53
|
return termVerified;
|
|
56
54
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import Verifier from "../verifier";
|
|
4
|
+
import verifyType from "../verify/type";
|
|
5
|
+
import verifyTerm from "../verify/term";
|
|
6
|
+
import verifyStatement from "../verify/statement";
|
|
4
7
|
|
|
5
8
|
import { nodeQuery } from "../utilities/query";
|
|
6
|
-
import { verifyStandaloneType } from "../verify/type";
|
|
7
|
-
import { verifyStandaloneTerm } from "../verify/term";
|
|
8
|
-
import { verifyStandaloneStatement } from "../verify/statement";
|
|
9
9
|
|
|
10
10
|
const termNodeQuery = nodeQuery("/term!"),
|
|
11
11
|
typeNodeQuery = nodeQuery("/type!"),
|
|
@@ -32,8 +32,8 @@ class StatementAsCombinatorVerifier extends Verifier {
|
|
|
32
32
|
{
|
|
33
33
|
nodeQuery: termNodeQuery,
|
|
34
34
|
verify: (termNode, localContext, verifyAhead) => {
|
|
35
|
-
const
|
|
36
|
-
termVerified =
|
|
35
|
+
const terms = [],
|
|
36
|
+
termVerified = verifyTerm(termNode, terms, localContext, verifyAhead);
|
|
37
37
|
|
|
38
38
|
return termVerified;
|
|
39
39
|
}
|
|
@@ -41,8 +41,7 @@ class StatementAsCombinatorVerifier extends Verifier {
|
|
|
41
41
|
{
|
|
42
42
|
nodeQuery: typeNodeQuery,
|
|
43
43
|
verify: (typeNode, localContext, verifyAhead) => {
|
|
44
|
-
const
|
|
45
|
-
typeVerified = standaloneTypeVerified; ///
|
|
44
|
+
const typeVerified = verifyType(typeNode, localContext, verifyAhead);
|
|
46
45
|
|
|
47
46
|
return typeVerified;
|
|
48
47
|
}
|
|
@@ -50,8 +49,18 @@ class StatementAsCombinatorVerifier extends Verifier {
|
|
|
50
49
|
{
|
|
51
50
|
nodeQuery: statementNodeQuery,
|
|
52
51
|
verify: (statementNode, localContext, verifyAhead) => {
|
|
53
|
-
|
|
54
|
-
|
|
52
|
+
let statementVerified;
|
|
53
|
+
|
|
54
|
+
const derived = false,
|
|
55
|
+
assignments = [];
|
|
56
|
+
|
|
57
|
+
statementVerified = verifyStatement(statementNode, assignments, derived, localContext);
|
|
58
|
+
|
|
59
|
+
if (statementVerified) {
|
|
60
|
+
const verifiedAhead = verifyAhead();
|
|
61
|
+
|
|
62
|
+
statementVerified = verifiedAhead; ///
|
|
63
|
+
}
|
|
55
64
|
|
|
56
65
|
return statementVerified;
|
|
57
66
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import Verifier from "../verifier";
|
|
4
|
+
import verifyTerm from "../verify/term";
|
|
5
|
+
import verifyType from "../verify/type";
|
|
4
6
|
import LocalContext from "../context/local";
|
|
5
7
|
|
|
6
8
|
import { nodeQuery } from "../utilities/query";
|
|
7
|
-
import { verifyStandaloneType } from "../verify/type";
|
|
8
|
-
import { verifyStandaloneTerm } from "../verify/term";
|
|
9
9
|
|
|
10
10
|
const termNodeQuery = nodeQuery("/term!"),
|
|
11
11
|
typeNodeQuery = nodeQuery("/type!");
|
|
@@ -31,9 +31,9 @@ class TermAsConstructorVerifier extends Verifier {
|
|
|
31
31
|
{
|
|
32
32
|
nodeQuery: termNodeQuery,
|
|
33
33
|
verify: (termNode, fileContext, verifyAhead) => {
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
termVerified =
|
|
34
|
+
const terms = [],
|
|
35
|
+
localContext = LocalContext.fromFileContext(fileContext),
|
|
36
|
+
termVerified = verifyTerm(termNode, terms, localContext, verifyAhead);
|
|
37
37
|
|
|
38
38
|
return termVerified;
|
|
39
39
|
}
|
|
@@ -42,8 +42,7 @@ class TermAsConstructorVerifier extends Verifier {
|
|
|
42
42
|
nodeQuery: typeNodeQuery,
|
|
43
43
|
verify: (typeNode, fileContext, verifyAhead) => {
|
|
44
44
|
const localContext = LocalContext.fromFileContext(fileContext),
|
|
45
|
-
|
|
46
|
-
typeVerified = standaloneTypeVerified; ///
|
|
45
|
+
typeVerified = verifyType(typeNode, localContext, verifyAhead);
|
|
47
46
|
|
|
48
47
|
return typeVerified;
|
|
49
48
|
}
|