occam-verify-cli 0.0.1247 → 0.0.1248

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.
@@ -84,7 +84,7 @@ function unifyMetavariable(generalMetavariable, specificMetavariable, generalCon
84
84
  metavariableUnified = _metavariable.default.unify(generalMetavariableNode, specificMetavariableNode, generalContext, specificContext);
85
85
  return metavariableUnified;
86
86
  }
87
- function unifyLabelWithReference(label, reference, substitutions, context) {
87
+ function unifyLabelWithReference(label, reference, context) {
88
88
  var labelUnifiedWithReference;
89
89
  var generalContext, specificContext;
90
90
  var fileContext = label.getFileContext(), labelMetavariable = label.getMetavariable(), referenceMetavariable = reference.getMetavariable(), labelMetavariableNode = labelMetavariable.getNode(), labelMetavariableTokens = labelMetavariable.getTokens(), referenceMetavariableNode = referenceMetavariable.getNode(), referenceMetavariableTokens = referenceMetavariable.getTokens();
@@ -92,7 +92,7 @@ function unifyLabelWithReference(label, reference, substitutions, context) {
92
92
  specificContext = fileContext; ///
93
93
  generalContext = contextFromTokens(labelMetavariableTokens, generalContext); ///
94
94
  specificContext = contextFromTokens(referenceMetavariableTokens, specificContext); ///
95
- var referenceUnified = _reference.default.unify(labelMetavariableNode, referenceMetavariableNode, substitutions, generalContext, specificContext);
95
+ var substitutions = _substitutions.default.fromNothing(), referenceUnified = _reference.default.unify(labelMetavariableNode, referenceMetavariableNode, substitutions, generalContext, specificContext);
96
96
  labelUnifiedWithReference = referenceUnified; ///
97
97
  return labelUnifiedWithReference;
98
98
  }
@@ -137,4 +137,4 @@ function contextFromTokens(tokens, context) {
137
137
  return context;
138
138
  }
139
139
 
140
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/unification.js"],"sourcesContent":["\"use string\";\n\nimport LocalContext from \"../context/local\";\nimport Substitutions from \"../substitutions\";\nimport equalityUnifier from \"../unifier/equality\";\nimport referenceUnifier from \"../unifier/reference\";\nimport metaLevelUnifier from \"../unifier/metaLevel\";\nimport metavariableUnifier from \"../unifier/metavariable\";\nimport intrinsicLevelUnifier from \"../unifier/intrinsicLevel\";\nimport termWithConstructorUnifier from \"../unifier/termWithConstructor\";\nimport statementWithCombinatorUnifier from \"../unifier/statementWithCombinator\";\n\nexport function unifyEquality(equality, context) {\n  let equalityUnified;\n\n  const leftTerm = equality.getLeftTerm(),\n        rightTerm = equality.getRightTerm(),\n        leftTermNode = leftTerm.getNode(),\n        rightTermNode = rightTerm.getNode();\n\n  equalityUnified = equalityUnifier.unify(leftTermNode, rightTermNode, context);\n\n  return equalityUnified;\n}\n\nexport function unifyStatement(generalStatement, specificStatement, substitutions, generalContext, specificContext) {\n  let statementUnified;\n\n  const generalStatementNode = generalStatement.getNode(),\n        specificStatementNode = specificStatement.getNode(),\n        generalStatementTokens = generalStatement.getTokens(),\n        specificStatementTokens = specificStatement.getTokens();\n\n  generalContext = contextFromTokens(generalStatementTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificStatementTokens, specificContext);  ///\n\n  const generalNode = generalStatementNode, ///\n        specificNode = specificStatementNode,\n        unifiedAtMetaLevel = metaLevelUnifier.unify(generalNode, specificNode, substitutions, generalContext, specificContext);\n\n  statementUnified = unifiedAtMetaLevel; ///\n\n  return statementUnified;\n}\n\nexport function unifySubstitution(generalSubstitution, specificSubstitution, substitutions, generalContext, specificContext) {\n  let substitutionUnified;\n\n  const generalSubstitutionNode = generalSubstitution.getNode(),\n        specificSubstitutionNode = specificSubstitution.getNode(),\n        generalSubstitutionTokens = generalSubstitution.getTokens(),\n        specificSubstitutionTokens = specificSubstitution.getTokens();\n\n  generalContext = contextFromTokens(generalSubstitutionTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificSubstitutionTokens, specificContext);  ///\n\n  const generalNode = generalSubstitutionNode, ///\n        specificNode = specificSubstitutionNode,\n        unifiedAtMetaLevel = metaLevelUnifier.unify(generalNode, specificNode, substitutions, generalContext, specificContext);\n\n  substitutionUnified = unifiedAtMetaLevel; ///\n\n  return substitutionUnified;\n}\n\nexport function unifyMetavariable(generalMetavariable, specificMetavariable, generalContext, specificContext) {\n  let metavariableUnified;\n\n  const generalMetavariableNode = generalMetavariable.getNode(),\n        specificMetavariableNode = specificMetavariable.getNode(),\n        generalMetavariableTokens = generalMetavariable.getTokens(),\n        specificMetavariableTokens = specificMetavariable.getTokens();\n\n  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///\n\n  metavariableUnified = metavariableUnifier.unify(generalMetavariableNode, specificMetavariableNode, generalContext, specificContext);\n\n  return metavariableUnified;\n}\n\nexport function unifyLabelWithReference(label, reference, substitutions, context) {\n  let labelUnifiedWithReference;\n\n  let generalContext,\n      specificContext;\n\n  const fileContext = label.getFileContext(),\n        labelMetavariable = label.getMetavariable(),\n        referenceMetavariable = reference.getMetavariable(),\n        labelMetavariableNode = labelMetavariable.getNode(),\n        labelMetavariableTokens = labelMetavariable.getTokens(),\n        referenceMetavariableNode = referenceMetavariable.getNode(),\n        referenceMetavariableTokens = referenceMetavariable.getTokens();\n\n  generalContext = context; ///\n\n  specificContext = fileContext;  ///\n\n  generalContext = contextFromTokens(labelMetavariableTokens, generalContext);  ///\n\n  specificContext = contextFromTokens(referenceMetavariableTokens, specificContext);  ///\n\n  const referenceUnified = referenceUnifier.unify(labelMetavariableNode, referenceMetavariableNode, substitutions, generalContext, specificContext);\n\n  labelUnifiedWithReference = referenceUnified; ///\n\n  return labelUnifiedWithReference;\n}\n\nexport function unifyMetavariableWithReference(metavariable, reference, context) {\n  let metavariableUnifiedWithReference;\n\n  let generalContext,\n      specificContext;\n\n  const fileContext = context.getFileContext(),\n        metavariableNode = metavariable.getNode(),\n        metavariableTokens = metavariable.getTokens(),\n        referenceMetavariable = reference.getMetavariable(),\n        referenceMetavariableNode = referenceMetavariable.getNode(),\n        referenceMetavariableTokens = referenceMetavariable.getTokens();\n\n  generalContext = context; ///\n\n  specificContext = fileContext;  ///\n\n  generalContext = contextFromTokens(metavariableTokens, generalContext);  ///\n\n  specificContext = contextFromTokens(referenceMetavariableTokens, specificContext);  ///\n\n  const substitutions = Substitutions.fromNothing(),\n        referenceUnified = referenceUnifier.unify(metavariableNode, referenceMetavariableNode, substitutions, generalContext, specificContext);\n\n  metavariableUnifiedWithReference = referenceUnified; ///\n\n  return metavariableUnifiedWithReference;\n}\n\nexport function unifyTermWithConstructor(term, constructor, context) {\n  let termUnifiedWithConstructor;\n\n  const termNode = term.getNode(),\n        constructorTerm = constructor.getTerm(),\n        constructorTermNode = constructorTerm.getNode();\n\n  termUnifiedWithConstructor = termWithConstructorUnifier.unify(constructorTermNode, termNode, context);\n\n  return termUnifiedWithConstructor;\n}\n\nexport function unifyStatementWithCombinator(statement, combinator, assignments, stated, context) {\n  let statementUnifiedWithCombinator;\n\n  const statementNode = statement.getNode(),\n        statementTokens = statement.getTokens(),\n        combinatorStatement = combinator.getStatement(),\n        combinatorStatementNode = combinatorStatement.getNode(),\n        combinatorStatementTokens = combinatorStatement.getTokens();\n\n  let generalContext = context, ///\n      specificContext = context;  ///\n\n  generalContext = contextFromTokens(combinatorStatementTokens, generalContext);  ///\n\n  specificContext = contextFromTokens(statementTokens, specificContext);  ///\n\n  statementUnifiedWithCombinator = statementWithCombinatorUnifier.unify(combinatorStatementNode, statementNode, assignments, stated, generalContext, specificContext);\n\n  return statementUnifiedWithCombinator;\n}\n\nexport function unifyMetavariableIntrinsically(generalMetavariable, specificMetavariable, substitutions, generalContext, specificContext) {\n  let metavariableUnifiedIntrinsically;\n\n  const generalMetavariableNode = generalMetavariable.getNode(),\n        specificMetavariableNode = specificMetavariable.getNode(),\n        generalMetavariableTokens = generalMetavariable.getTokens(),\n        specificMetavariableTokens = specificMetavariable.getTokens();\n\n  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///\n\n  metavariableUnifiedIntrinsically = intrinsicLevelUnifier.unify(generalMetavariableNode, specificMetavariableNode, substitutions, generalContext, specificContext);\n\n  return metavariableUnifiedIntrinsically;\n}\n\nfunction contextFromTokens(tokens, context) {\n  const localContext = LocalContext.fromContextAndTokens(context, tokens);\n\n  context = localContext;  ///\n\n  return context;\n}\n"],"names":["unifyEquality","unifyLabelWithReference","unifyMetavariable","unifyMetavariableIntrinsically","unifyMetavariableWithReference","unifyStatement","unifyStatementWithCombinator","unifySubstitution","unifyTermWithConstructor","equality","context","equalityUnified","leftTerm","getLeftTerm","rightTerm","getRightTerm","leftTermNode","getNode","rightTermNode","equalityUnifier","unify","generalStatement","specificStatement","substitutions","generalContext","specificContext","statementUnified","generalStatementNode","specificStatementNode","generalStatementTokens","getTokens","specificStatementTokens","contextFromTokens","generalNode","specificNode","unifiedAtMetaLevel","metaLevelUnifier","generalSubstitution","specificSubstitution","substitutionUnified","generalSubstitutionNode","specificSubstitutionNode","generalSubstitutionTokens","specificSubstitutionTokens","generalMetavariable","specificMetavariable","metavariableUnified","generalMetavariableNode","specificMetavariableNode","generalMetavariableTokens","specificMetavariableTokens","metavariableUnifier","label","reference","labelUnifiedWithReference","fileContext","getFileContext","labelMetavariable","getMetavariable","referenceMetavariable","labelMetavariableNode","labelMetavariableTokens","referenceMetavariableNode","referenceMetavariableTokens","referenceUnified","referenceUnifier","metavariable","metavariableUnifiedWithReference","metavariableNode","metavariableTokens","Substitutions","fromNothing","term","constructor","termUnifiedWithConstructor","termNode","constructorTerm","getTerm","constructorTermNode","termWithConstructorUnifier","statement","combinator","assignments","stated","statementUnifiedWithCombinator","statementNode","statementTokens","combinatorStatement","getStatement","combinatorStatementNode","combinatorStatementTokens","statementWithCombinatorUnifier","metavariableUnifiedIntrinsically","intrinsicLevelUnifier","tokens","localContext","LocalContext","fromContextAndTokens"],"mappings":"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"}
140
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/unification.js"],"sourcesContent":["\"use string\";\n\nimport LocalContext from \"../context/local\";\nimport Substitutions from \"../substitutions\";\nimport equalityUnifier from \"../unifier/equality\";\nimport referenceUnifier from \"../unifier/reference\";\nimport metaLevelUnifier from \"../unifier/metaLevel\";\nimport metavariableUnifier from \"../unifier/metavariable\";\nimport intrinsicLevelUnifier from \"../unifier/intrinsicLevel\";\nimport termWithConstructorUnifier from \"../unifier/termWithConstructor\";\nimport statementWithCombinatorUnifier from \"../unifier/statementWithCombinator\";\n\nexport function unifyEquality(equality, context) {\n  let equalityUnified;\n\n  const leftTerm = equality.getLeftTerm(),\n        rightTerm = equality.getRightTerm(),\n        leftTermNode = leftTerm.getNode(),\n        rightTermNode = rightTerm.getNode();\n\n  equalityUnified = equalityUnifier.unify(leftTermNode, rightTermNode, context);\n\n  return equalityUnified;\n}\n\nexport function unifyStatement(generalStatement, specificStatement, substitutions, generalContext, specificContext) {\n  let statementUnified;\n\n  const generalStatementNode = generalStatement.getNode(),\n        specificStatementNode = specificStatement.getNode(),\n        generalStatementTokens = generalStatement.getTokens(),\n        specificStatementTokens = specificStatement.getTokens();\n\n  generalContext = contextFromTokens(generalStatementTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificStatementTokens, specificContext);  ///\n\n  const generalNode = generalStatementNode, ///\n        specificNode = specificStatementNode,\n        unifiedAtMetaLevel = metaLevelUnifier.unify(generalNode, specificNode, substitutions, generalContext, specificContext);\n\n  statementUnified = unifiedAtMetaLevel; ///\n\n  return statementUnified;\n}\n\nexport function unifySubstitution(generalSubstitution, specificSubstitution, substitutions, generalContext, specificContext) {\n  let substitutionUnified;\n\n  const generalSubstitutionNode = generalSubstitution.getNode(),\n        specificSubstitutionNode = specificSubstitution.getNode(),\n        generalSubstitutionTokens = generalSubstitution.getTokens(),\n        specificSubstitutionTokens = specificSubstitution.getTokens();\n\n  generalContext = contextFromTokens(generalSubstitutionTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificSubstitutionTokens, specificContext);  ///\n\n  const generalNode = generalSubstitutionNode, ///\n        specificNode = specificSubstitutionNode,\n        unifiedAtMetaLevel = metaLevelUnifier.unify(generalNode, specificNode, substitutions, generalContext, specificContext);\n\n  substitutionUnified = unifiedAtMetaLevel; ///\n\n  return substitutionUnified;\n}\n\nexport function unifyMetavariable(generalMetavariable, specificMetavariable, generalContext, specificContext) {\n  let metavariableUnified;\n\n  const generalMetavariableNode = generalMetavariable.getNode(),\n        specificMetavariableNode = specificMetavariable.getNode(),\n        generalMetavariableTokens = generalMetavariable.getTokens(),\n        specificMetavariableTokens = specificMetavariable.getTokens();\n\n  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///\n\n  metavariableUnified = metavariableUnifier.unify(generalMetavariableNode, specificMetavariableNode, generalContext, specificContext);\n\n  return metavariableUnified;\n}\n\nexport function unifyLabelWithReference(label, reference, context) {\n  let labelUnifiedWithReference;\n\n  let generalContext,\n      specificContext;\n\n  const fileContext = label.getFileContext(),\n        labelMetavariable = label.getMetavariable(),\n        referenceMetavariable = reference.getMetavariable(),\n        labelMetavariableNode = labelMetavariable.getNode(),\n        labelMetavariableTokens = labelMetavariable.getTokens(),\n        referenceMetavariableNode = referenceMetavariable.getNode(),\n        referenceMetavariableTokens = referenceMetavariable.getTokens();\n\n  generalContext = context; ///\n\n  specificContext = fileContext;  ///\n\n  generalContext = contextFromTokens(labelMetavariableTokens, generalContext);  ///\n\n  specificContext = contextFromTokens(referenceMetavariableTokens, specificContext);  ///\n\n  const substitutions = Substitutions.fromNothing(),\n        referenceUnified = referenceUnifier.unify(labelMetavariableNode, referenceMetavariableNode, substitutions, generalContext, specificContext);\n\n  labelUnifiedWithReference = referenceUnified; ///\n\n  return labelUnifiedWithReference;\n}\n\nexport function unifyMetavariableWithReference(metavariable, reference, context) {\n  let metavariableUnifiedWithReference;\n\n  let generalContext,\n      specificContext;\n\n  const fileContext = context.getFileContext(),\n        metavariableNode = metavariable.getNode(),\n        metavariableTokens = metavariable.getTokens(),\n        referenceMetavariable = reference.getMetavariable(),\n        referenceMetavariableNode = referenceMetavariable.getNode(),\n        referenceMetavariableTokens = referenceMetavariable.getTokens();\n\n  generalContext = context; ///\n\n  specificContext = fileContext;  ///\n\n  generalContext = contextFromTokens(metavariableTokens, generalContext);  ///\n\n  specificContext = contextFromTokens(referenceMetavariableTokens, specificContext);  ///\n\n  const substitutions = Substitutions.fromNothing(),\n        referenceUnified = referenceUnifier.unify(metavariableNode, referenceMetavariableNode, substitutions, generalContext, specificContext);\n\n  metavariableUnifiedWithReference = referenceUnified; ///\n\n  return metavariableUnifiedWithReference;\n}\n\nexport function unifyTermWithConstructor(term, constructor, context) {\n  let termUnifiedWithConstructor;\n\n  const termNode = term.getNode(),\n        constructorTerm = constructor.getTerm(),\n        constructorTermNode = constructorTerm.getNode();\n\n  termUnifiedWithConstructor = termWithConstructorUnifier.unify(constructorTermNode, termNode, context);\n\n  return termUnifiedWithConstructor;\n}\n\nexport function unifyStatementWithCombinator(statement, combinator, assignments, stated, context) {\n  let statementUnifiedWithCombinator;\n\n  const statementNode = statement.getNode(),\n        statementTokens = statement.getTokens(),\n        combinatorStatement = combinator.getStatement(),\n        combinatorStatementNode = combinatorStatement.getNode(),\n        combinatorStatementTokens = combinatorStatement.getTokens();\n\n  let generalContext = context, ///\n      specificContext = context;  ///\n\n  generalContext = contextFromTokens(combinatorStatementTokens, generalContext);  ///\n\n  specificContext = contextFromTokens(statementTokens, specificContext);  ///\n\n  statementUnifiedWithCombinator = statementWithCombinatorUnifier.unify(combinatorStatementNode, statementNode, assignments, stated, generalContext, specificContext);\n\n  return statementUnifiedWithCombinator;\n}\n\nexport function unifyMetavariableIntrinsically(generalMetavariable, specificMetavariable, substitutions, generalContext, specificContext) {\n  let metavariableUnifiedIntrinsically;\n\n  const generalMetavariableNode = generalMetavariable.getNode(),\n        specificMetavariableNode = specificMetavariable.getNode(),\n        generalMetavariableTokens = generalMetavariable.getTokens(),\n        specificMetavariableTokens = specificMetavariable.getTokens();\n\n  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///\n\n  metavariableUnifiedIntrinsically = intrinsicLevelUnifier.unify(generalMetavariableNode, specificMetavariableNode, substitutions, generalContext, specificContext);\n\n  return metavariableUnifiedIntrinsically;\n}\n\nfunction contextFromTokens(tokens, context) {\n  const localContext = LocalContext.fromContextAndTokens(context, tokens);\n\n  context = localContext;  ///\n\n  return context;\n}\n"],"names":["unifyEquality","unifyLabelWithReference","unifyMetavariable","unifyMetavariableIntrinsically","unifyMetavariableWithReference","unifyStatement","unifyStatementWithCombinator","unifySubstitution","unifyTermWithConstructor","equality","context","equalityUnified","leftTerm","getLeftTerm","rightTerm","getRightTerm","leftTermNode","getNode","rightTermNode","equalityUnifier","unify","generalStatement","specificStatement","substitutions","generalContext","specificContext","statementUnified","generalStatementNode","specificStatementNode","generalStatementTokens","getTokens","specificStatementTokens","contextFromTokens","generalNode","specificNode","unifiedAtMetaLevel","metaLevelUnifier","generalSubstitution","specificSubstitution","substitutionUnified","generalSubstitutionNode","specificSubstitutionNode","generalSubstitutionTokens","specificSubstitutionTokens","generalMetavariable","specificMetavariable","metavariableUnified","generalMetavariableNode","specificMetavariableNode","generalMetavariableTokens","specificMetavariableTokens","metavariableUnifier","label","reference","labelUnifiedWithReference","fileContext","getFileContext","labelMetavariable","getMetavariable","referenceMetavariable","labelMetavariableNode","labelMetavariableTokens","referenceMetavariableNode","referenceMetavariableTokens","Substitutions","fromNothing","referenceUnified","referenceUnifier","metavariable","metavariableUnifiedWithReference","metavariableNode","metavariableTokens","term","constructor","termUnifiedWithConstructor","termNode","constructorTerm","getTerm","constructorTermNode","termWithConstructorUnifier","statement","combinator","assignments","stated","statementUnifiedWithCombinator","statementNode","statementTokens","combinatorStatement","getStatement","combinatorStatementNode","combinatorStatementTokens","statementWithCombinatorUnifier","metavariableUnifiedIntrinsically","intrinsicLevelUnifier","tokens","localContext","LocalContext","fromContextAndTokens"],"mappings":"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"}
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.1247",
4
+ "version": "0.0.1248",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -12,10 +12,10 @@
12
12
  "dependencies": {
13
13
  "argumentative": "^2.0.32",
14
14
  "necessary": "^14.2.1",
15
- "occam-custom-grammars": "^5.0.1017",
16
- "occam-entities": "^1.0.260",
17
- "occam-file-system": "^6.0.284",
18
- "occam-furtle": "^2.0.24",
15
+ "occam-custom-grammars": "^5.0.1018",
16
+ "occam-entities": "^1.0.261",
17
+ "occam-file-system": "^6.0.285",
18
+ "occam-furtle": "^2.0.25",
19
19
  "occam-grammar-utilities": "^8.0.239",
20
20
  "occam-lexers": "^23.0.11",
21
21
  "occam-parsers": "^23.0.21",
@@ -3,7 +3,6 @@
3
3
  import { arrayUtilities } from "necessary";
4
4
 
5
5
  import Equivalences from "../equivalences";
6
- import Substitutions from "../substitutions";
7
6
  import topLevelVerifier from "../verifier/topLevel";
8
7
 
9
8
  import { objectType } from "../dom/type";
@@ -459,12 +458,11 @@ export default class FileContext {
459
458
  }
460
459
 
461
460
  findMetaLemmasByReference(reference) {
462
- const metaLemmas = this.getMetaLemmas(),
463
- substitutions = Substitutions.fromNothing();
461
+ const metaLemmas = this.getMetaLemmas();
464
462
 
465
463
  filter(metaLemmas, (metaLemma) => {
466
464
  const context = this, ///
467
- metaLemmaUnified = reference.unifyMetaLemma(metaLemma, substitutions, context);
465
+ metaLemmaUnified = reference.unifyMetaLemma(metaLemma, context);
468
466
 
469
467
  if (metaLemmaUnified) {
470
468
  return true;
@@ -475,12 +473,11 @@ export default class FileContext {
475
473
  }
476
474
 
477
475
  findMetatheoremsByReference(reference) {
478
- const metatheorems = this.getMetatheorems(),
479
- substitutions = Substitutions.fromNothing();
476
+ const metatheorems = this.getMetatheorems();
480
477
 
481
478
  filter(metatheorems, (metatheorem) => {
482
479
  const context = this, ///
483
- metatheoremUnified = reference.unifyMetatheorem(metatheorem, substitutions, context);
480
+ metatheoremUnified = reference.unifyMetatheorem(metatheorem, context);
484
481
 
485
482
  if (metatheoremUnified) {
486
483
  return true;
@@ -664,8 +661,7 @@ export default class FileContext {
664
661
  const labels = this.getLabels(),
665
662
  labelPresent = labels.some((label) => {
666
663
  const context = this, ///
667
- substitutions = Substitutions.fromNothing(),
668
- labelUnified = reference.unifyLabel(label, substitutions, context);
664
+ labelUnified = reference.unifyLabel(label, context);
669
665
 
670
666
  if (labelUnified) {
671
667
  return true;
@@ -27,6 +27,26 @@ export default domAssigned(class Constructor {
27
27
 
28
28
  getType() { return this.term.getType(); }
29
29
 
30
+ verifyWhenDeclared(fileContext) {
31
+ let verifiedWhenDeclared;
32
+
33
+ const constructorString = this.string; ///
34
+
35
+ fileContext.trace(`Verifying the '${constructorString}' constructor when declared...`);
36
+
37
+ const termVerifiedAtTopLevel = this.term.verifyWhenDeclared(fileContext);
38
+
39
+ if (termVerifiedAtTopLevel) {
40
+ verifiedWhenDeclared = true; ///
41
+ }
42
+
43
+ if (verifiedWhenDeclared) {
44
+ fileContext.debug(`...verified the '${constructorString}' constructor when declared.`);
45
+ }
46
+
47
+ return verifiedWhenDeclared;
48
+ }
49
+
30
50
  unifyTerm(term, context, verifyAhead) {
31
51
  let termUnified = false;
32
52
 
@@ -57,26 +77,6 @@ export default domAssigned(class Constructor {
57
77
  return termUnified;
58
78
  }
59
79
 
60
- verifyWhenDeclared(fileContext) {
61
- let verifiedWhenDeclared;
62
-
63
- const constructorString = this.string; ///
64
-
65
- fileContext.trace(`Verifying the '${constructorString}' constructor when declared...`);
66
-
67
- const termVerifiedAtTopLevel = this.term.verifyWhenDeclared(fileContext);
68
-
69
- if (termVerifiedAtTopLevel) {
70
- verifiedWhenDeclared = true; ///
71
- }
72
-
73
- if (verifiedWhenDeclared) {
74
- fileContext.debug(`...verified the '${constructorString}' constructor when declared.`);
75
- }
76
-
77
- return verifiedWhenDeclared;
78
- }
79
-
80
80
  toJSON() {
81
81
  const termJSON = termToTermJSON(this.term),
82
82
  term = termJSON, ///
@@ -5,6 +5,7 @@ import dom from "../dom";
5
5
  import { nodeQuery } from "../utilities/query";
6
6
  import { domAssigned } from "../dom";
7
7
  import { stripBracketsFromStatementNode } from "../utilities/brackets";
8
+ import metaLemma from "./metaLemma";
8
9
 
9
10
  const statementNodeQuery = nodeQuery("/declaration/statement");
10
11
 
@@ -27,122 +28,6 @@ export default domAssigned(class Declaration {
27
28
  return this.statement;
28
29
  }
29
30
 
30
- unifyStatement(statement, context) {
31
- let statementUnified;
32
-
33
- const statementString = statement.getString(),
34
- declarationStatementString = this.statement.getString(); ///
35
-
36
- context.trace(`Unifying the '${statementString}' statement with the '${declarationStatementString}' statement...`);
37
-
38
- let statementNode = statement.getNode();
39
-
40
- statementNode = stripBracketsFromStatementNode(statementNode); ///
41
-
42
- const statementNodeMatches = this.statement.matchStatementNode(statementNode);
43
-
44
- statementUnified = statementNodeMatches; ///
45
-
46
- if (statementUnified) {
47
- context.debug(`...unified the '${statementString}' statement with the '${declarationStatementString}' statement.`);
48
- }
49
-
50
- return statementUnified;
51
- }
52
-
53
- unifyMetavariable(metavariable, context) {
54
- let metavariableUnified;
55
-
56
- const referenceString = this.reference.getString(),
57
- metavariableString = metavariable.getString();
58
-
59
- context.trace(`Unifying the '${metavariableString}' metavariable with the '${referenceString}' reference...`);
60
-
61
- const metavariableNode = metavariable.getNode(),
62
- metavariableNodeMatches = this.reference.matchMetavariableNode(metavariableNode);
63
-
64
- metavariableUnified = metavariableNodeMatches; ///
65
-
66
- if (metavariableUnified) {
67
- context.debug(`...unified the '${metavariableString}' metavariable with the '${referenceString}' reference.`);
68
- }
69
-
70
- return metavariableUnified;
71
- }
72
-
73
- unifySubstitution(substitution, context) {
74
- let substitutionUnified;
75
-
76
- const declarationString = this.string, ///
77
- substitutionString = substitution.getString();
78
-
79
- context.trace(`Unifying the '${substitutionString}' substitution with the '${declarationString}' declaration...`);
80
-
81
- const statement = substitution.getStatement(),
82
- metavariable = substitution.getMetavariable(),
83
- statementUnified = this.unifyStatement(statement, context),
84
- metavariableUnified = this.unifyMetavariable(metavariable, context);
85
-
86
- substitutionUnified = (metavariableUnified && statementUnified);
87
-
88
- if (substitutionUnified) {
89
- context.debug(`...unified the '${declarationString}' substitution with the '${substitutionString}' declaration.`);
90
- }
91
-
92
- return substitutionUnified;
93
- }
94
-
95
- unifyMetaLemmaMetatheorem(metaLemmaMetatheorem, context) {
96
- let metaLemmaMetatheoremUnified = false;
97
-
98
- const declarationString = this.string, ///
99
- metalemmaMetatheoremString = metaLemmaMetatheorem.getString();
100
-
101
- context.trace(`Unifying the '${metalemmaMetatheoremString}' meta-lemma or metatheorem with the '${declarationString}' declaration...`);
102
-
103
- const substitutions = Substitutions.fromNothing(),
104
- referenceUnified = metaLemmaMetatheorem.unifyReference(this.reference, substitutions, context);
105
-
106
- if (referenceUnified) {
107
- const statementUnified = metaLemmaMetatheorem.unifyStatement(this.statement, substitutions, context);
108
-
109
- if (statementUnified) {
110
- metaLemmaMetatheoremUnified = true;
111
- }
112
- }
113
-
114
- if (metaLemmaMetatheoremUnified) {
115
- context.debug(`...unified the '${metalemmaMetatheoremString}' meta-lemma or metatheorem with the '${declarationString}' declaration.`);
116
- }
117
-
118
- return metaLemmaMetatheoremUnified;
119
- }
120
-
121
- unifyAxiomLemmaTheoremConjecture(axiomLemmaTheoremConjecture, context) {
122
- let axiomLemmaTheoremConjectureUnified = false;
123
-
124
- const declarationString = this.string, ///
125
- axiomLemmaTheoremConjectureString = axiomLemmaTheoremConjecture.getString();
126
-
127
- context.trace(`Unifying the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture with the '${declarationString}' declaration...`);
128
-
129
- const referenceUnified = axiomLemmaTheoremConjecture.unifyReference(this.reference, context);
130
-
131
- if (referenceUnified) {
132
- const statementUnified = axiomLemmaTheoremConjecture.unifyStatement(this.statement, context);
133
-
134
- if (statementUnified) {
135
- axiomLemmaTheoremConjectureUnified = true;
136
- }
137
- }
138
-
139
- if (axiomLemmaTheoremConjectureUnified) {
140
- context.debug(`...unified the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture with the '${declarationString}' declaration.`);
141
- }
142
-
143
- return axiomLemmaTheoremConjectureUnified;
144
- }
145
-
146
31
  verify(frame, assignments, stated, context) {
147
32
  let verified = false;
148
33
 
@@ -237,35 +122,17 @@ export default domAssigned(class Declaration {
237
122
  metaLemmaMetatheorems = [
238
123
  ...metaLemmas,
239
124
  ...metatheorems
240
- ];
241
- }
125
+ ],
126
+ metaLemmaMetatheoremsVerifiedWhenStated = metaLemmaMetatheorems.every((metaLemmaMetatheorem) => {
127
+ const metaLemmaMetatheoremVerifiedWhenStated = metaLemmaMetatheorem.verifyWhenStated(this.statement, this.reference, context);
242
128
 
129
+ if (metaLemmaMetatheoremVerifiedWhenStated) {
130
+ return true;
131
+ }
132
+ });
243
133
 
244
- // metaLemmaMetatheoremUnified = metaLemmaMetatheorems.some((metaLemmaMetatheorem) => {
245
- // const metaLemmaMetatheoremUnified = this.unifyMetaLemmaMetatheorem(metaLemmaMetatheorem, context);
246
- //
247
- // if (metaLemmaMetatheoremUnified) {
248
- // return true;
249
- // }
250
- // });
251
- //
252
- // if (metaLemmaMetatheoremUnified) {
253
- // verifiedWhenStated = true;
254
- // } else {
255
- // const axiom = context.findAxiomByReference(this.reference),
256
- // lemma = context.findLemmaByReference(this.reference),
257
- // theorem = context.findTheoremByReference(this.reference),
258
- // conjecture = context.findConjectureByReference(this.reference),
259
- // axiomLemmaTheoremConjecture = (axiom || lemma || theorem || conjecture);
260
- //
261
- // if (axiomLemmaTheoremConjecture !== null) {
262
- // const axiomLemmaTheoremConjectureUnified = this.unifyAxiomLemmaTheoremConjecture(axiomLemmaTheoremConjecture, context);
263
- //
264
- // if (axiomLemmaTheoremConjectureUnified) {
265
- // verifiedWhenStated = true;
266
- // }
267
- // }
268
- // }
134
+ verifiedWhenStated = metaLemmaMetatheoremsVerifiedWhenStated; ///
135
+ }
269
136
 
270
137
  if (verifiedWhenStated) {
271
138
  context.trace(`...verified the '${declarationString}' stated declaration.`);
@@ -330,6 +197,71 @@ export default domAssigned(class Declaration {
330
197
  return verifiedWhenDerived;
331
198
  }
332
199
 
200
+ unifyStatement(statement, context) {
201
+ let statementUnified;
202
+
203
+ const statementString = statement.getString(),
204
+ declarationStatementString = this.statement.getString(); ///
205
+
206
+ context.trace(`Unifying the '${statementString}' statement with the '${declarationStatementString}' statement...`);
207
+
208
+ let statementNode = statement.getNode();
209
+
210
+ statementNode = stripBracketsFromStatementNode(statementNode); ///
211
+
212
+ const statementNodeMatches = this.statement.matchStatementNode(statementNode);
213
+
214
+ statementUnified = statementNodeMatches; ///
215
+
216
+ if (statementUnified) {
217
+ context.debug(`...unified the '${statementString}' statement with the '${declarationStatementString}' statement.`);
218
+ }
219
+
220
+ return statementUnified;
221
+ }
222
+
223
+ unifyMetavariable(metavariable, context) {
224
+ let metavariableUnified;
225
+
226
+ const referenceString = this.reference.getString(),
227
+ metavariableString = metavariable.getString();
228
+
229
+ context.trace(`Unifying the '${metavariableString}' metavariable with the '${referenceString}' reference...`);
230
+
231
+ const metavariableNode = metavariable.getNode(),
232
+ metavariableNodeMatches = this.reference.matchMetavariableNode(metavariableNode);
233
+
234
+ metavariableUnified = metavariableNodeMatches; ///
235
+
236
+ if (metavariableUnified) {
237
+ context.debug(`...unified the '${metavariableString}' metavariable with the '${referenceString}' reference.`);
238
+ }
239
+
240
+ return metavariableUnified;
241
+ }
242
+
243
+ unifySubstitution(substitution, context) {
244
+ let substitutionUnified;
245
+
246
+ const declarationString = this.string, ///
247
+ substitutionString = substitution.getString();
248
+
249
+ context.trace(`Unifying the '${substitutionString}' substitution with the '${declarationString}' declaration...`);
250
+
251
+ const statement = substitution.getStatement(),
252
+ metavariable = substitution.getMetavariable(),
253
+ statementUnified = this.unifyStatement(statement, context),
254
+ metavariableUnified = this.unifyMetavariable(metavariable, context);
255
+
256
+ substitutionUnified = (metavariableUnified && statementUnified);
257
+
258
+ if (substitutionUnified) {
259
+ context.debug(`...unified the '${declarationString}' substitution with the '${substitutionString}' declaration.`);
260
+ }
261
+
262
+ return substitutionUnified;
263
+ }
264
+
333
265
  static name = "Declaration";
334
266
 
335
267
  static fromDeclarationNode(declarationNode, context) {
package/src/dom/label.js CHANGED
@@ -43,7 +43,7 @@ export default domAssigned(class Label {
43
43
 
44
44
  const labelString = this.getString(); ///
45
45
 
46
- this.fileContext.trace(`Verifying the '${labelString}' label when declared...`);
46
+ this.fileContext.trace(`Verifying the '${labelString}' label...`);
47
47
 
48
48
  let labelPresent;
49
49
 
@@ -64,7 +64,7 @@ export default domAssigned(class Label {
64
64
  }
65
65
 
66
66
  if (verified) {
67
- this.fileContext.debug(`...verified the '${labelString}' label when declared.`);
67
+ this.fileContext.debug(`...verified the '${labelString}' label.`);
68
68
  }
69
69
 
70
70
  return verified;
@@ -1,11 +1,10 @@
1
1
  "use strict";
2
2
 
3
- import LocalContext from "../context/local";
4
- import TopLevelAssertion from "./topLevelAssertion";
3
+ import TopLevelMetaAssertion from "./topLevelMetaAssertion";
5
4
 
6
5
  import { domAssigned } from "../dom";
7
6
 
8
- export default domAssigned(class MetaLemma extends TopLevelAssertion {
7
+ export default domAssigned(class MetaLemma extends TopLevelMetaAssertion {
9
8
  verify() {
10
9
  let verified;
11
10
 
@@ -28,49 +27,9 @@ export default domAssigned(class MetaLemma extends TopLevelAssertion {
28
27
  return verified;
29
28
  }
30
29
 
31
- verifyLabels() {
32
- const labelsVerified = this.labels.every((label) => {
33
- const nameOnly = false,
34
- labelVerified = label.verify(nameOnly);
35
-
36
- if (labelVerified) {
37
- return true;
38
- }
39
- });
40
-
41
- return labelsVerified;
42
- }
43
-
44
- unifyStatement(statement, substitutions, context) {
45
- let statementUnified;
46
-
47
- const metaLemma = this, ///
48
- statementString = statement.getString(),
49
- metaLemmaString = metaLemma.getString();
50
-
51
- context.trace(`Unifying the '${statementString}' statement with the '${metaLemmaString}' meta-lemma...`);
52
-
53
- const suppositions = this.getSuppositions(),
54
- suppositionsLength = suppositions.length;
55
-
56
- if (suppositionsLength === 0) {
57
- const fileContext = this.getFileContext(),
58
- localContext = LocalContext.fromFileContext(fileContext),
59
- generalContext = localContext, ///
60
- specificContext = context, ///
61
- statementUnifiedWithConsequent = this.unifyStatementWithConsequent(statement, substitutions, generalContext, specificContext);
62
-
63
- statementUnified = statementUnifiedWithConsequent; ///
64
- }
65
-
66
- if (statementUnified) {
67
- context.debug(`...unified the '${statementString}' statement with the '${metaLemmaString}' meta-lemma.`);
68
- }
69
-
70
- return statementUnified;
71
- }
72
-
73
30
  static name = "MetaLemma";
74
31
 
75
- static fromMetaLemmaNode(metaLemmaNode, fileContext) { return TopLevelAssertion.fromNode(MetaLemma, metaLemmaNode, fileContext); }
32
+ static fromJSON(json, fileContext) { return TopLevelMetaAssertion.fromJSON(MetaLemma, json, fileContext); }
33
+
34
+ static fromMetaLemmaNode(axiomNode, fileContext) { return TopLevelMetaAssertion.fromNode(MetaLemma, axiomNode, fileContext); }
76
35
  });