occam-verify-cli 0.0.845 → 0.0.847

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 (73) hide show
  1. package/lib/assignment/equality.js +4 -4
  2. package/lib/assignment/variable.js +4 -4
  3. package/lib/conclusion.js +5 -5
  4. package/lib/context/local.js +14 -1
  5. package/lib/equality.js +5 -3
  6. package/lib/equivalence.js +17 -17
  7. package/lib/mixins/nodesVerifier/intrinsiclevel.js +2 -2
  8. package/lib/mixins/nodesVerifier/metaLevel.js +2 -2
  9. package/lib/premise.js +6 -5
  10. package/lib/term.js +9 -9
  11. package/lib/utilities/equivalences.js +14 -14
  12. package/lib/verifier/node/metastatement.js +5 -4
  13. package/lib/verifier/node/statementAsCombinator.js +6 -6
  14. package/lib/verifier/node/termAsConstructor.js +5 -5
  15. package/lib/verifier/nodes/metaLevel.js +7 -7
  16. package/lib/verifier/nodes/metaLevelToIntrinsicLevel.js +18 -19
  17. package/lib/verifier/nodes/statementAgainstCombinator.js +11 -11
  18. package/lib/verifier/nodes/substitution.js +13 -11
  19. package/lib/verifier/nodes/termAgainstConstructor.js +10 -10
  20. package/lib/verify/containment.js +2 -2
  21. package/lib/verify/defining.js +6 -6
  22. package/lib/verify/equality.js +17 -17
  23. package/lib/verify/givenType.js +6 -6
  24. package/lib/verify/givenVariable.js +6 -6
  25. package/lib/verify/metavariable.js +6 -6
  26. package/lib/verify/statement/qualified.js +13 -13
  27. package/lib/verify/statement/unqualified.js +2 -2
  28. package/lib/verify/statement.js +40 -40
  29. package/lib/verify/statementAsCombinator.js +2 -1
  30. package/lib/verify/term.js +30 -30
  31. package/lib/verify/termAndGivenType.js +7 -7
  32. package/lib/verify/termAsConstructor.js +3 -2
  33. package/lib/verify/terms.js +7 -7
  34. package/lib/verify/type.js +7 -7
  35. package/lib/verify/typeAssertion.js +19 -19
  36. package/lib/verify/variable.js +6 -6
  37. package/package.json +2 -2
  38. package/src/assignment/equality.js +5 -5
  39. package/src/assignment/variable.js +5 -5
  40. package/src/conclusion.js +6 -6
  41. package/src/context/local.js +12 -0
  42. package/src/equality.js +6 -4
  43. package/src/equivalence.js +16 -16
  44. package/src/mixins/nodesVerifier/intrinsiclevel.js +2 -2
  45. package/src/mixins/nodesVerifier/metaLevel.js +1 -1
  46. package/src/premise.js +9 -4
  47. package/src/term.js +8 -8
  48. package/src/utilities/equivalences.js +13 -13
  49. package/src/verifier/node/metastatement.js +8 -9
  50. package/src/verifier/node/statementAsCombinator.js +8 -11
  51. package/src/verifier/node/termAsConstructor.js +6 -8
  52. package/src/verifier/nodes/metaLevel.js +6 -6
  53. package/src/verifier/nodes/metaLevelToIntrinsicLevel.js +15 -19
  54. package/src/verifier/nodes/statementAgainstCombinator.js +10 -10
  55. package/src/verifier/nodes/substitution.js +18 -15
  56. package/src/verifier/nodes/termAgainstConstructor.js +9 -9
  57. package/src/verify/containment.js +1 -1
  58. package/src/verify/defining.js +5 -5
  59. package/src/verify/equality.js +16 -16
  60. package/src/verify/givenType.js +5 -5
  61. package/src/verify/givenVariable.js +5 -5
  62. package/src/verify/metavariable.js +5 -5
  63. package/src/verify/statement/qualified.js +12 -13
  64. package/src/verify/statement/unqualified.js +1 -2
  65. package/src/verify/statement.js +39 -39
  66. package/src/verify/statementAsCombinator.js +1 -0
  67. package/src/verify/term.js +29 -29
  68. package/src/verify/termAndGivenType.js +7 -7
  69. package/src/verify/termAsConstructor.js +3 -1
  70. package/src/verify/terms.js +7 -7
  71. package/src/verify/type.js +6 -6
  72. package/src/verify/typeAssertion.js +18 -18
  73. package/src/verify/variable.js +5 -5
