occam-verify-cli 1.0.220 → 1.0.224

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 (161) hide show
  1. package/lib/context/file.js +19 -19
  2. package/lib/context/local.js +5 -43
  3. package/lib/context/release.js +11 -11
  4. package/lib/dom/assertion/contained.js +44 -44
  5. package/lib/dom/assertion/defined.js +40 -40
  6. package/lib/dom/assertion/property.js +37 -35
  7. package/lib/dom/assertion/satisfies.js +26 -25
  8. package/lib/dom/assertion/subproof.js +16 -16
  9. package/lib/dom/assertion/type.js +34 -32
  10. package/lib/dom/axiom.js +52 -52
  11. package/lib/dom/combinator/bracketed.js +5 -5
  12. package/lib/dom/combinator.js +6 -6
  13. package/lib/dom/conclusion.js +10 -10
  14. package/lib/dom/conjecture.js +5 -5
  15. package/lib/dom/constructor/bracketed.js +12 -12
  16. package/lib/dom/constructor.js +9 -9
  17. package/lib/dom/declaration/combinator.js +11 -11
  18. package/lib/dom/declaration/complexType.js +133 -63
  19. package/lib/dom/declaration/constructor.js +17 -17
  20. package/lib/dom/declaration/metavariable.js +17 -17
  21. package/lib/dom/declaration/simpleType.js +229 -0
  22. package/lib/dom/declaration/variable.js +17 -17
  23. package/lib/dom/declaration.js +54 -52
  24. package/lib/dom/deduction.js +15 -15
  25. package/lib/dom/derivation.js +8 -8
  26. package/lib/dom/equality.js +49 -34
  27. package/lib/dom/error.js +3 -3
  28. package/lib/dom/frame.js +38 -38
  29. package/lib/dom/judgement.js +31 -29
  30. package/lib/dom/label.js +5 -5
  31. package/lib/dom/lemma.js +5 -5
  32. package/lib/dom/metaLemma.js +5 -5
  33. package/lib/dom/metatheorem.js +5 -5
  34. package/lib/dom/metavariable.js +55 -55
  35. package/lib/dom/premise.js +36 -34
  36. package/lib/dom/procedureCall.js +9 -9
  37. package/lib/dom/proof.js +6 -6
  38. package/lib/dom/propertyRelation.js +18 -18
  39. package/lib/dom/reference.js +28 -28
  40. package/lib/dom/rule.js +63 -48
  41. package/lib/dom/signature.js +17 -17
  42. package/lib/dom/statement.js +36 -36
  43. package/lib/dom/step.js +32 -35
  44. package/lib/dom/subDerivation.js +8 -8
  45. package/lib/dom/subproof.js +27 -30
  46. package/lib/dom/substitution/statement.js +7 -7
  47. package/lib/dom/substitution/term.js +2 -16
  48. package/lib/dom/substitution.js +1 -15
  49. package/lib/dom/supposition.js +39 -39
  50. package/lib/dom/term.js +15 -15
  51. package/lib/dom/theorem.js +5 -5
  52. package/lib/dom/topLevelAssertion.js +60 -71
  53. package/lib/dom/topLevelMetaAssertion.js +28 -20
  54. package/lib/dom/type.js +18 -24
  55. package/lib/dom/variable.js +16 -16
  56. package/lib/equivalence.js +54 -33
  57. package/lib/equivalences.js +57 -101
  58. package/lib/index.js +2 -2
  59. package/lib/mixins/statement/verify.js +52 -52
  60. package/lib/mixins/step/unify.js +79 -61
  61. package/lib/mixins/term/verify.js +17 -17
  62. package/lib/substitutions.js +7 -7
  63. package/lib/unifier/equantional.js +170 -0
  64. package/lib/unifier/intrinsicLevel.js +8 -8
  65. package/lib/unifier/metaLevel.js +21 -21
  66. package/lib/unifier/metavariable.js +9 -9
  67. package/lib/unifier/statementWithCombinator.js +18 -18
  68. package/lib/unifier/termWithConstructor.js +10 -10
  69. package/lib/unifier.js +41 -41
  70. package/lib/utilities/brackets.js +2 -2
  71. package/lib/utilities/release.js +18 -17
  72. package/lib/utilities/subproof.js +2 -2
  73. package/lib/utilities/type.js +2 -2
  74. package/lib/utilities/unification.js +28 -34
  75. package/lib/verifier/combinator.js +14 -14
  76. package/lib/verifier/constructor.js +18 -18
  77. package/lib/verifier/topLevel.js +38 -38
  78. package/lib/verifier.js +30 -30
  79. package/package.json +1 -1
  80. package/src/context/file.js +18 -18
  81. package/src/context/local.js +5 -48
  82. package/src/context/release.js +11 -11
  83. package/src/dom/assertion/contained.js +46 -46
  84. package/src/dom/assertion/defined.js +41 -41
  85. package/src/dom/assertion/property.js +37 -35
  86. package/src/dom/assertion/satisfies.js +26 -25
  87. package/src/dom/assertion/subproof.js +15 -15
  88. package/src/dom/assertion/type.js +34 -32
  89. package/src/dom/axiom.js +56 -54
  90. package/src/dom/combinator/bracketed.js +4 -4
  91. package/src/dom/combinator.js +5 -5
  92. package/src/dom/conclusion.js +9 -9
  93. package/src/dom/conjecture.js +4 -4
  94. package/src/dom/constructor/bracketed.js +11 -11
  95. package/src/dom/constructor.js +8 -8
  96. package/src/dom/declaration/combinator.js +10 -10
  97. package/src/dom/declaration/complexType.js +129 -64
  98. package/src/dom/declaration/constructor.js +16 -16
  99. package/src/dom/declaration/metavariable.js +16 -16
  100. package/src/dom/declaration/simpleType.js +179 -0
  101. package/src/dom/declaration/variable.js +16 -16
  102. package/src/dom/declaration.js +54 -52
  103. package/src/dom/deduction.js +14 -14
  104. package/src/dom/derivation.js +7 -7
  105. package/src/dom/equality.js +55 -38
  106. package/src/dom/error.js +2 -2
  107. package/src/dom/frame.js +38 -38
  108. package/src/dom/judgement.js +31 -29
  109. package/src/dom/label.js +4 -4
  110. package/src/dom/lemma.js +4 -4
  111. package/src/dom/metaLemma.js +4 -4
  112. package/src/dom/metatheorem.js +4 -4
  113. package/src/dom/metavariable.js +54 -54
  114. package/src/dom/premise.js +35 -33
  115. package/src/dom/procedureCall.js +8 -8
  116. package/src/dom/proof.js +5 -5
  117. package/src/dom/propertyRelation.js +17 -17
  118. package/src/dom/reference.js +27 -27
  119. package/src/dom/rule.js +72 -49
  120. package/src/dom/signature.js +15 -15
  121. package/src/dom/statement.js +34 -34
  122. package/src/dom/step.js +42 -48
  123. package/src/dom/subDerivation.js +7 -7
  124. package/src/dom/subproof.js +30 -40
  125. package/src/dom/substitution/statement.js +6 -6
  126. package/src/dom/substitution/term.js +1 -19
  127. package/src/dom/substitution.js +0 -13
  128. package/src/dom/supposition.js +38 -38
  129. package/src/dom/term.js +14 -14
  130. package/src/dom/theorem.js +4 -4
  131. package/src/dom/topLevelAssertion.js +62 -81
  132. package/src/dom/topLevelMetaAssertion.js +35 -20
  133. package/src/dom/type.js +23 -33
  134. package/src/dom/variable.js +16 -15
  135. package/src/equivalence.js +69 -46
  136. package/src/equivalences.js +53 -115
  137. package/src/index.js +1 -1
  138. package/src/mixins/statement/verify.js +51 -51
  139. package/src/mixins/step/unify.js +88 -67
  140. package/src/mixins/term/verify.js +16 -16
  141. package/src/substitutions.js +5 -6
  142. package/src/unifier/equantional.js +90 -0
  143. package/src/unifier/intrinsicLevel.js +7 -7
  144. package/src/unifier/metaLevel.js +20 -21
  145. package/src/unifier/metavariable.js +8 -8
  146. package/src/unifier/statementWithCombinator.js +17 -17
  147. package/src/unifier/termWithConstructor.js +9 -9
  148. package/src/unifier.js +40 -40
  149. package/src/utilities/brackets.js +1 -1
  150. package/src/utilities/release.js +18 -18
  151. package/src/utilities/subproof.js +1 -1
  152. package/src/utilities/type.js +1 -1
  153. package/src/utilities/unification.js +27 -37
  154. package/src/verifier/combinator.js +13 -13
  155. package/src/verifier/constructor.js +17 -17
  156. package/src/verifier/topLevel.js +41 -41
  157. package/src/verifier.js +29 -29
  158. package/lib/dom/declaration/type.js +0 -209
  159. package/lib/unifier/equality.js +0 -155
  160. package/src/dom/declaration/type.js +0 -150
  161. package/src/unifier/equality.js +0 -70
