occam-verify-cli 1.0.427 → 1.0.428
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/element/equivalence.js +12 -16
- package/lib/element/equivalences.js +1 -1
- package/lib/node/equivalence.js +116 -0
- package/lib/nonTerminalNodeMap.js +4 -3
- package/lib/process/instantiate.js +8 -2
- package/lib/ruleNames.js +5 -1
- package/lib/utilities/element.js +19 -6
- package/lib/utilities/string.js +17 -36
- package/package.json +6 -6
- package/src/element/equivalence.js +21 -21
- package/src/element/equivalences.js +0 -1
- package/src/node/equivalence.js +16 -0
- package/src/nonTerminalNodeMap.js +4 -1
- package/src/process/instantiate.js +4 -0
- package/src/ruleNames.js +1 -0
- package/src/utilities/element.js +28 -9
- package/src/utilities/string.js +27 -65
package/lib/utilities/string.js
CHANGED
|
@@ -12,6 +12,9 @@ _export(exports, {
|
|
|
12
12
|
get axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction () {
|
|
13
13
|
return axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction;
|
|
14
14
|
},
|
|
15
|
+
get equivalenceStringFromTerms () {
|
|
16
|
+
return equivalenceStringFromTerms;
|
|
17
|
+
},
|
|
15
18
|
get labelsStringFromLabels () {
|
|
16
19
|
return labelsStringFromLabels;
|
|
17
20
|
},
|
|
@@ -51,14 +54,6 @@ function labelsStringFromLabels(labels) {
|
|
|
51
54
|
}, null);
|
|
52
55
|
return labelsString;
|
|
53
56
|
}
|
|
54
|
-
function signatureStringFromTerms(terms) {
|
|
55
|
-
var termsString = termsStringFromTerms(terms), signatureString = "[".concat(termsString, "]");
|
|
56
|
-
return signatureString;
|
|
57
|
-
}
|
|
58
|
-
function subproofStringFromSubproof(subproof) {
|
|
59
|
-
var suppositionStatementsOrNonsenseString = suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, context), lastStatementOrNonsenseString = lastStatementOrNonsenseStringFromSubproofNode(subproofNode, context), subproofString = "[".concat(suppositionStatementsOrNonsenseString, "] ... ").concat(lastStatementOrNonsenseString);
|
|
60
|
-
return subproofString;
|
|
61
|
-
}
|
|
62
57
|
function superTypesStringFromSuperTypes(superTypes) {
|
|
63
58
|
var superTypesString = superTypes.reduce(function(superTypesString, superType) {
|
|
64
59
|
if (superType !== _type.baseType) {
|
|
@@ -72,11 +67,23 @@ function superTypesStringFromSuperTypes(superTypes) {
|
|
|
72
67
|
function suppositionsStringFromSuppositions(suppositions) {
|
|
73
68
|
var suppositionsString = suppositions.reduce(function(suppositionsString, supposition) {
|
|
74
69
|
var suppositionString = supposition.getString();
|
|
75
|
-
suppositionsString = suppositionsString
|
|
70
|
+
suppositionsString = suppositionsString === null ? suppositionString : "".concat(suppositionsString, ", ").concat(suppositionString);
|
|
76
71
|
return suppositionsString;
|
|
77
72
|
}, null);
|
|
78
73
|
return suppositionsString;
|
|
79
74
|
}
|
|
75
|
+
function signatureStringFromTerms(terms) {
|
|
76
|
+
var termsString = termsStringFromTerms(terms), signatureString = "[".concat(termsString, "]");
|
|
77
|
+
return signatureString;
|
|
78
|
+
}
|
|
79
|
+
function equivalenceStringFromTerms(terms) {
|
|
80
|
+
var termsString = termsStringFromTerms(terms), equivalenceString = termsString; ///
|
|
81
|
+
return equivalenceString;
|
|
82
|
+
}
|
|
83
|
+
function subproofStringFromSubproof(subproof) {
|
|
84
|
+
var lastStep = subproof.getLastStep(), suppositions = subproof.getSuppositions(), lastStepString = lastStep.getString(), suppositionsString = suppositionsStringFromSuppositions(suppositions), subproofString = "[".concat(suppositionsString, "] ... ").concat(lastStepString);
|
|
85
|
+
return subproofString;
|
|
86
|
+
}
|
|
80
87
|
function typeStringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {
|
|
81
88
|
var typeString;
|
|
82
89
|
typeString = typePrefixName !== null ? "".concat(typePrefixName).concat(typeName) : typeName;
|
|
@@ -96,31 +103,5 @@ function axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction(lab
|
|
|
96
103
|
}
|
|
97
104
|
return axiomLemmaTheoremConjectureString;
|
|
98
105
|
}
|
|
99
|
-
function suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode1, context1) {
|
|
100
|
-
var suppositionNodes = subproofNode1.getSuppositionNodes(), suppositionStatementsOrNonsenseString = suppositionNodes.reduce(function(suppositionStatementsOrNonsenseString, suppositionNode) {
|
|
101
|
-
var suppositionOrStepNode = suppositionNode, statementOrNonsenseString = statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context1), suppositionStatementOrNonsenseString = statementOrNonsenseString; ///
|
|
102
|
-
suppositionStatementsOrNonsenseString = suppositionStatementsOrNonsenseString !== null ? "".concat(suppositionStatementsOrNonsenseString, ", ").concat(suppositionStatementOrNonsenseString) : suppositionStatementOrNonsenseString; ///
|
|
103
|
-
return suppositionStatementsOrNonsenseString;
|
|
104
|
-
}, null);
|
|
105
|
-
return suppositionStatementsOrNonsenseString;
|
|
106
|
-
}
|
|
107
|
-
function statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context1) {
|
|
108
|
-
var statementOrNonsenseString;
|
|
109
|
-
var nonsenseNode = suppositionOrStepNode.getNonsenseNode(), statementNode = suppositionOrStepNode.getStatementNode();
|
|
110
|
-
if (false) {
|
|
111
|
-
///
|
|
112
|
-
} else if (nonsenseNode !== null) {
|
|
113
|
-
var nonsenseString = context1.nodeAsString(nonsenseNode);
|
|
114
|
-
statementOrNonsenseString = nonsenseString; ///
|
|
115
|
-
} else if (statementNode !== null) {
|
|
116
|
-
var statementString = context1.nodeAsString(statementNode);
|
|
117
|
-
statementOrNonsenseString = statementString; ///
|
|
118
|
-
}
|
|
119
|
-
return statementOrNonsenseString;
|
|
120
|
-
}
|
|
121
|
-
function lastStatementOrNonsenseStringFromSubproofNode(subproofNode1, context1) {
|
|
122
|
-
var lastStepNode = subproofNode1.getLastStepNode(), suppositionOrStepNode = lastStepNode, statementOrNonsenseString = statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context1), lastStatementOrNonsenseString = statementOrNonsenseString; ///
|
|
123
|
-
return lastStatementOrNonsenseString;
|
|
124
|
-
}
|
|
125
106
|
|
|
126
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/string.js"],"sourcesContent":["\"use strict\";\n\nimport { baseType } from \"../element/type\";\n\nexport function termsStringFromTerms(terms) {\n  const termsString = terms.reduce((termsString, term) => {\n    const termString = term.getString();\n\n    termsString = (termsString !== null) ?\n                   `${termsString}, ${termString}` :\n                      termString;\n\n    return termsString;\n  }, null);\n\n  return termsString;\n}\n\nexport function labelsStringFromLabels(labels) {\n  const labelsString = labels.reduce((labelsString, label) => {\n    const labelString = label.getString();\n\n    labelsString = (labelsString === null) ?\n                     labelString: ///\n                      `${labelsString}, ${labelString}`;\n\n    return labelsString;\n  }, null);\n\n  return labelsString;\n}\n\nexport function signatureStringFromTerms(terms) {\n  const termsString = termsStringFromTerms(terms),\n        signatureString = `[${termsString}]`;\n\n  return signatureString;\n}\n\nexport function subproofStringFromSubproof(subproof) {\n  const suppositionStatementsOrNonsenseString = suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, context),\n        lastStatementOrNonsenseString = lastStatementOrNonsenseStringFromSubproofNode(subproofNode, context),\n        subproofString = `[${suppositionStatementsOrNonsenseString}] ... ${lastStatementOrNonsenseString}`;\n\n  return subproofString;\n}\n\nexport function superTypesStringFromSuperTypes(superTypes) {\n  const superTypesString = superTypes.reduce((superTypesString, superType) => {\n    if (superType !== baseType) {\n      const superTypeString = superType.getString();\n\n      superTypesString = (superTypesString === null) ?\n                           `'${superTypeString}'` :\n                             `${superTypesString}, '${superTypeString}'`;\n    }\n\n    return superTypesString;\n  }, null);\n\n  return superTypesString;\n}\n\nexport function suppositionsStringFromSuppositions(suppositions) {\n  const suppositionsString = suppositions.reduce((suppositionsString, supposition) => {\n    const suppositionString = supposition.getString();\n\n    suppositionsString = (suppositionsString !== null) ?\n                          `${suppositionsString}, ${suppositionString}` :\n                            suppositionString;  ///\n\n    return suppositionsString;\n  }, null);\n\n  return suppositionsString;\n}\n\nexport function typeStringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {\n  let typeString;\n\n  typeString = (typePrefixName !== null) ?\n                 `${typePrefixName}${typeName}`:\n                   typeName;\n\n  const superTypesString = superTypesStringFromSuperTypes(superTypes);\n\n  if (superTypesString !== null) {\n    typeString = `${typeString}:${superTypesString}`;\n  }\n\n  return typeString;\n}\n\nexport function axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction) {\n  let axiomLemmaTheoremConjectureString;\n\n  const suppositionsString = suppositionsStringFromSuppositions(suppositions),\n        deductionString = deduction.getString(),\n        labelsString = labelsStringFromLabels(labels);\n\n  if (labelsString !== null) {\n    axiomLemmaTheoremConjectureString = (suppositionsString !== null) ?\n                                          `${labelsString} :: [${suppositionsString}] ... ${deductionString}` :\n                                            `${labelsString} :: ${deductionString}`;\n  } else {\n    axiomLemmaTheoremConjectureString = (suppositionsString !== null) ?\n                                         `[${suppositionsString}] ... ${deductionString}` :\n                                            deductionString;\n  }\n\n  return axiomLemmaTheoremConjectureString;\n}\n\nfunction suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, context) {\n  const suppositionNodes = subproofNode.getSuppositionNodes(),\n        suppositionStatementsOrNonsenseString = suppositionNodes.reduce((suppositionStatementsOrNonsenseString, suppositionNode) => {\n          const suppositionOrStepNode = suppositionNode,  ///\n                statementOrNonsenseString = statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context),\n                suppositionStatementOrNonsenseString = statementOrNonsenseString; ///\n\n          suppositionStatementsOrNonsenseString = (suppositionStatementsOrNonsenseString !== null) ?\n                                                    `${suppositionStatementsOrNonsenseString}, ${suppositionStatementOrNonsenseString}` :\n                                                      suppositionStatementOrNonsenseString; ///\n\n          return suppositionStatementsOrNonsenseString;\n        }, null);\n\n  return suppositionStatementsOrNonsenseString;\n}\n\nfunction statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context) {\n  let statementOrNonsenseString;\n\n  const nonsenseNode = suppositionOrStepNode.getNonsenseNode(),\n        statementNode = suppositionOrStepNode.getStatementNode();\n\n  if (false) {\n    ///\n  } else if (nonsenseNode !== null) {\n    const nonsenseString = context.nodeAsString(nonsenseNode);\n\n    statementOrNonsenseString = nonsenseString; ///\n  } else if (statementNode !== null) {\n    const statementString = context.nodeAsString(statementNode);\n\n    statementOrNonsenseString = statementString;  ///\n  }\n\n  return statementOrNonsenseString;\n}\n\nfunction lastStatementOrNonsenseStringFromSubproofNode(subproofNode, context) {\n  const lastStepNode = subproofNode.getLastStepNode(),\n        suppositionOrStepNode = lastStepNode, ///\n        statementOrNonsenseString = statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context),\n        lastStatementOrNonsenseString = statementOrNonsenseString; ///\n\n  return lastStatementOrNonsenseString;\n}\n"],"names":["axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction","labelsStringFromLabels","signatureStringFromTerms","subproofStringFromSubproof","superTypesStringFromSuperTypes","suppositionsStringFromSuppositions","termsStringFromTerms","typeStringFromTypeNameTypePrefixNameAndSuperTypes","terms","termsString","reduce","term","termString","getString","labels","labelsString","label","labelString","signatureString","subproof","suppositionStatementsOrNonsenseString","suppositionStatementOrNonsenseStringFromSubproofNode","subproofNode","context","lastStatementOrNonsenseString","lastStatementOrNonsenseStringFromSubproofNode","subproofString","superTypes","superTypesString","superType","baseType","superTypeString","suppositions","suppositionsString","supposition","suppositionString","typeName","typePrefixName","typeString","deduction","axiomLemmaTheoremConjectureString","deductionString","suppositionNodes","getSuppositionNodes","suppositionNode","suppositionOrStepNode","statementOrNonsenseString","statementOrNonsenseStringFromSuppositionOrStepNode","suppositionStatementOrNonsenseString","nonsenseNode","getNonsenseNode","statementNode","getStatementNode","nonsenseString","nodeAsString","statementString","lastStepNode","getLastStepNode"],"mappings":"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"}
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/string.js"],"sourcesContent":["\"use strict\";\n\nimport { baseType } from \"../element/type\";\n\nexport function termsStringFromTerms(terms) {\n  const termsString = terms.reduce((termsString, term) => {\n    const termString = term.getString();\n\n    termsString = (termsString !== null) ?\n                   `${termsString}, ${termString}` :\n                      termString;\n\n    return termsString;\n  }, null);\n\n  return termsString;\n}\n\nexport function labelsStringFromLabels(labels) {\n  const labelsString = labels.reduce((labelsString, label) => {\n    const labelString = label.getString();\n\n    labelsString = (labelsString === null) ?\n                     labelString: ///\n                      `${labelsString}, ${labelString}`;\n\n    return labelsString;\n  }, null);\n\n  return labelsString;\n}\n\nexport function superTypesStringFromSuperTypes(superTypes) {\n  const superTypesString = superTypes.reduce((superTypesString, superType) => {\n    if (superType !== baseType) {\n      const superTypeString = superType.getString();\n\n      superTypesString = (superTypesString === null) ?\n                           `'${superTypeString}'` :\n                             `${superTypesString}, '${superTypeString}'`;\n    }\n\n    return superTypesString;\n  }, null);\n\n  return superTypesString;\n}\n\nexport function suppositionsStringFromSuppositions(suppositions) {\n  const suppositionsString = suppositions.reduce((suppositionsString, supposition) => {\n    const suppositionString = supposition.getString();\n\n    suppositionsString = (suppositionsString === null) ?\n                           suppositionString: ///\n                            `${suppositionsString}, ${suppositionString}`;\n\n    return suppositionsString;\n  }, null);\n\n  return suppositionsString;\n}\n\nexport function signatureStringFromTerms(terms) {\n  const termsString = termsStringFromTerms(terms),\n        signatureString = `[${termsString}]`;\n\n  return signatureString;\n}\n\nexport function equivalenceStringFromTerms(terms) {\n  const termsString = termsStringFromTerms(terms),\n        equivalenceString = termsString;  ///\n\n  return equivalenceString;\n}\n\nexport function subproofStringFromSubproof(subproof) {\n  const lastStep = subproof.getLastStep(),\n        suppositions = subproof.getSuppositions(),\n        lastStepString = lastStep.getString(),\n        suppositionsString = suppositionsStringFromSuppositions(suppositions),\n        subproofString = `[${suppositionsString}] ... ${lastStepString}`;\n\n  return subproofString;\n}\n\nexport function typeStringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {\n  let typeString;\n\n  typeString = (typePrefixName !== null) ?\n                 `${typePrefixName}${typeName}`:\n                   typeName;\n\n  const superTypesString = superTypesStringFromSuperTypes(superTypes);\n\n  if (superTypesString !== null) {\n    typeString = `${typeString}:${superTypesString}`;\n  }\n\n  return typeString;\n}\n\nexport function axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction) {\n  let axiomLemmaTheoremConjectureString;\n\n  const suppositionsString = suppositionsStringFromSuppositions(suppositions),\n        deductionString = deduction.getString(),\n        labelsString = labelsStringFromLabels(labels);\n\n  if (labelsString !== null) {\n    axiomLemmaTheoremConjectureString = (suppositionsString !== null) ?\n                                          `${labelsString} :: [${suppositionsString}] ... ${deductionString}` :\n                                            `${labelsString} :: ${deductionString}`;\n  } else {\n    axiomLemmaTheoremConjectureString = (suppositionsString !== null) ?\n                                         `[${suppositionsString}] ... ${deductionString}` :\n                                            deductionString;\n  }\n\n  return axiomLemmaTheoremConjectureString;\n}\n"],"names":["axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction","equivalenceStringFromTerms","labelsStringFromLabels","signatureStringFromTerms","subproofStringFromSubproof","superTypesStringFromSuperTypes","suppositionsStringFromSuppositions","termsStringFromTerms","typeStringFromTypeNameTypePrefixNameAndSuperTypes","terms","termsString","reduce","term","termString","getString","labels","labelsString","label","labelString","superTypes","superTypesString","superType","baseType","superTypeString","suppositions","suppositionsString","supposition","suppositionString","signatureString","equivalenceString","subproof","lastStep","getLastStep","getSuppositions","lastStepString","subproofString","typeName","typePrefixName","typeString","deduction","axiomLemmaTheoremConjectureString","deductionString"],"mappings":"AAAA;;;;;;;;;;;QAsGgBA;eAAAA;;QAjCAC;eAAAA;;QAnDAC;eAAAA;;QA4CAC;eAAAA;;QAcAC;eAAAA;;QA5CAC;eAAAA;;QAgBAC;eAAAA;;QA5CAC;eAAAA;;QAkFAC;eAAAA;;;oBApFS;AAElB,SAASD,qBAAqBE,KAAK;IACxC,IAAMC,cAAcD,MAAME,MAAM,CAAC,SAACD,aAAaE;QAC7C,IAAMC,aAAaD,KAAKE,SAAS;QAEjCJ,cAAc,AAACA,gBAAgB,OAChB,AAAC,GAAkBG,OAAhBH,aAAY,MAAe,OAAXG,cAChBA;QAElB,OAAOH;IACT,GAAG;IAEH,OAAOA;AACT;AAEO,SAASR,uBAAuBa,MAAM;IAC3C,IAAMC,eAAeD,OAAOJ,MAAM,CAAC,SAACK,cAAcC;QAChD,IAAMC,cAAcD,MAAMH,SAAS;QAEnCE,eAAe,AAACA,iBAAiB,OAChBE,cACC,AAAC,GAAmBA,OAAjBF,cAAa,MAAgB,OAAZE;QAEtC,OAAOF;IACT,GAAG;IAEH,OAAOA;AACT;AAEO,SAASX,+BAA+Bc,UAAU;IACvD,IAAMC,mBAAmBD,WAAWR,MAAM,CAAC,SAACS,kBAAkBC;QAC5D,IAAIA,cAAcC,cAAQ,EAAE;YAC1B,IAAMC,kBAAkBF,UAAUP,SAAS;YAE3CM,mBAAmB,AAACA,qBAAqB,OACpB,AAAC,IAAmB,OAAhBG,iBAAgB,OAClB,AAAC,GAAwBA,OAAtBH,kBAAiB,OAAqB,OAAhBG,iBAAgB;QAClE;QAEA,OAAOH;IACT,GAAG;IAEH,OAAOA;AACT;AAEO,SAASd,mCAAmCkB,YAAY;IAC7D,IAAMC,qBAAqBD,aAAab,MAAM,CAAC,SAACc,oBAAoBC;QAClE,IAAMC,oBAAoBD,YAAYZ,SAAS;QAE/CW,qBAAqB,AAACA,uBAAuB,OACtBE,oBACC,AAAC,GAAyBA,OAAvBF,oBAAmB,MAAsB,OAAlBE;QAElD,OAAOF;IACT,GAAG;IAEH,OAAOA;AACT;AAEO,SAAStB,yBAAyBM,KAAK;IAC5C,IAAMC,cAAcH,qBAAqBE,QACnCmB,kBAAkB,AAAC,IAAe,OAAZlB,aAAY;IAExC,OAAOkB;AACT;AAEO,SAAS3B,2BAA2BQ,KAAK;IAC9C,IAAMC,cAAcH,qBAAqBE,QACnCoB,oBAAoBnB,aAAc,GAAG;IAE3C,OAAOmB;AACT;AAEO,SAASzB,2BAA2B0B,QAAQ;IACjD,IAAMC,WAAWD,SAASE,WAAW,IAC/BR,eAAeM,SAASG,eAAe,IACvCC,iBAAiBH,SAASjB,SAAS,IACnCW,qBAAqBnB,mCAAmCkB,eACxDW,iBAAiB,AAAC,IAA8BD,OAA3BT,oBAAmB,UAAuB,OAAfS;IAEtD,OAAOC;AACT;AAEO,SAAS3B,kDAAkD4B,QAAQ,EAAEC,cAAc,EAAElB,UAAU;IACpG,IAAImB;IAEJA,aAAa,AAACD,mBAAmB,OAClB,AAAC,GAAmBD,OAAjBC,gBAA0B,OAATD,YAClBA;IAEjB,IAAMhB,mBAAmBf,+BAA+Bc;IAExD,IAAIC,qBAAqB,MAAM;QAC7BkB,aAAa,AAAC,GAAgBlB,OAAdkB,YAAW,KAAoB,OAAjBlB;IAChC;IAEA,OAAOkB;AACT;AAEO,SAAStC,oEAAoEe,MAAM,EAAES,YAAY,EAAEe,SAAS;IACjH,IAAIC;IAEJ,IAAMf,qBAAqBnB,mCAAmCkB,eACxDiB,kBAAkBF,UAAUzB,SAAS,IACrCE,eAAed,uBAAuBa;IAE5C,IAAIC,iBAAiB,MAAM;QACzBwB,oCAAoC,AAACf,uBAAuB,OACtB,AAAC,GAAsBA,OAApBT,cAAa,SAAkCyB,OAA3BhB,oBAAmB,UAAwB,OAAhBgB,mBAChD,AAAC,GAAqBA,OAAnBzB,cAAa,QAAsB,OAAhByB;IAChE,OAAO;QACLD,oCAAoC,AAACf,uBAAuB,OACvB,AAAC,IAA8BgB,OAA3BhB,oBAAmB,UAAwB,OAAhBgB,mBAC5BA;IAC1C;IAEA,OAAOD;AACT"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.428",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,11 +12,11 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.36",
|
|
14
14
|
"necessary": "^17.0.7",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
16
|
-
"occam-entities": "^1.0.
|
|
17
|
-
"occam-file-system": "^6.0.
|
|
18
|
-
"occam-furtle": "^2.0.
|
|
19
|
-
"occam-grammars": "^1.3.
|
|
15
|
+
"occam-custom-grammars": "^5.0.1335",
|
|
16
|
+
"occam-entities": "^1.0.440",
|
|
17
|
+
"occam-file-system": "^6.0.455",
|
|
18
|
+
"occam-furtle": "^2.0.274",
|
|
19
|
+
"occam-grammars": "^1.3.429",
|
|
20
20
|
"occam-lexers": "^23.1.32",
|
|
21
21
|
"occam-parsers": "^23.1.35",
|
|
22
22
|
"occam-query": "^4.1.140"
|
|
@@ -3,12 +3,15 @@
|
|
|
3
3
|
import { arrayUtilities } from "necessary";
|
|
4
4
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
|
+
import { termsStringFromTerms } from "../utilities/string";
|
|
7
|
+
import { instantiateEquivalence } from "../process/instantiate";
|
|
6
8
|
import { stripBracketsFromTermNode } from "../utilities/brackets";
|
|
9
|
+
import { equalivanceFromEquivalenceNode } from "../utilities/element";
|
|
7
10
|
|
|
8
11
|
const { compress } = arrayUtilities;
|
|
9
12
|
|
|
10
13
|
export default define(class Equivalence {
|
|
11
|
-
constructor(context, string, node,terms) {
|
|
14
|
+
constructor(context, string, node, terms) {
|
|
12
15
|
this.context = context;
|
|
13
16
|
this.string = string;
|
|
14
17
|
this.node = node;
|
|
@@ -50,6 +53,17 @@ export default define(class Equivalence {
|
|
|
50
53
|
if (!termPresent) {
|
|
51
54
|
this.terms.push(term);
|
|
52
55
|
|
|
56
|
+
const termsString = termsStringFromTerms(this.terms),
|
|
57
|
+
string = termsString, ///
|
|
58
|
+
equalivanceNode = instantiateEquivalence(string, context),
|
|
59
|
+
equalivance = equalivanceFromEquivalenceNode(equalivanceNode, context);
|
|
60
|
+
|
|
61
|
+
this.node = equalivance.getNode();
|
|
62
|
+
|
|
63
|
+
this.string = equalivance.getString();
|
|
64
|
+
|
|
65
|
+
const equivalenceString = this.string; ///
|
|
66
|
+
|
|
53
67
|
context.debug(`...added the '${termString}' term to the '${equivalenceString}' equivalence.`);
|
|
54
68
|
}
|
|
55
69
|
}
|
|
@@ -258,27 +272,13 @@ export default define(class Equivalence {
|
|
|
258
272
|
return implicitlyGroundedTerms;
|
|
259
273
|
}
|
|
260
274
|
|
|
261
|
-
|
|
262
|
-
const type = this.getType(),
|
|
263
|
-
typeString = type.getString(),
|
|
264
|
-
termsString = this.terms.reduce((termsString, term) => {
|
|
265
|
-
const termString = term.getString();
|
|
266
|
-
|
|
267
|
-
termsString = (termsString === null) ?
|
|
268
|
-
termString :
|
|
269
|
-
`${termsString} = ${termString}`;
|
|
270
|
-
|
|
271
|
-
return termsString;
|
|
272
|
-
}, null),
|
|
273
|
-
string = `${termsString}:${typeString}`;
|
|
274
|
-
|
|
275
|
-
return string;
|
|
276
|
-
}
|
|
277
|
-
|
|
278
|
-
static fromEquality(equality) {
|
|
275
|
+
static fromEquality(equality, context) {
|
|
279
276
|
const terms = equality.getTerms(),
|
|
280
|
-
|
|
277
|
+
termsString = termsStringFromTerms(terms),
|
|
278
|
+
string = termsString, ///
|
|
279
|
+
equalivanceNode = instantiateEquivalence(string, context),
|
|
280
|
+
equalivance = equalivanceFromEquivalenceNode(equalivanceNode, context);
|
|
281
281
|
|
|
282
|
-
return
|
|
282
|
+
return equalivance;
|
|
283
283
|
}
|
|
284
284
|
});
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import NonTerminalNode from "../nonTerminalNode";
|
|
4
|
+
|
|
5
|
+
import { TERM_RULE_NAME } from "../ruleNames";
|
|
6
|
+
|
|
7
|
+
export default class EquivalenceNode extends NonTerminalNode {
|
|
8
|
+
getTermNodes() {
|
|
9
|
+
const ruleName = TERM_RULE_NAME,
|
|
10
|
+
termNodes = this.getNodesByRuleName(ruleName);
|
|
11
|
+
|
|
12
|
+
return termNodes;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(EquivalenceNode, ruleName, childNodes, opacity, precedence); }
|
|
16
|
+
}
|
|
@@ -44,10 +44,11 @@ import RuleHeaderNode from "./node/header/rule";
|
|
|
44
44
|
import SuppositionNode from "./node/supposition";
|
|
45
45
|
import PlaceholderNode from "./node/placeholder";
|
|
46
46
|
import ConstructorNode from "./node/constructor";
|
|
47
|
-
import MetatheoremNode from "./node/metatheorem";
|
|
48
47
|
import TheoremBodyNode from "./node/body/theorem";
|
|
49
48
|
import AxiomHeaderNode from "./node/header/axiom";
|
|
50
49
|
import LemmaHeaderNode from "./node/header/lemma";
|
|
50
|
+
import MetatheoremNode from "./node/metatheorem";
|
|
51
|
+
import EquivalenceNode from "./node/equivalence";
|
|
51
52
|
import MetaArgumentNode from "./node/metaArgument";
|
|
52
53
|
import MetavariableNode from "./node/metavariable";
|
|
53
54
|
import QualificationNode from "./node/qualification";
|
|
@@ -128,6 +129,7 @@ import {
|
|
|
128
129
|
RULE_HEADER_RULE_NAME,
|
|
129
130
|
CONSTRUCTOR_RULE_NAME,
|
|
130
131
|
METATHEOREM_RULE_NAME,
|
|
132
|
+
EQUIVALENCE_RULE_NAME,
|
|
131
133
|
AXIOM_HEADER_RULE_NAME,
|
|
132
134
|
LEMMA_HEADER_RULE_NAME,
|
|
133
135
|
THEOREM_BODY_RULE_NAME,
|
|
@@ -211,6 +213,7 @@ const NonTerminalNodeMap = {
|
|
|
211
213
|
[SUPPOSITION_RULE_NAME]: SuppositionNode,
|
|
212
214
|
[CONSTRUCTOR_RULE_NAME]: ConstructorNode,
|
|
213
215
|
[METATHEOREM_RULE_NAME]: MetatheoremNode,
|
|
216
|
+
[EQUIVALENCE_RULE_NAME]: EquivalenceNode,
|
|
214
217
|
[AXIOM_HEADER_RULE_NAME]: AxiomHeaderNode,
|
|
215
218
|
[LEMMA_HEADER_RULE_NAME]: LemmaHeaderNode,
|
|
216
219
|
[THEOREM_BODY_RULE_NAME]: TheoremBodyNode,
|
|
@@ -9,6 +9,7 @@ import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
|
|
|
9
9
|
const termPlaceholderBNF = ` _ ::= term... <END_OF_LINE> ; `,
|
|
10
10
|
variablePlaceholderBNF = ` _ ::= variable... <END_OF_LINE> ; `,
|
|
11
11
|
statementPlaceholderBNF = ` _ ::= statement... <END_OF_LINE> ; `,
|
|
12
|
+
equivalencePlaceholderBNF = ` _ ::= equivalence... <END_OF_LINE> ; `,
|
|
12
13
|
metavariablePlaceholderBNF = ` _ ::= metavariable... <END_OF_LINE> ; `,
|
|
13
14
|
termSubstitutionPlaceholderBNF = ` _ ::= termSubstitution... <END_OF_LINE> ; `,
|
|
14
15
|
frameSubstitutionPlaceholderBNF = ` _ ::= frameSubstitution... <END_OF_LINE> ; `,
|
|
@@ -17,6 +18,7 @@ const termPlaceholderBNF = ` _ ::= term... <END_OF_LINE> ; `,
|
|
|
17
18
|
termPlaceholderRule = ruleFromBNF(termPlaceholderBNF),
|
|
18
19
|
variablePlaceholderRule = ruleFromBNF(variablePlaceholderBNF),
|
|
19
20
|
statementPlaceholderRule = ruleFromBNF(statementPlaceholderBNF),
|
|
21
|
+
equivalencePlaceholderRule = ruleFromBNF(equivalencePlaceholderBNF),
|
|
20
22
|
metavariablePlaceholderRule = ruleFromBNF(metavariablePlaceholderBNF),
|
|
21
23
|
termSubstitutionPlaceholderRule = ruleFromBNF(termSubstitutionPlaceholderBNF),
|
|
22
24
|
frameSubstitutionPlaceholderRule = ruleFromBNF(frameSubstitutionPlaceholderBNF),
|
|
@@ -35,6 +37,8 @@ export function instantiateVariable(string, context) { return instantiate(variab
|
|
|
35
37
|
|
|
36
38
|
export function instantiateStatement(string, context) { return instantiate(statementPlaceholderRule, string, context); }
|
|
37
39
|
|
|
40
|
+
export function instantiateEquivalence(string, context) { return instantiate(equivalencePlaceholderRule, string, context); }
|
|
41
|
+
|
|
38
42
|
export function instantiateMetavariable(string, context) { return instantiate(metavariablePlaceholderRule, string, context); }
|
|
39
43
|
|
|
40
44
|
export function instantiateTermSubstitution(string, context) { return instantiate(termSubstitutionPlaceholderRule, string, context); }
|
package/src/ruleNames.js
CHANGED
|
@@ -45,6 +45,7 @@ export const TYPE_PREFIX_RULE_NAME = "typePrefix";
|
|
|
45
45
|
export const SUPPOSITION_RULE_NAME = "supposition";
|
|
46
46
|
export const CONSTRUCTOR_RULE_NAME = "constructor";
|
|
47
47
|
export const METATHEOREM_RULE_NAME = "metatheorem";
|
|
48
|
+
export const EQUIVALENCE_RULE_NAME = "equivalence";
|
|
48
49
|
export const AXIOM_HEADER_RULE_NAME = "axiomHeader";
|
|
49
50
|
export const LEMMA_HEADER_RULE_NAME = "lemmaHeader";
|
|
50
51
|
export const THEOREM_BODY_RULE_NAME = "theoremBody";
|
package/src/utilities/element.js
CHANGED
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
import elements from "../elements";
|
|
4
4
|
|
|
5
5
|
import { baseType } from "../element/type";
|
|
6
|
-
import {
|
|
7
|
-
|
|
6
|
+
import { equivalenceStringFromTerms,
|
|
7
|
+
subproofStringFromSubproofNode,
|
|
8
|
+
stringFromLabelsSuppositionsAndDeduction } from "../utilities/string";
|
|
8
9
|
|
|
9
10
|
export function typeFromTypeNode(typeNode, context) {
|
|
10
11
|
let type;
|
|
@@ -294,6 +295,17 @@ export function typePrefixFromTypePrefixNode(typePrefixNode, context) {
|
|
|
294
295
|
return typePrefix;
|
|
295
296
|
}
|
|
296
297
|
|
|
298
|
+
export function equivalenceFromEquivalenceNode(equivalenceNode, context) {
|
|
299
|
+
const { Equivalence } = elements,
|
|
300
|
+
node = equivalenceNode, ///
|
|
301
|
+
terms = termsFromEquivalenceNode(equivalenceNode, context),
|
|
302
|
+
equivalenceString = equivalenceStringFromTerms(terms),
|
|
303
|
+
string = equivalenceString, ///
|
|
304
|
+
equivalence = new Equivalence(context, string, node, terms);
|
|
305
|
+
|
|
306
|
+
return equivalence;
|
|
307
|
+
}
|
|
308
|
+
|
|
297
309
|
export function metavariableFromMetavariableNode(metavariableNode, context) {
|
|
298
310
|
const { Metavariable } = elements,
|
|
299
311
|
node = metavariableNode, ///
|
|
@@ -1227,13 +1239,6 @@ export function signatureFromAxiomLemmaTheoremConjectureNode(axiomLemmaTheoremCo
|
|
|
1227
1239
|
return signature;
|
|
1228
1240
|
}
|
|
1229
1241
|
|
|
1230
|
-
export function suppositionsFromAxiomLemmaTheoremConjectureNode(axiomLemmaTheoremConjectureNode, context) {
|
|
1231
|
-
const suppositionNodes = axiomLemmaTheoremConjectureNode.getSuppositionNodes(),
|
|
1232
|
-
suppositions = suppositionsFromSuppositionNodes(suppositionNodes, context);
|
|
1233
|
-
|
|
1234
|
-
return suppositions;
|
|
1235
|
-
}
|
|
1236
|
-
|
|
1237
1242
|
export function termsFromTermNodes(termNodes, context) {
|
|
1238
1243
|
const terms = termNodes.map((termNode) => {
|
|
1239
1244
|
const term = termFromTermNode(termNode, context);
|
|
@@ -1327,6 +1332,13 @@ export function assumptionsFromFrameNode(frameNode, context) {
|
|
|
1327
1332
|
return assumptions;
|
|
1328
1333
|
}
|
|
1329
1334
|
|
|
1335
|
+
export function termsFromEquivalenceNode(equivalenceNode, context) {
|
|
1336
|
+
const termNodes = equivalenceNode.getTermNodes(),
|
|
1337
|
+
terms = termsFromTermNodes(termNodes, context);
|
|
1338
|
+
|
|
1339
|
+
return terms;
|
|
1340
|
+
}
|
|
1341
|
+
|
|
1330
1342
|
export function suppositionsFromSubproofNode(subproofNode, context) {
|
|
1331
1343
|
const suppositionNodes = subproofNode.getSuppositionNodes(),
|
|
1332
1344
|
suppositions = suppositionsFromSuppositionNodes(suppositionNodes, context);
|
|
@@ -1362,6 +1374,13 @@ export function labelsFromAxiomLemmaTheoremConjectureNode(axiomLemmaTheoremConje
|
|
|
1362
1374
|
return labels;
|
|
1363
1375
|
}
|
|
1364
1376
|
|
|
1377
|
+
export function suppositionsFromAxiomLemmaTheoremConjectureNode(axiomLemmaTheoremConjectureNode, context) {
|
|
1378
|
+
const suppositionNodes = axiomLemmaTheoremConjectureNode.getSuppositionNodes(),
|
|
1379
|
+
suppositions = suppositionsFromSuppositionNodes(suppositionNodes, context);
|
|
1380
|
+
|
|
1381
|
+
return suppositions;
|
|
1382
|
+
}
|
|
1383
|
+
|
|
1365
1384
|
|
|
1366
1385
|
|
|
1367
1386
|
|
package/src/utilities/string.js
CHANGED
|
@@ -30,21 +30,6 @@ export function labelsStringFromLabels(labels) {
|
|
|
30
30
|
return labelsString;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
export function signatureStringFromTerms(terms) {
|
|
34
|
-
const termsString = termsStringFromTerms(terms),
|
|
35
|
-
signatureString = `[${termsString}]`;
|
|
36
|
-
|
|
37
|
-
return signatureString;
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
export function subproofStringFromSubproof(subproof) {
|
|
41
|
-
const suppositionStatementsOrNonsenseString = suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, context),
|
|
42
|
-
lastStatementOrNonsenseString = lastStatementOrNonsenseStringFromSubproofNode(subproofNode, context),
|
|
43
|
-
subproofString = `[${suppositionStatementsOrNonsenseString}] ... ${lastStatementOrNonsenseString}`;
|
|
44
|
-
|
|
45
|
-
return subproofString;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
33
|
export function superTypesStringFromSuperTypes(superTypes) {
|
|
49
34
|
const superTypesString = superTypes.reduce((superTypesString, superType) => {
|
|
50
35
|
if (superType !== baseType) {
|
|
@@ -65,9 +50,9 @@ export function suppositionsStringFromSuppositions(suppositions) {
|
|
|
65
50
|
const suppositionsString = suppositions.reduce((suppositionsString, supposition) => {
|
|
66
51
|
const suppositionString = supposition.getString();
|
|
67
52
|
|
|
68
|
-
suppositionsString = (suppositionsString
|
|
69
|
-
|
|
70
|
-
suppositionString
|
|
53
|
+
suppositionsString = (suppositionsString === null) ?
|
|
54
|
+
suppositionString: ///
|
|
55
|
+
`${suppositionsString}, ${suppositionString}`;
|
|
71
56
|
|
|
72
57
|
return suppositionsString;
|
|
73
58
|
}, null);
|
|
@@ -75,6 +60,30 @@ export function suppositionsStringFromSuppositions(suppositions) {
|
|
|
75
60
|
return suppositionsString;
|
|
76
61
|
}
|
|
77
62
|
|
|
63
|
+
export function signatureStringFromTerms(terms) {
|
|
64
|
+
const termsString = termsStringFromTerms(terms),
|
|
65
|
+
signatureString = `[${termsString}]`;
|
|
66
|
+
|
|
67
|
+
return signatureString;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
export function equivalenceStringFromTerms(terms) {
|
|
71
|
+
const termsString = termsStringFromTerms(terms),
|
|
72
|
+
equivalenceString = termsString; ///
|
|
73
|
+
|
|
74
|
+
return equivalenceString;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export function subproofStringFromSubproof(subproof) {
|
|
78
|
+
const lastStep = subproof.getLastStep(),
|
|
79
|
+
suppositions = subproof.getSuppositions(),
|
|
80
|
+
lastStepString = lastStep.getString(),
|
|
81
|
+
suppositionsString = suppositionsStringFromSuppositions(suppositions),
|
|
82
|
+
subproofString = `[${suppositionsString}] ... ${lastStepString}`;
|
|
83
|
+
|
|
84
|
+
return subproofString;
|
|
85
|
+
}
|
|
86
|
+
|
|
78
87
|
export function typeStringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {
|
|
79
88
|
let typeString;
|
|
80
89
|
|
|
@@ -110,50 +119,3 @@ export function axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduct
|
|
|
110
119
|
|
|
111
120
|
return axiomLemmaTheoremConjectureString;
|
|
112
121
|
}
|
|
113
|
-
|
|
114
|
-
function suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, context) {
|
|
115
|
-
const suppositionNodes = subproofNode.getSuppositionNodes(),
|
|
116
|
-
suppositionStatementsOrNonsenseString = suppositionNodes.reduce((suppositionStatementsOrNonsenseString, suppositionNode) => {
|
|
117
|
-
const suppositionOrStepNode = suppositionNode, ///
|
|
118
|
-
statementOrNonsenseString = statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context),
|
|
119
|
-
suppositionStatementOrNonsenseString = statementOrNonsenseString; ///
|
|
120
|
-
|
|
121
|
-
suppositionStatementsOrNonsenseString = (suppositionStatementsOrNonsenseString !== null) ?
|
|
122
|
-
`${suppositionStatementsOrNonsenseString}, ${suppositionStatementOrNonsenseString}` :
|
|
123
|
-
suppositionStatementOrNonsenseString; ///
|
|
124
|
-
|
|
125
|
-
return suppositionStatementsOrNonsenseString;
|
|
126
|
-
}, null);
|
|
127
|
-
|
|
128
|
-
return suppositionStatementsOrNonsenseString;
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
function statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context) {
|
|
132
|
-
let statementOrNonsenseString;
|
|
133
|
-
|
|
134
|
-
const nonsenseNode = suppositionOrStepNode.getNonsenseNode(),
|
|
135
|
-
statementNode = suppositionOrStepNode.getStatementNode();
|
|
136
|
-
|
|
137
|
-
if (false) {
|
|
138
|
-
///
|
|
139
|
-
} else if (nonsenseNode !== null) {
|
|
140
|
-
const nonsenseString = context.nodeAsString(nonsenseNode);
|
|
141
|
-
|
|
142
|
-
statementOrNonsenseString = nonsenseString; ///
|
|
143
|
-
} else if (statementNode !== null) {
|
|
144
|
-
const statementString = context.nodeAsString(statementNode);
|
|
145
|
-
|
|
146
|
-
statementOrNonsenseString = statementString; ///
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
return statementOrNonsenseString;
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
function lastStatementOrNonsenseStringFromSubproofNode(subproofNode, context) {
|
|
153
|
-
const lastStepNode = subproofNode.getLastStepNode(),
|
|
154
|
-
suppositionOrStepNode = lastStepNode, ///
|
|
155
|
-
statementOrNonsenseString = statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNode, context),
|
|
156
|
-
lastStatementOrNonsenseString = statementOrNonsenseString; ///
|
|
157
|
-
|
|
158
|
-
return lastStatementOrNonsenseString;
|
|
159
|
-
}
|