occam-verify-cli 0.0.1188 → 0.0.1190
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/dom/assertion/subproof.js +10 -9
- package/lib/dom/declaration/metavariable.js +6 -2
- package/lib/dom/derivation.js +9 -5
- package/lib/dom/equality.js +10 -2
- package/lib/dom/frame.js +16 -8
- package/lib/dom/judgement.js +10 -2
- package/lib/dom/procedureCall.js +11 -3
- package/lib/dom/rule.js +24 -8
- package/lib/dom/subDerivation.js +9 -5
- package/lib/dom/subproof.js +13 -5
- package/lib/dom/term.js +10 -16
- package/lib/dom/topLevelAssertion.js +24 -8
- package/lib/dom/type.js +10 -2
- package/lib/dom/variable.js +6 -2
- package/package.json +2 -2
- package/src/dom/assertion/subproof.js +16 -15
- package/src/dom/declaration/metavariable.js +10 -3
- package/src/dom/derivation.js +15 -9
- package/src/dom/equality.js +20 -7
- package/src/dom/frame.js +27 -14
- package/src/dom/judgement.js +19 -6
- package/src/dom/procedureCall.js +11 -3
- package/src/dom/rule.js +44 -17
- package/src/dom/subDerivation.js +15 -9
- package/src/dom/subproof.js +23 -10
- package/src/dom/term.js +14 -23
- package/src/dom/topLevelAssertion.js +44 -17
- package/src/dom/type.js +18 -6
- package/src/dom/variable.js +12 -6
- package/lib/dom/proofStep.old.js +0 -246
- package/src/dom/proofStep.old.js +0 -183
package/src/dom/subproof.js
CHANGED
|
@@ -145,17 +145,10 @@ export default domAssigned(class Subproof {
|
|
|
145
145
|
const subproofNode = subproofNodeQuery(proofStepSubproofNode);
|
|
146
146
|
|
|
147
147
|
if (subproofNode !== null) {
|
|
148
|
-
const
|
|
149
|
-
subproofString = subproofStringFromSubproofNode(subproofNode, fileContext),
|
|
150
|
-
suppositionNodes = suppositionNodesQuery(subproofNode),
|
|
151
|
-
subDerivationNode = subDerivationNodeQuery(subproofNode),
|
|
148
|
+
const subproofString = subproofStringFromSubproofNode(subproofNode, fileContext),
|
|
152
149
|
string = subproofString, ///
|
|
153
|
-
suppositions =
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
return supposition;
|
|
157
|
-
}),
|
|
158
|
-
subDerivation = SubDerivation.fromSubDerivationNode(subDerivationNode, fileContext);
|
|
150
|
+
suppositions = suppositionsFromSubproofNode(subproofNode, fileContext),
|
|
151
|
+
subDerivation = subDerivationFromSubproofNode(subproofNode, fileContext);
|
|
159
152
|
|
|
160
153
|
subproof = new Subproof(string, suppositions, subDerivation);
|
|
161
154
|
}
|
|
@@ -163,3 +156,23 @@ export default domAssigned(class Subproof {
|
|
|
163
156
|
return subproof;
|
|
164
157
|
}
|
|
165
158
|
});
|
|
159
|
+
|
|
160
|
+
function suppositionsFromSubproofNode(subproofNode, fileContext) {
|
|
161
|
+
const { Supposition } = dom,
|
|
162
|
+
suppositionNodes = suppositionNodesQuery(subproofNode),
|
|
163
|
+
suppositions = suppositionNodes.map((suppositionNode) => {
|
|
164
|
+
const supposition = Supposition.fromSuppositionNode(suppositionNode, fileContext);
|
|
165
|
+
|
|
166
|
+
return supposition;
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
return suppositions;
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
function subDerivationFromSubproofNode(subproofNode, fileContext) {
|
|
173
|
+
const { SubDerivation } = dom,
|
|
174
|
+
subDerivationNode = subDerivationNodeQuery(subproofNode),
|
|
175
|
+
subDerivation = SubDerivation.fromSubDerivationNode(subDerivationNode, fileContext);
|
|
176
|
+
|
|
177
|
+
return subDerivation;
|
|
178
|
+
}
|
package/src/dom/term.js
CHANGED
|
@@ -14,9 +14,8 @@ import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
|
|
|
14
14
|
|
|
15
15
|
const { filter, compress } = arrayUtilities;
|
|
16
16
|
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
variableNodesQuery = nodesQuery("//variable");
|
|
17
|
+
const variableNodesQuery = nodesQuery("//variable"),
|
|
18
|
+
termVariableNodeQuery = nodeQuery("/*/term[0]/variable!");
|
|
20
19
|
|
|
21
20
|
export default domAssigned(class Term {
|
|
22
21
|
constructor(string, node, type) {
|
|
@@ -279,18 +278,14 @@ export default domAssigned(class Term {
|
|
|
279
278
|
static fromDefinedAssertionNode(definedAssertionNode, context) {
|
|
280
279
|
let term = null;
|
|
281
280
|
|
|
282
|
-
const
|
|
281
|
+
const termVariableNode = termVariableNodeQuery(definedAssertionNode);
|
|
283
282
|
|
|
284
|
-
if (
|
|
285
|
-
const
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
const node = termNode, ///
|
|
289
|
-
string = context.nodeAsString(node),
|
|
290
|
-
type = null;
|
|
283
|
+
if (termVariableNode !== null) {
|
|
284
|
+
const node = termVariableNode, ///
|
|
285
|
+
string = context.nodeAsString(node),
|
|
286
|
+
type = null;
|
|
291
287
|
|
|
292
|
-
|
|
293
|
-
}
|
|
288
|
+
term = new Term(string, node, type);
|
|
294
289
|
}
|
|
295
290
|
|
|
296
291
|
return term;
|
|
@@ -299,18 +294,14 @@ export default domAssigned(class Term {
|
|
|
299
294
|
static fromContainedAssertionNode(containedAssertionNode, context) {
|
|
300
295
|
let term = null;
|
|
301
296
|
|
|
302
|
-
const
|
|
297
|
+
const termVariableNode = termVariableNodeQuery(containedAssertionNode);
|
|
303
298
|
|
|
304
|
-
if (
|
|
305
|
-
const
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
const node = termNode, ///
|
|
309
|
-
string = context.nodeAsString(node),
|
|
310
|
-
type = null;
|
|
299
|
+
if (termVariableNode !== null) {
|
|
300
|
+
const node = termVariableNode, ///
|
|
301
|
+
string = context.nodeAsString(node),
|
|
302
|
+
type = null;
|
|
311
303
|
|
|
312
|
-
|
|
313
|
-
}
|
|
304
|
+
term = new Term(string, node, type);
|
|
314
305
|
}
|
|
315
306
|
|
|
316
307
|
return term;
|
|
@@ -289,24 +289,11 @@ export default class TopLevelAssertion {
|
|
|
289
289
|
}
|
|
290
290
|
|
|
291
291
|
static fromNode(Class, node, fileContext) {
|
|
292
|
-
const
|
|
293
|
-
proofNode = proofNodeQuery(node),
|
|
294
|
-
labelNodes = labelNodesQuery(node),
|
|
295
|
-
consequentNode = consequentNodeQuery(node),
|
|
296
|
-
suppositionNodes = suppositionNodesQuery(node),
|
|
297
|
-
labels = labelNodes.map((labelNode) => {
|
|
298
|
-
const label = Label.fromLabelNode(labelNode, fileContext);
|
|
299
|
-
|
|
300
|
-
return label;
|
|
301
|
-
}),
|
|
292
|
+
const labels = labelsFromNode(node, fileContext),
|
|
302
293
|
substitutions = Substitutions.fromNothing(),
|
|
303
|
-
suppositions =
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
return supposition;
|
|
307
|
-
}),
|
|
308
|
-
consequent = Consequent.fromConsequentNode(consequentNode, fileContext),
|
|
309
|
-
proof = Proof.fromProofNode(proofNode, fileContext),
|
|
294
|
+
suppositions = suppositionsFromNode(node, fileContext),
|
|
295
|
+
consequent = consequentFromNode(node, fileContext),
|
|
296
|
+
proof = proofFromNode(node, fileContext),
|
|
310
297
|
string = stringFromLabels(labels),
|
|
311
298
|
metaLemma = new Class(fileContext, string, labels, substitutions, suppositions, consequent, proof);
|
|
312
299
|
|
|
@@ -328,3 +315,43 @@ export function stringFromLabels(labels) {
|
|
|
328
315
|
return string;
|
|
329
316
|
}
|
|
330
317
|
|
|
318
|
+
function proofFromNode(node, fileContext) {
|
|
319
|
+
const { Proof } = dom,
|
|
320
|
+
proofNode = proofNodeQuery(node),
|
|
321
|
+
proof = Proof.fromProofNode(proofNode, fileContext);
|
|
322
|
+
|
|
323
|
+
return proof;
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
function labelsFromNode(node, fileContext) {
|
|
327
|
+
const { Label } = dom,
|
|
328
|
+
labelNodes = labelNodesQuery(node),
|
|
329
|
+
labels = labelNodes.map((labelNode) => {
|
|
330
|
+
const label = Label.fromLabelNode(labelNode, fileContext);
|
|
331
|
+
|
|
332
|
+
return label;
|
|
333
|
+
});
|
|
334
|
+
|
|
335
|
+
return labels;
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
function consequentFromNode(node, fileContext) {
|
|
339
|
+
const { Consequent } = dom,
|
|
340
|
+
consequentNode = consequentNodeQuery(node),
|
|
341
|
+
consequent = Consequent.fromConsequentNode(consequentNode, fileContext);
|
|
342
|
+
|
|
343
|
+
return consequent;
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
function suppositionsFromNode(node, fileContext) {
|
|
347
|
+
const { Supposition } = dom,
|
|
348
|
+
suppositionNodes = suppositionNodesQuery(node),
|
|
349
|
+
suppositions = suppositionNodes.map((suppositionNode) => {
|
|
350
|
+
const supposition = Supposition.fromSuppositionNode(suppositionNode, fileContext);
|
|
351
|
+
|
|
352
|
+
return supposition;
|
|
353
|
+
});
|
|
354
|
+
|
|
355
|
+
return suppositions;
|
|
356
|
+
}
|
|
357
|
+
|
package/src/dom/type.js
CHANGED
|
@@ -178,12 +178,8 @@ class Type {
|
|
|
178
178
|
}
|
|
179
179
|
|
|
180
180
|
static fromTypeDeclarationNode(typeDeclarationNode, fileContext) {
|
|
181
|
-
const
|
|
182
|
-
|
|
183
|
-
typeNode = typeDeclarationTypeNode, ///
|
|
184
|
-
superTypeNode = typeDeclarationSuperTypeNode, ///
|
|
185
|
-
typeName = typeNameFromTypeNode(typeNode),
|
|
186
|
-
superType = Type.fromTypeNode(superTypeNode),
|
|
181
|
+
const typeName = typeNameFromTypeDeclarationNode(typeDeclarationNode, fileContext),
|
|
182
|
+
superType = superTypeFromTypeDeclarationNode(typeDeclarationNode, fileContext),
|
|
187
183
|
string = stringFromTypeNameAndSuperType(typeName, superType),
|
|
188
184
|
name = typeName, ///
|
|
189
185
|
type = new Type(string, name, superType);
|
|
@@ -222,6 +218,22 @@ function stringFromTypeNameAndSuperType(typeName, superType) {
|
|
|
222
218
|
return string;
|
|
223
219
|
}
|
|
224
220
|
|
|
221
|
+
function typeNameFromTypeDeclarationNode(typeDeclarationNode, fileContext) {
|
|
222
|
+
const typeDeclarationTypeNode = typeDeclarationTypeNodeQuery(typeDeclarationNode),
|
|
223
|
+
typeNode = typeDeclarationTypeNode, ///
|
|
224
|
+
typeName = typeNameFromTypeNode(typeNode);
|
|
225
|
+
|
|
226
|
+
return typeName;
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
function superTypeFromTypeDeclarationNode(typeDeclarationNode, fileContext) {
|
|
230
|
+
const typeDeclarationSuperTypeNode = typeDeclarationSuperTypeNodeQuery(typeDeclarationNode),
|
|
231
|
+
superTypeNode = typeDeclarationSuperTypeNode, ///
|
|
232
|
+
superType = Type.fromTypeNode(superTypeNode);
|
|
233
|
+
|
|
234
|
+
return superType;
|
|
235
|
+
}
|
|
236
|
+
|
|
225
237
|
class ObjectType extends Type {
|
|
226
238
|
toJSON() {
|
|
227
239
|
const superType = null,
|
package/src/dom/variable.js
CHANGED
|
@@ -287,20 +287,26 @@ export default domAssigned(class Variable {
|
|
|
287
287
|
}
|
|
288
288
|
|
|
289
289
|
static fromVariableDeclarationNode(variableDeclarationNode, fileContext) {
|
|
290
|
-
const
|
|
291
|
-
variableDeclarationTypeNode = variableDeclarationTypeNodeQuery(variableDeclarationNode),
|
|
292
|
-
variableDeclarationVariableNode = variableDeclarationVariableNodeQuery(variableDeclarationNode),
|
|
293
|
-
typeNode = variableDeclarationTypeNode, ///
|
|
290
|
+
const variableDeclarationVariableNode = variableDeclarationVariableNodeQuery(variableDeclarationNode),
|
|
294
291
|
variableNode = variableDeclarationVariableNode, ///
|
|
295
292
|
variableName = variableNameFromVariableNode(variableNode),
|
|
296
|
-
context = LocalContext.fromFileContext(fileContext),
|
|
297
293
|
variableString = fileContext.nodeAsString(variableNode),
|
|
298
294
|
string = variableString, ///
|
|
299
295
|
node = variableNode, ///
|
|
300
296
|
name = variableName, ///
|
|
301
|
-
type =
|
|
297
|
+
type = typeFromVariableDeclarationNode(variableDeclarationNode, fileContext),
|
|
302
298
|
variable = new Variable(string, node, name, type);
|
|
303
299
|
|
|
304
300
|
return variable;
|
|
305
301
|
}
|
|
306
302
|
});
|
|
303
|
+
|
|
304
|
+
function typeFromVariableDeclarationNode(variableDeclarationNode, fileContext) {
|
|
305
|
+
const { Type } = dom,
|
|
306
|
+
variableDeclarationTypeNode = variableDeclarationTypeNodeQuery(variableDeclarationNode),
|
|
307
|
+
typeNode = variableDeclarationTypeNode, ///
|
|
308
|
+
context = LocalContext.fromFileContext(fileContext),
|
|
309
|
+
type = Type.fromTypeNode(typeNode, context);
|
|
310
|
+
|
|
311
|
+
return type;
|
|
312
|
+
}
|
package/lib/dom/proofStep.old.js
DELETED
|
@@ -1,246 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
Object.defineProperty(exports, "default", {
|
|
6
|
-
enumerable: true,
|
|
7
|
-
get: function() {
|
|
8
|
-
return _default;
|
|
9
|
-
}
|
|
10
|
-
});
|
|
11
|
-
var _dom = /*#__PURE__*/ _interop_require_wildcard(require("../dom"));
|
|
12
|
-
var _unify = /*#__PURE__*/ _interop_require_default(require("../mixins/proofStep/unify"));
|
|
13
|
-
var _substitutions = /*#__PURE__*/ _interop_require_default(require("../substitutions"));
|
|
14
|
-
var _assignments = require("../utilities/assignments");
|
|
15
|
-
function _class_call_check(instance, Constructor) {
|
|
16
|
-
if (!(instance instanceof Constructor)) {
|
|
17
|
-
throw new TypeError("Cannot call a class as a function");
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
function _defineProperties(target, props) {
|
|
21
|
-
for(var i = 0; i < props.length; i++){
|
|
22
|
-
var descriptor = props[i];
|
|
23
|
-
descriptor.enumerable = descriptor.enumerable || false;
|
|
24
|
-
descriptor.configurable = true;
|
|
25
|
-
if ("value" in descriptor) descriptor.writable = true;
|
|
26
|
-
Object.defineProperty(target, descriptor.key, descriptor);
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
function _create_class(Constructor, protoProps, staticProps) {
|
|
30
|
-
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
|
|
31
|
-
if (staticProps) _defineProperties(Constructor, staticProps);
|
|
32
|
-
return Constructor;
|
|
33
|
-
}
|
|
34
|
-
function _define_property(obj, key, value) {
|
|
35
|
-
if (key in obj) {
|
|
36
|
-
Object.defineProperty(obj, key, {
|
|
37
|
-
value: value,
|
|
38
|
-
enumerable: true,
|
|
39
|
-
configurable: true,
|
|
40
|
-
writable: true
|
|
41
|
-
});
|
|
42
|
-
} else {
|
|
43
|
-
obj[key] = value;
|
|
44
|
-
}
|
|
45
|
-
return obj;
|
|
46
|
-
}
|
|
47
|
-
function _interop_require_default(obj) {
|
|
48
|
-
return obj && obj.__esModule ? obj : {
|
|
49
|
-
default: obj
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
function _getRequireWildcardCache(nodeInterop) {
|
|
53
|
-
if (typeof WeakMap !== "function") return null;
|
|
54
|
-
var cacheBabelInterop = new WeakMap();
|
|
55
|
-
var cacheNodeInterop = new WeakMap();
|
|
56
|
-
return (_getRequireWildcardCache = function(nodeInterop) {
|
|
57
|
-
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
58
|
-
})(nodeInterop);
|
|
59
|
-
}
|
|
60
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
61
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
62
|
-
return obj;
|
|
63
|
-
}
|
|
64
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
65
|
-
return {
|
|
66
|
-
default: obj
|
|
67
|
-
};
|
|
68
|
-
}
|
|
69
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
70
|
-
if (cache && cache.has(obj)) {
|
|
71
|
-
return cache.get(obj);
|
|
72
|
-
}
|
|
73
|
-
var newObj = {
|
|
74
|
-
__proto__: null
|
|
75
|
-
};
|
|
76
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
77
|
-
for(var key in obj){
|
|
78
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
79
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
80
|
-
if (desc && (desc.get || desc.set)) {
|
|
81
|
-
Object.defineProperty(newObj, key, desc);
|
|
82
|
-
} else {
|
|
83
|
-
newObj[key] = obj[key];
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
newObj.default = obj;
|
|
88
|
-
if (cache) {
|
|
89
|
-
cache.set(obj, newObj);
|
|
90
|
-
}
|
|
91
|
-
return newObj;
|
|
92
|
-
}
|
|
93
|
-
var _ProofStep;
|
|
94
|
-
var _default = (0, _dom.domAssigned)((_ProofStep = /*#__PURE__*/ function() {
|
|
95
|
-
function ProofStep(string, subproof, statement, reference) {
|
|
96
|
-
_class_call_check(this, ProofStep);
|
|
97
|
-
this.string = string;
|
|
98
|
-
this.subproof = subproof;
|
|
99
|
-
this.statement = statement;
|
|
100
|
-
this.reference = reference;
|
|
101
|
-
}
|
|
102
|
-
_create_class(ProofStep, [
|
|
103
|
-
{
|
|
104
|
-
key: "getString",
|
|
105
|
-
value: function getString() {
|
|
106
|
-
return this.string;
|
|
107
|
-
}
|
|
108
|
-
},
|
|
109
|
-
{
|
|
110
|
-
key: "getSubproof",
|
|
111
|
-
value: function getSubproof() {
|
|
112
|
-
return this.subproof;
|
|
113
|
-
}
|
|
114
|
-
},
|
|
115
|
-
{
|
|
116
|
-
key: "getStatement",
|
|
117
|
-
value: function getStatement() {
|
|
118
|
-
return this.statement;
|
|
119
|
-
}
|
|
120
|
-
},
|
|
121
|
-
{
|
|
122
|
-
key: "getReference",
|
|
123
|
-
value: function getReference() {
|
|
124
|
-
return this.reference;
|
|
125
|
-
}
|
|
126
|
-
},
|
|
127
|
-
{
|
|
128
|
-
key: "isQualified",
|
|
129
|
-
value: function isQualified() {
|
|
130
|
-
var qualified = this.reference !== null;
|
|
131
|
-
return qualified;
|
|
132
|
-
}
|
|
133
|
-
},
|
|
134
|
-
{
|
|
135
|
-
key: "unify",
|
|
136
|
-
value: function unify(substitutions, context) {
|
|
137
|
-
var _this = this;
|
|
138
|
-
var unified;
|
|
139
|
-
if (this.subproof !== null) {
|
|
140
|
-
unified = true; ///
|
|
141
|
-
}
|
|
142
|
-
if (this.statement !== null) {
|
|
143
|
-
var proofStepString = this.string; ///
|
|
144
|
-
context.trace("Unifying the '".concat(proofStepString, "' proof step..."));
|
|
145
|
-
unified = _unify.default.some(function(unifyMixin) {
|
|
146
|
-
var unified = unifyMixin(_this.statement, _this.reference, substitutions, context);
|
|
147
|
-
if (unified) {
|
|
148
|
-
return true;
|
|
149
|
-
}
|
|
150
|
-
});
|
|
151
|
-
if (unified) {
|
|
152
|
-
context.debug("...unified the '".concat(proofStepString, "' proof step."));
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
return unified;
|
|
156
|
-
}
|
|
157
|
-
},
|
|
158
|
-
{
|
|
159
|
-
key: "unifyStatement",
|
|
160
|
-
value: function unifyStatement(statement, context) {
|
|
161
|
-
var statementUnified;
|
|
162
|
-
var specificContext = context, generalContext = context, substitutions = _substitutions.default.fromNothing();
|
|
163
|
-
if (this.subproof !== null) {
|
|
164
|
-
var subproofUnified = statement.unifySubproof(this.subproof, substitutions, generalContext, specificContext);
|
|
165
|
-
statementUnified = subproofUnified; ///
|
|
166
|
-
}
|
|
167
|
-
if (this.statement !== null) {
|
|
168
|
-
statementUnified = statement.unifyStatement(this.statement, substitutions, generalContext, specificContext);
|
|
169
|
-
}
|
|
170
|
-
if (statementUnified) {
|
|
171
|
-
var equivalences = context.getEquivalences(), substitutionsUnified = equivalences.unifySubstitutions(substitutions);
|
|
172
|
-
statementUnified = substitutionsUnified; ///
|
|
173
|
-
}
|
|
174
|
-
return statementUnified;
|
|
175
|
-
}
|
|
176
|
-
},
|
|
177
|
-
{
|
|
178
|
-
key: "verifyAndUnify",
|
|
179
|
-
value: function verifyAndUnify(substitutions, context) {
|
|
180
|
-
var verifiedAndUnified = false;
|
|
181
|
-
var assignments = [], verified = this.verify(substitutions, assignments, context);
|
|
182
|
-
if (verified) {
|
|
183
|
-
var unified = this.unify(substitutions, context);
|
|
184
|
-
if (unified) {
|
|
185
|
-
var assignmentsAssigned = (0, _assignments.assignAssignments)(assignments, context);
|
|
186
|
-
if (assignmentsAssigned) {
|
|
187
|
-
var proofStep = this; ///
|
|
188
|
-
context.addProofStep(proofStep);
|
|
189
|
-
verifiedAndUnified = true; ///
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
}
|
|
193
|
-
return verifiedAndUnified;
|
|
194
|
-
}
|
|
195
|
-
},
|
|
196
|
-
{
|
|
197
|
-
key: "verify",
|
|
198
|
-
value: function verify(substitutions, assignments, context) {
|
|
199
|
-
var verified = false;
|
|
200
|
-
if (false) {
|
|
201
|
-
///
|
|
202
|
-
} else if (this.subproof !== null) {
|
|
203
|
-
var subproofVerified = this.subproof.verify(substitutions, context);
|
|
204
|
-
verified = subproofVerified; ///
|
|
205
|
-
} else if (this.statement !== null) {
|
|
206
|
-
var proofStepString = this.string; ///
|
|
207
|
-
context.trace("Verifying the '".concat(proofStepString, "' proof step..."));
|
|
208
|
-
var qualified = this.isQualified(), stated = qualified, statementVerified = this.statement.verify(assignments, stated, context);
|
|
209
|
-
if (statementVerified) {
|
|
210
|
-
if (this.reference === null) {
|
|
211
|
-
verified = true;
|
|
212
|
-
} else {
|
|
213
|
-
var referenceVerified = this.reference.verify(context);
|
|
214
|
-
verified = referenceVerified; ///
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
if (verified) {
|
|
218
|
-
context.debug("...verified the '".concat(proofStepString, "' proof step."));
|
|
219
|
-
}
|
|
220
|
-
} else {
|
|
221
|
-
var proofStepString1 = this.string;
|
|
222
|
-
context.debug("Cannot verify the '".concat(proofStepString1, "' proof step because it is nonsense."));
|
|
223
|
-
}
|
|
224
|
-
return verified;
|
|
225
|
-
}
|
|
226
|
-
}
|
|
227
|
-
], [
|
|
228
|
-
{
|
|
229
|
-
key: "fromStatement",
|
|
230
|
-
value: function fromStatement(statement, context) {
|
|
231
|
-
var statementString = statement.getString(), string = statementString, subproof = null, reference = null, proofStep = new ProofStep(string, subproof, statement, reference);
|
|
232
|
-
return proofStep;
|
|
233
|
-
}
|
|
234
|
-
},
|
|
235
|
-
{
|
|
236
|
-
key: "fromProofStepNode",
|
|
237
|
-
value: function fromProofStepNode(proofStepNode, fileContext) {
|
|
238
|
-
var Subproof = _dom.default.Subproof, Statement = _dom.default.Statement, Reference = _dom.default.Reference, node = proofStepNode, string = fileContext.nodeAsString(node), subproof = Subproof.fromProofStepNode(proofStepNode, fileContext), statement = Statement.fromProofStepNode(proofStepNode, fileContext), reference = Reference.fromProofStepNode(proofStepNode, fileContext), proofStep = new ProofStep(string, subproof, statement, reference);
|
|
239
|
-
return proofStep;
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
|
-
]);
|
|
243
|
-
return ProofStep;
|
|
244
|
-
}(), _define_property(_ProofStep, "name", "ProofStep"), _ProofStep));
|
|
245
|
-
|
|
246
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/dom/proofStep.old.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../dom\";\nimport unifyMixins from \"../mixins/proofStep/unify\";\nimport Substitutions from \"../substitutions\";\n\nimport { domAssigned } from \"../dom\";\nimport { assignAssignments } from \"../utilities/assignments\";\n\nexport default domAssigned(class ProofStep {\n  constructor(string, subproof, statement, reference) {\n    this.string = string;\n    this.subproof = subproof;\n    this.statement = statement;\n    this.reference = reference;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getSubproof() {\n    return this.subproof;\n  }\n\n  getStatement() {\n    return this.statement;\n  }\n\n  getReference() {\n    return this.reference;\n  }\n\n  isQualified() {\n    const qualified = (this.reference !== null);\n\n    return qualified;\n  }\n\n  unify(substitutions, context) {\n    let unified;\n\n    if (this.subproof !== null) {\n      unified = true; ///\n    }\n\n    if (this.statement !== null) {\n      const proofStepString = this.string;  ///\n\n      context.trace(`Unifying the '${proofStepString}' proof step...`);\n\n      unified = unifyMixins.some((unifyMixin) => {\n        const unified = unifyMixin(this.statement, this.reference, substitutions, context);\n\n        if (unified) {\n          return true;\n        }\n      });\n\n      if (unified) {\n        context.debug(`...unified the '${proofStepString}' proof step.`);\n      }\n    }\n\n    return unified;\n  }\n\n  unifyStatement(statement, context) {\n    let statementUnified;\n\n    const specificContext = context, ///\n          generalContext = context, ///\n          substitutions = Substitutions.fromNothing();\n\n    if (this.subproof !== null) {\n      const subproofUnified = statement.unifySubproof(this.subproof, substitutions, generalContext, specificContext);\n\n      statementUnified = subproofUnified; ///\n    }\n\n    if (this.statement !== null) {\n      statementUnified = statement.unifyStatement(this.statement, substitutions, generalContext, specificContext);\n    }\n\n    if (statementUnified) {\n      const equivalences = context.getEquivalences(),\n            substitutionsUnified = equivalences.unifySubstitutions(substitutions);\n\n      statementUnified = substitutionsUnified;  ///\n    }\n\n    return statementUnified;\n  }\n\n  verifyAndUnify(substitutions, context) {\n    let verifiedAndUnified = false;\n\n    const assignments = [],\n          verified = this.verify(substitutions, assignments, context);\n\n    if (verified) {\n      const unified = this.unify(substitutions, context);\n\n      if (unified) {\n        const assignmentsAssigned = assignAssignments(assignments, context);\n\n        if (assignmentsAssigned) {\n          const proofStep = this; ///\n\n          context.addProofStep(proofStep);\n\n          verifiedAndUnified = true; ///\n        }\n      }\n    }\n\n    return verifiedAndUnified;\n  }\n\n  verify(substitutions, assignments, context) {\n    let verified = false;\n\n    if (false) {\n      ///\n    } else if (this.subproof !== null) {\n      const subproofVerified = this.subproof.verify(substitutions, context);\n\n      verified = subproofVerified;  ///\n    } else if (this.statement !== null) {\n      const proofStepString = this.string;  ///\n\n      context.trace(`Verifying the '${proofStepString}' proof step...`);\n\n      const qualified = this.isQualified(),\n            stated = qualified, ///\n            statementVerified = this.statement.verify(assignments, stated, context);\n\n      if (statementVerified) {\n        if (this.reference === null) {\n          verified = true;\n        } else {\n          const referenceVerified = this.reference.verify(context);\n\n          verified = referenceVerified; ///\n        }\n      }\n\n      if (verified) {\n        context.debug(`...verified the '${proofStepString}' proof step.`);\n      }\n    } else {\n      const proofStepString = this.string;\n\n      context.debug(`Cannot verify the '${proofStepString}' proof step because it is nonsense.`);\n    }\n\n    return verified;\n  }\n\n  static name = \"ProofStep\";\n\n  static fromStatement(statement, context) {\n    const statementString = statement.getString(),\n          string = statementString, ///\n          subproof = null,\n          reference = null,\n          proofStep = new ProofStep(string, subproof, statement, reference);\n\n    return proofStep;\n  }\n\n  static fromProofStepNode(proofStepNode, fileContext) {\n    const { Subproof, Statement, Reference } = dom,\n          node = proofStepNode, ///\n          string = fileContext.nodeAsString(node),\n          subproof = Subproof.fromProofStepNode(proofStepNode, fileContext),\n          statement = Statement.fromProofStepNode(proofStepNode, fileContext),\n          reference = Reference.fromProofStepNode(proofStepNode, fileContext),\n          proofStep = new ProofStep(string, subproof, statement, reference);\n\n    return proofStep;\n  }\n});\n"],"names":["domAssigned","ProofStep","string","subproof","statement","reference","getString","getSubproof","getStatement","getReference","isQualified","qualified","unify","substitutions","context","unified","proofStepString","trace","unifyMixins","some","unifyMixin","debug","unifyStatement","statementUnified","specificContext","generalContext","Substitutions","fromNothing","subproofUnified","unifySubproof","equivalences","getEquivalences","substitutionsUnified","unifySubstitutions","verifyAndUnify","verifiedAndUnified","assignments","verified","verify","assignmentsAssigned","assignAssignments","proofStep","addProofStep","subproofVerified","stated","statementVerified","referenceVerified","fromStatement","statementString","fromProofStepNode","proofStepNode","fileContext","Subproof","dom","Statement","Reference","node","nodeAsString","name"],"mappings":"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"}
|