package/src/verify/typeAssertion.js CHANGED
@@ -12,12 +12,12 @@ const termNodeQuery = nodeQuery("/typeAssertion/term!"),
12
12
  typeNodeQuery = nodeQuery("/typeAssertion/type!"),
13
13
  variableNodeQuery = nodeQuery("/term/variable!");
14
14
 
15
- export default function verifyTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
15
+ export default function verifyTypeAssertion(typeAssertionNode, assignments, derived, localContext, verifyAhead) {
16
16
  let typeAssertionVerified;
17
17
 
18
- const typeAssertionString = context.nodeAsString(typeAssertionNode);
18
+ const typeAssertionString = localContext.nodeAsString(typeAssertionNode);
19
19
 
20
- context.trace(`Verifying the '${typeAssertionString}' type assertion...`, typeAssertionNode);
20
+ localContext.trace(`Verifying the '${typeAssertionString}' type assertion...`, typeAssertionNode);
21
21
 
22
22
  const verifyTypeAssertionFunctions = [
23
23
  verifyDerivedTypeAssertion,
@@ -25,7 +25,7 @@ export default function verifyTypeAssertion(typeAssertionNode, assignments, deri
25
25
  ];
26
26
 
27
27
  typeAssertionVerified = verifyTypeAssertionFunctions.some((verifyTypeAssertionFunction) => {
28
- const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, derived, context, verifyAhead);
28
+ const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, derived, localContext, verifyAhead);
29
29
 
30
30
  if (typeAssertionVerified) {
31
31
  return true;
@@ -33,32 +33,32 @@ export default function verifyTypeAssertion(typeAssertionNode, assignments, deri
33
33
  });
34
34
 
35
35
  if (typeAssertionVerified) {
36
- context.debug(`...verified the '${typeAssertionString}' type assertion.`, typeAssertionNode);
36
+ localContext.debug(`...verified the '${typeAssertionString}' type assertion.`, typeAssertionNode);
37
37
  }
38
38
 
39
39
  return typeAssertionVerified;
40
40
  }
41
41
 
42
- function verifyDerivedTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
42
+ function verifyDerivedTypeAssertion(typeAssertionNode, assignments, derived, localContext, verifyAhead) {
43
43
  let derivedTypeAssertionVerified = false;
44
44
 
45
45
  if (derived) {
46
- const typeAssertionString = context.nodeAsString(typeAssertionNode);
46
+ const typeAssertionString = localContext.nodeAsString(typeAssertionNode);
47
47
 
48
- context.trace(`Verifying the '${typeAssertionString}' derived type assertion...`, typeAssertionNode);
48
+ localContext.trace(`Verifying the '${typeAssertionString}' derived type assertion...`, typeAssertionNode);
49
49
 
50
50
  const terms = [],
51
51
  types = [],
52
52
  termNode = termNodeQuery(typeAssertionNode),
53
53
  typeNode = typeNodeQuery(typeAssertionNode),
54
- termAndGivenTypeVerified = verifyTermAndGivenType(termNode, typeNode, terms, types, context, () => {
54
+ termAndGivenTypeVerified = verifyTermAndGivenType(termNode, typeNode, terms, types, localContext, () => {
55
55
  let verifiedAhead = false;
56
56
 
57
57
  const firstTerm = first(terms),
58
58
  firstType = first(types),
59
59
  term = firstTerm, ///
60
60
  type = firstType, ///
61
- termType = context.getTermType(term),
61
+ termType = localContext.getTermType(term),
62
62
  typeEqualToOrSuperTypeOfTermType = type.isEqualToOrSuperTypeOf(termType);
63
63
 
64
64
  if (typeEqualToOrSuperTypeOfTermType) {
@@ -67,7 +67,7 @@ function verifyDerivedTypeAssertion(typeAssertionNode, assignments, derived, con
67
67
  if (variableNode === null) {
68
68
  verifiedAhead = verifyAhead();
69
69
  } else {
70
- let variable = context.findVariableByVariableNode(variableNode);
70
+ let variable = localContext.findVariableByVariableNode(variableNode);
71
71
 
72
72
  variable = Variable.fromVariableAndType(variable, type);
73
73
 
@@ -90,26 +90,26 @@ function verifyDerivedTypeAssertion(typeAssertionNode, assignments, derived, con
90
90
  derivedTypeAssertionVerified = termAndGivenTypeVerified; ///
91
91
 
92
92
  if (derivedTypeAssertionVerified) {
93
- context.trace(`...verified the '${typeAssertionString}' derived type assertion.`, typeAssertionNode);
93
+ localContext.trace(`...verified the '${typeAssertionString}' derived type assertion.`, typeAssertionNode);
94
94
  }
95
95
  }
96
96
 
97
97
  return derivedTypeAssertionVerified;
98
98
  }
99
99
 
100
- function verifyGivenTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
100
+ function verifyGivenTypeAssertion(typeAssertionNode, assignments, derived, localContext, verifyAhead) {
101
101
  let givenTypeAssertionVerified = false;
102
102
 
103
103
  if (!derived) {
104
- const typeAssertionString = context.nodeAsString(typeAssertionNode);
104
+ const typeAssertionString = localContext.nodeAsString(typeAssertionNode);
105
105
 
106
- context.trace(`Verifying the '${typeAssertionString}' given type assertion...`, typeAssertionNode);
106
+ localContext.trace(`Verifying the '${typeAssertionString}' given type assertion...`, typeAssertionNode);
107
107
 
108
108
  const terms = [],
109
109
  types = [],
110
110
  termNode = termNodeQuery(typeAssertionNode),
111
111
  typeNode = typeNodeQuery(typeAssertionNode),
112
- termAndGivenTypeVerified = verifyTermAndGivenType(termNode, typeNode, terms, types, context, () => {
112
+ termAndGivenTypeVerified = verifyTermAndGivenType(termNode, typeNode, terms, types, localContext, () => {
113
113
  let verifiedAhead = false;
114
114
 
115
115
  const firstTerm = first(terms),
@@ -125,7 +125,7 @@ function verifyGivenTypeAssertion(typeAssertionNode, assignments, derived, conte
125
125
  if (variableNode === null) {
126
126
  verifiedAhead = verifyAhead();
127
127
  } else {
128
- let variable = context.findVariableByVariableNode(variableNode);
128
+ let variable = localContext.findVariableByVariableNode(variableNode);
129
129
 
130
130
  variable = Variable.fromVariableAndType(variable, type);
131
131
 
@@ -148,7 +148,7 @@ function verifyGivenTypeAssertion(typeAssertionNode, assignments, derived, conte
148
148
  givenTypeAssertionVerified = termAndGivenTypeVerified; ///
149
149
 
150
150
  if (givenTypeAssertionVerified) {
151
- context.trace(`...verified the '${typeAssertionString}' given type assertion.`, typeAssertionNode);
151
+ localContext.trace(`...verified the '${typeAssertionString}' given type assertion.`, typeAssertionNode);
152
152
  }
153
153
  }
154
154
 
package/src/verify/variable.js CHANGED
@@ -53,14 +53,14 @@ export default function verifyVariable(variableNode, typeNode, fileContext) {
53
53
  return variableVerified;
54
54
  }
55
55
 
56
- export function verifyStandaloneVariable(variableNode, context, verifyAhead) {
56
+ export function verifyStandaloneVariable(variableNode, localMetaContext, verifyAhead) {
57
57
  let standaloneVariableVerified = false;
58
58
 
59
- const variableString = context.nodeAsString(variableNode);
59
+ const variableString = localMetaContext.nodeAsString(variableNode);
60
60
 
61
- context.trace(`Verifying the '${variableString}' standalone variable...`, variableNode);
61
+ localMetaContext.trace(`Verifying the '${variableString}' standalone variable...`, variableNode);
62
62
 
63
- const variablePresent = context.isVariablePresentByVariableNode(variableNode);
63
+ const variablePresent = localMetaContext.isVariablePresentByVariableNode(variableNode);
64
64
 
65
65
  if (variablePresent) {
66
66
  const verifiedAhead = verifyAhead();
@@ -69,7 +69,7 @@ export function verifyStandaloneVariable(variableNode, context, verifyAhead) {
69
69
  }
70
70
 
71
71
  if (standaloneVariableVerified) {
72
- context.debug(`...verified the '${variableString}' standalone variable.`, variableNode);
72
+ localMetaContext.debug(`...verified the '${variableString}' standalone variable.`, variableNode);
73
73
  }
74
74
 
75
75
  return standaloneVariableVerified;