@@ -14,13 +14,13 @@ const termNodeQuery = nodeQuery("/term"),
14
14
 
15
15
  class MetaLevelUnifier extends Unifier {
16
16
  unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext) {
17
- let unifiedAtMetaLevel;
17
+ let unifiesAtMetaLevel;
18
18
 
19
- const nonTerminalNodeUnified = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);
19
+ const nonTerminalNodeUnifies = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);
20
20
 
21
- unifiedAtMetaLevel = nonTerminalNodeUnified; ///
21
+ unifiesAtMetaLevel = nonTerminalNodeUnifies; ///
22
22
 
23
- return unifiedAtMetaLevel;
23
+ return unifiesAtMetaLevel;
24
24
  }
25
25
 
26
26
  static maps = [
@@ -28,7 +28,7 @@ class MetaLevelUnifier extends Unifier {
28
28
  generalNodeQuery: statementNodeQuery,
29
29
  specificNodeQuery: statementNodeQuery,
30
30
  unify: (generalStatementNode, specificStatementNode, substitutions, generalContext, specificContext) => {
31
- let statementUnified;
31
+ let statementUnifies;
32
32
 
33
33
  const statementNode = generalStatementNode, ///
34
34
  singularMetavariableNode = statementNode.getSingularMetavariableNode();
@@ -55,21 +55,21 @@ class MetaLevelUnifier extends Unifier {
55
55
 
56
56
  const statement = Statement.fromStatementNode(statementNode, context);
57
57
 
58
- statementUnified = metavariable.unifyStatement(statement, substitution, substitutions, generalContext, specificContext);
58
+ statementUnifies = metavariable.unifyStatement(statement, substitution, substitutions, generalContext, specificContext);
59
59
  } else {
60
- const childNodesUnified = unifyChildNodes(generalStatementNode, specificStatementNode, substitutions, generalContext, specificContext);
60
+ const childNodesUnify = unifyChildNodes(generalStatementNode, specificStatementNode, substitutions, generalContext, specificContext);
61
61
 
62
- statementUnified = childNodesUnified; ///
62
+ statementUnifies = childNodesUnify; ///
63
63
  }
64
64
 
65
- return statementUnified;
65
+ return statementUnifies;
66
66
  }
67
67
  },
68
68
  {
69
69
  generalNodeQuery: declarationMetavariableNodeQuery,
70
70
  specificNodeQuery: declarationMetavariableNodeQuery,
71
71
  unify: (generalDeclarationMetavariableNode, specificDeclarationMetavariableNode, substitutions, generalContext, specificContext) => {
72
- let referenceUnified;
72
+ let referenceUnifies;
73
73
 
74
74
  const { Reference, Metavariable } = dom;
75
75
 
@@ -88,16 +88,16 @@ class MetaLevelUnifier extends Unifier {
88
88
 
89
89
  const reference = Reference.fromMetavariableNode(metavariableNode, context);
90
90
 
91
- referenceUnified = metavariable.unifyReference(reference, substitutions, generalContext, specificContext);
91
+ referenceUnifies = metavariable.unifyReference(reference, substitutions, generalContext, specificContext);
92
92
 
93
- return referenceUnified;
93
+ return referenceUnifies;
94
94
  }
95
95
  },
96
96
  {
97
97
  generalNodeQuery: frameMetavariableNodeQuery,
98
98
  specificNodeQuery: frameNodeQuery,
99
99
  unify: (generalFrameMetavariableNode, specificFrameNode, substitutions, generalContext, specificContext) => {
100
- let frameUnified;
100
+ let frameUnifies;
101
101
 
102
102
  const { Frame, Metavariable } = dom,
103
103
  frameNode = specificFrameNode, ///
@@ -113,16 +113,16 @@ class MetaLevelUnifier extends Unifier {
113
113
 
114
114
  const frame = Frame.fromFrameNode(frameNode, context);
115
115
 
116
- frameUnified = metavariable.unifyFrame(frame, substitutions, generalContext, specificContext);
116
+ frameUnifies = metavariable.unifyFrame(frame, substitutions, generalContext, specificContext);
117
117
 
118
- return frameUnified;
118
+ return frameUnifies;
119
119
  }
120
120
  },
121
121
  {
122
122
  generalNodeQuery: termVariableNodeQuery,
123
123
  specificNodeQuery: termNodeQuery,
124
124
  unify: (generalTermVariableNode, specificTermNode, substitutions, generalContext, specificContext) => {
125
- let termUnified;
125
+ let termUnifies;
126
126
 
127
127
  const { Term, Variable } = dom,
128
128
  termNode = specificTermNode, ///
@@ -138,9 +138,9 @@ class MetaLevelUnifier extends Unifier {
138
138
 
139
139
  const term = Term.fromTermNode(termNode, context);
140
140
 
141
- termUnified = variable.unifyTerm(term, substitutions, generalContext, specificContext);
141
+ termUnifies = variable.unifyTerm(term, substitutions, generalContext, specificContext);
142
142
 
143
- return termUnified;
143
+ return termUnifies;
144
144
  }
145
145
  }
146
146
  ];
@@ -157,8 +157,7 @@ function unifyChildNodes(generalStatementNode, specificStatementNode, substituti
157
157
  specificNonTerminalNodeChildNodes = specificNonTerminalNode.getChildNodes(),
158
158
  generalChildNodes = generalNonTerminalNodeChildNodes, ///
159
159
  specificChildNodes = specificNonTerminalNodeChildNodes, ///
160
- childNodesVerified = metaLevelUnifier.unifyChildNodes(generalChildNodes, specificChildNodes, substitutions, generalContext, specificContext),
161
- childNodesUnified = childNodesVerified; ///
160
+ childNodesUnify = metaLevelUnifier.unifyChildNodes(generalChildNodes, specificChildNodes, substitutions, generalContext, specificContext);
162
161
 
163
- return childNodesUnified;
162
+ return childNodesUnify;
164
163
  }
@@ -10,15 +10,15 @@ const typeNodeQuery = nodeQuery("/type"),
10
10
 
11
11
  class MetavariableUnifier extends Unifier {
12
12
  unify(generalMetavariableNode, specificMetavariableNode, generalContext, specificContext) {
13
- let metavariableUnified;
13
+ let metavariableUnifies;
14
14
 
15
15
  const generalNonTerminalNode = generalMetavariableNode, ///
16
16
  specificNonTerminalNode = specificMetavariableNode, ///
17
- nonTerminalNodeUnified = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, generalContext, specificContext);
17
+ nonTerminalNodeUnifies = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, generalContext, specificContext);
18
18
 
19
- metavariableUnified = nonTerminalNodeUnified; ///
19
+ metavariableUnifies = nonTerminalNodeUnifies; ///
20
20
 
21
- return metavariableUnified;
21
+ return metavariableUnifies;
22
22
  }
23
23
 
24
24
  static maps = [
@@ -26,7 +26,7 @@ class MetavariableUnifier extends Unifier {
26
26
  generalNodeQuery: typeNodeQuery,
27
27
  specificNodeQuery: termNodeQuery,
28
28
  unify: (generalTypeNode, specificTermNode, generalContext, specificContext) => {
29
- let termUnified;
29
+ let termUnifies;
30
30
 
31
31
  const { Term } = dom,
32
32
  typeNode = generalTypeNode, ///
@@ -35,11 +35,11 @@ class MetavariableUnifier extends Unifier {
35
35
  type = generalContext.findTypeByTypeName(typeName),
36
36
  context = specificContext, ///
37
37
  term = Term.fromTermNode(termNode, context),
38
- termVerifiedGivenType = term.verifyGivenType(type, generalContext, specificContext);
38
+ termVerifiesGivenType = term.verifyGivenType(type, generalContext, specificContext);
39
39
 
40
- termUnified = termVerifiedGivenType; ///
40
+ termUnifies = termVerifiesGivenType; ///
41
41
 
42
- return termUnified;
42
+ return termUnifies;
43
43
  }
44
44
  }
45
45
  ];
@@ -13,15 +13,15 @@ const termNodeQuery = nodeQuery("/term"),
13
13
 
14
14
  class StatementWithCombinatorUnifier extends Unifier {
15
15
  unify(combinatorStatementNode, statementNode, assignments, stated, generalContext, specificContext) {
16
- let statementUnifiedWithCombinator;
16
+ let statementUnifiesWithCombinator;
17
17
 
18
18
  const generalNonTerminalNode = combinatorStatementNode, ///
19
19
  specificNonTerminalNode = statementNode, ///
20
- nonTerminalNodeUnified = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, assignments, stated, generalContext, specificContext);
20
+ nonTerminalNodeUnifies = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, assignments, stated, generalContext, specificContext);
21
21
 
22
- statementUnifiedWithCombinator = nonTerminalNodeUnified; ///
22
+ statementUnifiesWithCombinator = nonTerminalNodeUnifies; ///
23
23
 
24
- return statementUnifiedWithCombinator;
24
+ return statementUnifiesWithCombinator;
25
25
  };
26
26
 
27
27
  static maps = [
@@ -29,7 +29,7 @@ class StatementWithCombinatorUnifier extends Unifier {
29
29
  generalNodeQuery: metaTypeNodeQuery,
30
30
  specificNodeQuery: statementNodeQuery,
31
31
  unify: (generalMetaTypeNode, specificStatementNode, assignments, stated, generalContext, specificContext) => {
32
- let unified;
32
+ let unifies;
33
33
 
34
34
  const { Statement, MetaType } = dom,
35
35
  metaTypeNode = generalMetaTypeNode, ///
@@ -44,18 +44,18 @@ class StatementWithCombinatorUnifier extends Unifier {
44
44
  context = specificContext; ///
45
45
 
46
46
  const statement = Statement.fromStatementNode(statementNode, context),
47
- statementVerifiedGivenType = statement.verifyGivenMetaType(metaType, assignments, stated, context);
47
+ statementVerifiesGivenType = statement.verifyGivenMetaType(metaType, assignments, stated, context);
48
48
 
49
- unified = statementVerifiedGivenType;
49
+ unifies = statementVerifiesGivenType;
50
50
 
51
- return unified;
51
+ return unifies;
52
52
  }
53
53
  },
54
54
  {
55
55
  generalNodeQuery: metaTypeNodeQuery,
56
56
  specificNodeQuery: frameNodeQuery,
57
57
  unify: (generalMetaTypeNode, specificFrameNode, assignments, stated, generalContext, specificContext) => {
58
- let unified;
58
+ let unifies;
59
59
 
60
60
  const { Frame, MetaType } = dom,
61
61
  metaTypeNode = generalMetaTypeNode, ///
@@ -70,18 +70,18 @@ class StatementWithCombinatorUnifier extends Unifier {
70
70
  context = specificContext; ///
71
71
 
72
72
  const frame = Frame.fromFrameNode(frameNode, context),
73
- frameVerifiedGivenType = frame.verifyGivenMetaType(metaType, assignments, stated, context);
73
+ frameVerifiesGivenType = frame.verifyGivenMetaType(metaType, assignments, stated, context);
74
74
 
75
- unified = frameVerifiedGivenType;
75
+ unifies = frameVerifiesGivenType;
76
76
 
77
- return unified;
77
+ return unifies;
78
78
  }
79
79
  },
80
80
  {
81
81
  generalNodeQuery: typeNodeQuery,
82
82
  specificNodeQuery: termNodeQuery,
83
83
  unify: (generalTypeNode, specificTermNode, assignments, stated, generalContext, specificContext) => {
84
- let unified = false;
84
+ let unifies = false;
85
85
 
86
86
  const { Term } = dom,
87
87
  typeNode = generalTypeNode, ///
@@ -97,13 +97,13 @@ class StatementWithCombinatorUnifier extends Unifier {
97
97
  context = specificContext; ///
98
98
 
99
99
  const term = Term.fromTermNode(termNode, context),
100
- termVerifiedGivenType = term.verifyGivenType(type, generalContext, specificContext);
100
+ termVerifiesGivenType = term.verifyGivenType(type, generalContext, specificContext);
101
101
 
102
- if (termVerifiedGivenType) {
103
- unified = true;
102
+ if (termVerifiesGivenType) {
103
+ unifies = true;
104
104
  }
105
105
 
106
- return unified;
106
+ return unifies;
107
107
  }
108
108
  }
109
109
  ];
@@ -10,15 +10,15 @@ const termNodeQuery = nodeQuery("/term"),
10
10
 
11
11
  class TermWithConstructorUnifier extends Unifier {
12
12
  unify(constructorTermNode, termNode, context) {
13
- let termUnifiedWithConstructor;
13
+ let termUnifiesWithConstructor;
14
14
 
15
15
  const generalNonTerminalNode = constructorTermNode, ///
16
16
  specificNonTerminalNode = termNode, ///
17
- nonTerminalNodeUnified = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, context);
17
+ nonTerminalNodeUnifies = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, context);
18
18
 
19
- termUnifiedWithConstructor = nonTerminalNodeUnified; ///
19
+ termUnifiesWithConstructor = nonTerminalNodeUnifies; ///
20
20
 
21
- return termUnifiedWithConstructor;
21
+ return termUnifiesWithConstructor;
22
22
  };
23
23
 
24
24
  static maps = [
@@ -26,7 +26,7 @@ class TermWithConstructorUnifier extends Unifier {
26
26
  generalNodeQuery: typeNodeQuery,
27
27
  specificNodeQuery: termNodeQuery,
28
28
  unify: (generalTypeNode, specificTermNode, context) => {
29
- let unified = false;
29
+ let unifies = false;
30
30
 
31
31
  const { Term } = dom,
32
32
  typeNode = generalTypeNode, ///
@@ -38,14 +38,14 @@ class TermWithConstructorUnifier extends Unifier {
38
38
  term = Term.fromTermNode(termNode, context),
39
39
  generalContext = context, ///
40
40
  specificContext = context, ///
41
- termVerifiedGivenType = term.verifyGivenType(type, generalContext, specificContext);
41
+ termVerifiesGivenType = term.verifyGivenType(type, generalContext, specificContext);
42
42
 
43
- if (termVerifiedGivenType) {
44
- unified = true;
43
+ if (termVerifiesGivenType) {
44
+ unifies = true;
45
45
  }
46
46
  }
47
47
 
48
- return unified;
48
+ return unifies;
49
49
  }
50
50
  }
51
51
  ];
package/src/unifier.js CHANGED
@@ -8,17 +8,17 @@ const nonTerminalNodeQuery = nodeQuery("/*");
8
8
 
9
9
  export default class Unifier {
10
10
  unify(generalNode, specificNode, ...remainingArguments) {
11
- let unified;
11
+ let unifies;
12
12
 
13
- const nodeUnified = this.unifyNode(generalNode, specificNode, ...remainingArguments);
13
+ const nodeUnifies = this.unifyNode(generalNode, specificNode, ...remainingArguments);
14
14
 
15
- unified = nodeUnified; ///
15
+ unifies = nodeUnifies; ///
16
16
 
17
- return unified;
17
+ return unifies;
18
18
  }
19
19
 
20
20
  unifyNode(generalNode, specificNode, ...remainingArguments) {
21
- let nodeUnified = false;
21
+ let nodeUnifies = false;
22
22
 
23
23
  const generalNodeTerminalNode = generalNode.isTerminalNode(),
24
24
  specificNodeTerminalNode = specificNode.isTerminalNode(),
@@ -30,22 +30,22 @@ export default class Unifier {
30
30
  } else if (generalNodeTerminalNode && specificNodeTerminalNode) {
31
31
  const generalTerminalNode = generalNode, ///
32
32
  specificTerminalNode = specificNode, ///
33
- terminalNodeUnified = this.unifyTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments);
33
+ terminalNodeUnifies = this.unifyTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments);
34
34
 
35
- nodeUnified = terminalNodeUnified; ///
35
+ nodeUnifies = terminalNodeUnifies; ///
36
36
  } else if (generalNodeNonTerminalNode && specificNodeNonTerminalNode) {
37
37
  const generalNonTerminalNode = generalNode, ///
38
38
  specificNonTerminalNode = specificNode, ///
39
- nonTerminalNodeUnified = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments);
39
+ nonTerminalNodeUnifies = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments);
40
40
 
41
- nodeUnified = nonTerminalNodeUnified; ///
41
+ nodeUnifies = nonTerminalNodeUnifies; ///
42
42
  }
43
43
 
44
- return nodeUnified;
44
+ return nodeUnifies;
45
45
  }
46
46
 
47
47
  unifyChildNodes(generalChildNodes, specificChildNodes, ...remainingArguments) {
48
- let childNodesUnified = false;
48
+ let childNodesUnify = false;
49
49
 
50
50
  const generalChildNodesLength = generalChildNodes.length,
51
51
  specificChildNodesLength = specificChildNodes.length;
@@ -60,17 +60,17 @@ export default class Unifier {
60
60
 
61
61
  if (lastRemainingArgumentFunction) {
62
62
  const index = 0,
63
- childNodesUnifiedAhead = this.unifyChildNodesAhead(index, generalChildNodes, specificChildNodes,...remainingArguments);
63
+ childNodesUnifyAhead = this.unifyChildNodesAhead(index, generalChildNodes, specificChildNodes,...remainingArguments);
64
64
 
65
- childNodesUnified = childNodesUnifiedAhead; ///
65
+ childNodesUnify = childNodesUnifyAhead; ///
66
66
  } else {
67
- childNodesUnified = generalChildNodes.every((generalChildNode, index) => {
67
+ childNodesUnify = generalChildNodes.every((generalChildNode, index) => {
68
68
  const specificChildNode = specificChildNodes[index],
69
69
  specificNode = specificChildNode, ///
70
70
  generalNode = generalChildNode, ///
71
- nodeUnified = this.unifyNode(generalNode, specificNode, ...remainingArguments);
71
+ nodeUnifies = this.unifyNode(generalNode, specificNode, ...remainingArguments);
72
72
 
73
- if (nodeUnified) {
73
+ if (nodeUnifies) {
74
74
  return true;
75
75
  }
76
76
  });
@@ -78,30 +78,30 @@ export default class Unifier {
78
78
  }
79
79
  }
80
80
 
81
- return childNodesUnified;
81
+ return childNodesUnify;
82
82
  }
83
83
 
84
84
  unifyTerminalNode(generalTerminalNode, specificTerminalNode, ...remainingArguments) { ///
85
- let terminalNodeUnified;
85
+ let terminalNodeUnifies;
86
86
 
87
87
  const lastRemainingArgumentFunction = isLastRemainingArgumentFunction(remainingArguments);
88
88
 
89
89
  if (lastRemainingArgumentFunction) {
90
90
  const unifyAhead = remainingArguments.pop(),
91
- unifiedAhead = unifyAhead();
91
+ unifiesAhead = unifyAhead();
92
92
 
93
- terminalNodeUnified = unifiedAhead; ///
93
+ terminalNodeUnifies = unifiesAhead; ///
94
94
 
95
- remainingArguments.push(unifiedAhead);
95
+ remainingArguments.push(unifiesAhead);
96
96
  } else {
97
- terminalNodeUnified = true;
97
+ terminalNodeUnifies = true;
98
98
  }
99
99
 
100
- return terminalNodeUnified;
100
+ return terminalNodeUnifies;
101
101
  }
102
102
 
103
103
  unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, ...remainingArguments) {
104
- let nonTerminalNodeUnified;
104
+ let nonTerminalNodeUnifies;
105
105
 
106
106
  let { maps } = this.constructor;
107
107
 
@@ -111,7 +111,7 @@ export default class Unifier {
111
111
  generalNodeQuery: nonTerminalNodeQuery,
112
112
  specificNodeQuery: nonTerminalNodeQuery,
113
113
  unify: (generalNode, specificNode, ...remainingArguments) => {
114
- let nonTerminalNodeUnified;
114
+ let nonTerminalNodeUnifies;
115
115
 
116
116
  const generalNonTerminalNodeRuleName = generalNonTerminalNode.getRuleName(), ///
117
117
  specificNonTerminalNodeRuleName = specificNonTerminalNode.getRuleName(); ///
@@ -121,17 +121,17 @@ export default class Unifier {
121
121
  specificNonTerminalNodeChildNode = specificNonTerminalNode.getChildNodes(),
122
122
  generalChildNodes = generalNonTerminalNodeChildNodes, ///
123
123
  specificChildNodes = specificNonTerminalNodeChildNode, ///
124
- childNodesUnified = this.unifyChildNodes(generalChildNodes, specificChildNodes, ...remainingArguments);
124
+ childNodesUnify = this.unifyChildNodes(generalChildNodes, specificChildNodes, ...remainingArguments);
125
125
 
126
- nonTerminalNodeUnified = childNodesUnified; ///
126
+ nonTerminalNodeUnifies = childNodesUnify; ///
127
127
  }
128
128
 
129
- return nonTerminalNodeUnified;
129
+ return nonTerminalNodeUnifies;
130
130
  }
131
131
  }
132
132
  ]
133
133
 
134
- let nodeUnified = false;
134
+ let nodeUnifies = false;
135
135
 
136
136
  maps.some((map) => {
137
137
  const { generalNodeQuery, specificNodeQuery, unify } = map;
@@ -140,44 +140,44 @@ export default class Unifier {
140
140
  specificNode = specificNodeQuery(specificNonTerminalNode); ///
141
141
 
142
142
  if ((generalNode !== null) && (specificNode !== null)) {
143
- nodeUnified = unify(generalNode, specificNode, ...remainingArguments);
143
+ nodeUnifies = unify(generalNode, specificNode, ...remainingArguments);
144
144
 
145
145
  return true;
146
146
  }
147
147
  });
148
148
 
149
- nonTerminalNodeUnified = nodeUnified; ///
149
+ nonTerminalNodeUnifies = nodeUnifies; ///
150
150
 
151
- return nonTerminalNodeUnified;
151
+ return nonTerminalNodeUnifies;
152
152
  }
153
153
 
154
154
  unifyChildNodesAhead(index, generalChildNodes, specificChildNodes, ...remainingArguments) {
155
- let childNodesUnified;
155
+ let childNodesUnify;
156
156
 
157
157
  const unifyAhead = remainingArguments.pop(), ///
158
158
  generalChildNodesLength = generalChildNodes.length;
159
159
 
160
160
  if (index === generalChildNodesLength) {
161
- const unifiedAhead = unifyAhead();
161
+ const unifiesAhead = unifyAhead();
162
162
 
163
- childNodesUnified = unifiedAhead; ///
163
+ childNodesUnify = unifiesAhead; ///
164
164
  } else {
165
165
  const generalChildNode = generalChildNodes[index],
166
166
  specificChildNode = specificChildNodes[index],
167
167
  generalNode = generalChildNode, ///
168
168
  specificNode = specificChildNode, ///
169
- nodeUnified = this.unifyNode(generalNode, specificNode, ...remainingArguments, () => {
169
+ nodeUnifies = this.unifyNode(generalNode, specificNode, ...remainingArguments, () => {
170
170
  remainingArguments.push(unifyAhead); ///
171
171
 
172
172
  const aheadIndex = index + 1,
173
- childNodesUnifiedAhead = this.unifyChildNodesAhead(aheadIndex, generalChildNodes, specificChildNodes, ...remainingArguments);
173
+ childNodesUnifyAhead = this.unifyChildNodesAhead(aheadIndex, generalChildNodes, specificChildNodes, ...remainingArguments);
174
174
 
175
- return childNodesUnifiedAhead;
175
+ return childNodesUnifyAhead;
176
176
  });
177
177
 
178
- childNodesUnified = nodeUnified; ///
178
+ childNodesUnify = nodeUnifies; ///
179
179
  }
180
180
 
181
- return childNodesUnified;
181
+ return childNodesUnify;
182
182
  }
183
183
  }
@@ -15,7 +15,7 @@ export function stripBracketsFromTerm(term, context) {
15
15
  const { Term } = dom,
16
16
  termNode = bracketedTermChildNode; ///
17
17
 
18
- term = Term.fromStatementNode(termNode, context);
18
+ term = Term.fromTermNode(termNode, context);
19
19
  }
20
20
 
21
21
  return term;
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
 
3
3
  function verifyRelease(releaseName, dependentName, dependentReleased, releaseContextMap) {
4
- let releaseVerified = false;
4
+ let releaseVerifies = false;
5
5
 
6
6
  const releaseContext = releaseContextMap[releaseName];
7
7
 
@@ -9,37 +9,37 @@ function verifyRelease(releaseName, dependentName, dependentReleased, releaseCon
9
9
  const released = releaseContext.isReleased();
10
10
 
11
11
  if (released) {
12
- releaseVerified = true;
12
+ releaseVerifies = true;
13
13
  } else {
14
14
  if (dependentReleased) {
15
- releaseContext.warning(`The '${releaseName}' project cannot be verified because its '${dependentName}' dependent is a package.`);
15
+ releaseContext.warning(`The '${releaseName}' project cannot be verifies because its '${dependentName}' dependent is a package.`);
16
16
  } else {
17
17
  const dependentName = releaseName, ///
18
18
  dependentReleased = released, ///
19
- dependencyReleasesVVerified = verifyDependencyReleases(releaseContext, dependentName, dependentReleased, releaseContextMap);
19
+ dependencyReleasesVVerifies = verifyDependencyReleases(releaseContext, dependentName, dependentReleased, releaseContextMap);
20
20
 
21
- if (dependencyReleasesVVerified) {
22
- let releaseContextVerified;
21
+ if (dependencyReleasesVVerifies) {
22
+ const releaseContextVerified = releaseContext.isVerified();
23
23
 
24
- releaseContextVerified = releaseContext.isVerified();
25
-
26
- if (!releaseContextVerified) {
24
+ if (releaseContextVerified) {
25
+ releaseVerifies = true;
26
+ } else {
27
27
  releaseContext.info(`Verifying the '${releaseName}' project...`);
28
28
 
29
- releaseContextVerified = releaseContext.verify();
29
+ const releaseContextVerifies = releaseContext.verify();
30
30
 
31
- if (releaseContextVerified) {
31
+ if (releaseContextVerifies) {
32
32
  releaseContext.info(`...verified the '${releaseName}' project.`);
33
+
34
+ releaseVerifies = true;
33
35
  }
34
36
  }
35
-
36
- releaseVerified = releaseContextVerified; ///
37
37
  }
38
38
  }
39
39
  }
40
40
  }
41
41
 
42
- return releaseVerified;
42
+ return releaseVerifies;
43
43
  }
44
44
 
45
45
  export default {
@@ -48,15 +48,15 @@ export default {
48
48
 
49
49
  function verifyDependencyReleases(releaseContext, dependentName, dependentReleased, releaseContextMap) {
50
50
  const dependencies = releaseContext.getDependencies(),
51
- dependencyReleasesVVerified = dependencies.everyDependency((dependency) => {
51
+ dependencyReleasesVVerifies = dependencies.everyDependency((dependency) => {
52
52
  const name = dependency.getName(),
53
53
  releaseName = name, ///
54
- releaseVerified = verifyRelease(releaseName, dependentName, dependentReleased, releaseContextMap);
54
+ releaseVerifies = verifyRelease(releaseName, dependentName, dependentReleased, releaseContextMap);
55
55
 
56
- if (releaseVerified) {
56
+ if (releaseVerifies) {
57
57
  return true;
58
58
  }
59
59
  });
60
60
 
61
- return dependencyReleasesVVerified;
61
+ return dependencyReleasesVVerifies;
62
62
  }
@@ -3,7 +3,7 @@
3
3
  export function subproofStringFromSubproofNode(subproofNode, fileContext) {
4
4
  const suppositionStatementsOrNonsenseString = suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, fileContext),
5
5
  lastStatementOrNonsenseString = lastStatementOrNonsenseStringFromSubproofNode(subproofNode, fileContext),
6
- subproofString = `[${suppositionStatementsOrNonsenseString}]...${lastStatementOrNonsenseString}`;
6
+ subproofString = `[${suppositionStatementsOrNonsenseString}] ... ${lastStatementOrNonsenseString}`;
7
7
 
8
8
  return subproofString;
9
9
  }
@@ -5,7 +5,7 @@ import { objectType } from "../dom/type";
5
5
  export function stringFromTypeNameNameAndSuperTypes(typeName, superTypes) {
6
6
  const superTypesString = superTypesStringFromSuperTypes(superTypes),
7
7
  string = (superTypesString !== null) ?
8
- `${typeName}:${superTypesString}` :
8
+ `'${typeName}':${superTypesString}` :
9
9
  typeName; ///
10
10
 
11
11
  return string;