occam-verify-cli 1.0.220 → 1.0.223

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.
Files changed (47) hide show
  1. package/lib/context/local.js +5 -43
  2. package/lib/dom/assertion/property.js +4 -2
  3. package/lib/dom/assertion/type.js +4 -2
  4. package/lib/dom/axiom.js +9 -9
  5. package/lib/dom/equality.js +21 -6
  6. package/lib/dom/judgement.js +4 -2
  7. package/lib/dom/rule.js +13 -5
  8. package/lib/dom/statement.js +7 -7
  9. package/lib/dom/step.js +18 -21
  10. package/lib/dom/subproof.js +12 -15
  11. package/lib/dom/substitution/term.js +2 -16
  12. package/lib/dom/substitution.js +1 -8
  13. package/lib/dom/topLevelAssertion.js +18 -31
  14. package/lib/dom/topLevelMetaAssertion.js +13 -5
  15. package/lib/dom/variable.js +3 -3
  16. package/lib/equivalence.js +54 -33
  17. package/lib/equivalences.js +57 -101
  18. package/lib/mixins/step/unify.js +42 -24
  19. package/lib/unifier/equantional.js +170 -0
  20. package/lib/utilities/brackets.js +2 -2
  21. package/lib/utilities/subproof.js +2 -2
  22. package/lib/utilities/unification.js +1 -11
  23. package/package.json +1 -1
  24. package/src/context/local.js +5 -48
  25. package/src/dom/assertion/property.js +3 -1
  26. package/src/dom/assertion/type.js +3 -1
  27. package/src/dom/axiom.js +12 -10
  28. package/src/dom/equality.js +26 -9
  29. package/src/dom/judgement.js +3 -1
  30. package/src/dom/rule.js +20 -5
  31. package/src/dom/statement.js +5 -5
  32. package/src/dom/step.js +28 -34
  33. package/src/dom/subproof.js +15 -25
  34. package/src/dom/substitution/term.js +1 -19
  35. package/src/dom/substitution.js +0 -6
  36. package/src/dom/topLevelAssertion.js +20 -41
  37. package/src/dom/topLevelMetaAssertion.js +20 -5
  38. package/src/dom/variable.js +3 -2
  39. package/src/equivalence.js +69 -46
  40. package/src/equivalences.js +53 -115
  41. package/src/mixins/step/unify.js +54 -33
  42. package/src/unifier/equantional.js +90 -0
  43. package/src/utilities/brackets.js +1 -1
  44. package/src/utilities/subproof.js +1 -1
  45. package/src/utilities/unification.js +0 -14
  46. package/lib/unifier/equality.js +0 -155
  47. package/src/unifier/equality.js +0 -70
package/src/unifier/equality.js DELETED
@@ -1,70 +0,0 @@
1
- "use strict";
2
-
3
- import Unifier from "../unifier";
4
-
5
- import { nodeQuery } from "../utilities/query";
6
-
7
- const termNodeQuery = nodeQuery("/term");
8
-
9
- class EqualityUnifier extends Unifier {
10
- unify(leftTermNode, rightTermNode, context) {
11
- let equalityUnified;
12
-
13
- const leftNonTerminalNode = leftTermNode, ///
14
- rightNonTerminalNode = rightTermNode, ///
15
- nonTerminalNodeUnified = this.unifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, context);
16
-
17
- equalityUnified = nonTerminalNodeUnified; ///
18
-
19
- return equalityUnified;
20
- };
21
-
22
- static maps = [
23
- {
24
- generalNodeQuery: termNodeQuery, ///
25
- specificNodeQuery: termNodeQuery, ///
26
- unify: (leftTermNode, rightTermNode, context) => {
27
- let termUnifiedWithTerm;
28
-
29
- const leftTermNodeMatchesRightTermNode = leftTermNode.match(rightTermNode);
30
-
31
- if (leftTermNodeMatchesRightTermNode) {
32
- termUnifiedWithTerm = true;
33
- } else {
34
- const equivalences = context.getEquivalences(),
35
- termNodes = [
36
- leftTermNode,
37
- rightTermNode
38
- ],
39
- equivalence = equivalences.findEquivalenceByTermNodes(termNodes);
40
-
41
- termUnifiedWithTerm = (equivalence !== null);
42
- }
43
-
44
- if (!termUnifiedWithTerm) {
45
- const childNodesUnified = unifyChildNodes(leftTermNode, rightTermNode, context);
46
-
47
- termUnifiedWithTerm = childNodesUnified; ///
48
- }
49
-
50
- return termUnifiedWithTerm;
51
- }
52
- }
53
- ];
54
- }
55
-
56
- const equalityUnifier = new EqualityUnifier();
57
-
58
- export default equalityUnifier;
59
-
60
- function unifyChildNodes(leftTermNode, rightTermNode, context) {
61
- const leftNonTerminalNode = leftTermNode, ///
62
- rightNonTerminalNode = rightTermNode, ///
63
- leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(),
64
- rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(),
65
- leftChildNodes = leftNonTerminalNodeChildNodes, ///
66
- rightChildNodes = rightNonTerminalNodeChildNodes, ///
67
- childNodesUnified = equalityUnifier.unifyChildNodes(leftChildNodes, rightChildNodes, context);
68
-
69
- return childNodesUnified;
70
- }