occam-verify-cli 1.0.126 → 1.0.128
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/context/file.js +4 -4
- package/lib/context/local.js +4 -4
- package/lib/dom/assertion/contained.js +22 -12
- package/lib/dom/assertion/defined.js +22 -12
- package/lib/dom/assertion/property.js +3 -3
- package/lib/dom/assertion/subproof.js +3 -26
- package/lib/dom/assertion/type.js +4 -8
- package/lib/dom/axiom.js +13 -5
- package/lib/dom/combinator.js +2 -10
- package/lib/dom/conjecture.js +4 -4
- package/lib/dom/constructor/bracketed.js +3 -3
- package/lib/dom/constructor.js +17 -21
- package/lib/dom/declaration.js +14 -8
- package/lib/dom/derivation.js +10 -2
- package/lib/dom/frame.js +29 -25
- package/lib/dom/judgement.js +9 -11
- package/lib/dom/lemma.js +4 -4
- package/lib/dom/metaLemma.js +4 -4
- package/lib/dom/metaType.js +14 -4
- package/lib/dom/metatheorem.js +4 -4
- package/lib/dom/metavariable.js +39 -7
- package/lib/dom/procedureCall.js +9 -5
- package/lib/dom/property.js +30 -18
- package/lib/dom/propertyRelation.js +212 -0
- package/lib/dom/reference.js +8 -8
- package/lib/dom/statement.js +40 -16
- package/lib/dom/term.js +52 -14
- package/lib/dom/theorem.js +4 -4
- package/lib/dom/type.js +33 -29
- package/lib/dom/variable.js +19 -8
- package/lib/index.js +3 -3
- package/lib/verifier/topLevel.js +6 -6
- package/package.json +1 -1
- package/src/context/file.js +4 -3
- package/src/context/local.js +4 -3
- package/src/dom/assertion/contained.js +23 -11
- package/src/dom/assertion/defined.js +23 -11
- package/src/dom/assertion/property.js +3 -7
- package/src/dom/assertion/subproof.js +3 -44
- package/src/dom/assertion/type.js +6 -17
- package/src/dom/axiom.js +3 -3
- package/src/dom/combinator.js +1 -8
- package/src/dom/conjecture.js +1 -1
- package/src/dom/constructor/bracketed.js +3 -4
- package/src/dom/constructor.js +17 -17
- package/src/dom/declaration.js +20 -14
- package/src/dom/derivation.js +12 -3
- package/src/dom/frame.js +33 -36
- package/src/dom/judgement.js +7 -22
- package/src/dom/lemma.js +1 -1
- package/src/dom/metaLemma.js +1 -1
- package/src/dom/metaType.js +16 -6
- package/src/dom/metatheorem.js +1 -1
- package/src/dom/metavariable.js +35 -15
- package/src/dom/procedureCall.js +15 -13
- package/src/dom/property.js +49 -32
- package/src/dom/{relation/property.js → propertyRelation.js} +9 -10
- package/src/dom/reference.js +6 -6
- package/src/dom/statement.js +50 -15
- package/src/dom/term.js +69 -24
- package/src/dom/theorem.js +1 -1
- package/src/dom/type.js +48 -51
- package/src/dom/variable.js +33 -35
- package/src/index.js +1 -1
- package/src/verifier/topLevel.js +10 -5
- package/lib/dom/relation/property.js +0 -212
package/src/dom/variable.js
CHANGED
|
@@ -54,6 +54,10 @@ export default domAssigned(class Variable {
|
|
|
54
54
|
this.type = type;
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
+
setProvisional(provisional) {
|
|
58
|
+
this.provisional = provisional;
|
|
59
|
+
}
|
|
60
|
+
|
|
57
61
|
isEqualTo(variable) {
|
|
58
62
|
const variableString = variable.getString(),
|
|
59
63
|
equalTo = (variableString === this.string);
|
|
@@ -224,16 +228,9 @@ export default domAssigned(class Variable {
|
|
|
224
228
|
const termVariableNode = termVariableNodeQuery(termNode);
|
|
225
229
|
|
|
226
230
|
if (termVariableNode !== null) {
|
|
227
|
-
const variableNode = termVariableNode
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
string = context.nodeAsString(node),
|
|
231
|
-
name = variableName, ///
|
|
232
|
-
type = null,
|
|
233
|
-
provisional = null,
|
|
234
|
-
propertyRelations = [];
|
|
235
|
-
|
|
236
|
-
variable = new Variable(string, node, name, type, provisional, propertyRelations);
|
|
231
|
+
const variableNode = termVariableNode; ///
|
|
232
|
+
|
|
233
|
+
variable = variableFromVariableNode(variableNode, context);
|
|
237
234
|
}
|
|
238
235
|
|
|
239
236
|
return variable;
|
|
@@ -243,15 +240,7 @@ export default domAssigned(class Variable {
|
|
|
243
240
|
let variable = null;
|
|
244
241
|
|
|
245
242
|
if (variableNode !== null) {
|
|
246
|
-
|
|
247
|
-
variableName = variableNameFromVariableNode(variableNode),
|
|
248
|
-
string = context.nodeAsString(node),
|
|
249
|
-
name = variableName, ///
|
|
250
|
-
type = null,
|
|
251
|
-
provisional = null,
|
|
252
|
-
propertyRelations = [];
|
|
253
|
-
|
|
254
|
-
variable = new Variable(string, node, name, type, provisional, propertyRelations);
|
|
243
|
+
variable = variableFromVariableNode(variableNode, context);
|
|
255
244
|
}
|
|
256
245
|
|
|
257
246
|
return variable;
|
|
@@ -261,14 +250,9 @@ export default domAssigned(class Variable {
|
|
|
261
250
|
let variable = null;
|
|
262
251
|
|
|
263
252
|
if (variableNode !== null) {
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
name = variableName, ///
|
|
268
|
-
provisional = null,
|
|
269
|
-
propertyRelations = [];
|
|
270
|
-
|
|
271
|
-
variable = new Variable(string, node, name, type, provisional, propertyRelations);
|
|
253
|
+
variable = variableFromVariableNode(variableNode, context);
|
|
254
|
+
|
|
255
|
+
variable.setType(type);
|
|
272
256
|
}
|
|
273
257
|
|
|
274
258
|
return variable;
|
|
@@ -278,15 +262,15 @@ export default domAssigned(class Variable {
|
|
|
278
262
|
const { Type } = dom,
|
|
279
263
|
variableDeclarationVariableNode = variableDeclarationVariableNodeQuery(variableDeclarationNode),
|
|
280
264
|
variableNode = variableDeclarationVariableNode, ///
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
node = variableNode, ///
|
|
285
|
-
name = variableName, ///
|
|
265
|
+
localContext = LocalContext.fromFileContext(fileContext),
|
|
266
|
+
context = localContext, ///
|
|
267
|
+
variable = variableFromVariableNode(variableNode, context),
|
|
286
268
|
type = Type.fromVariableDeclarationNode(variableDeclarationNode, fileContext),
|
|
287
|
-
provisional = provisionalFromVariableDeclarationNode(variableDeclarationNode, fileContext)
|
|
288
|
-
|
|
289
|
-
|
|
269
|
+
provisional = provisionalFromVariableDeclarationNode(variableDeclarationNode, fileContext);
|
|
270
|
+
|
|
271
|
+
variable.setType(type);
|
|
272
|
+
|
|
273
|
+
variable.setProvisional(provisional);
|
|
290
274
|
|
|
291
275
|
return variable;
|
|
292
276
|
}
|
|
@@ -314,6 +298,20 @@ export default domAssigned(class Variable {
|
|
|
314
298
|
}
|
|
315
299
|
});
|
|
316
300
|
|
|
301
|
+
function variableFromVariableNode(variableNode, context) {
|
|
302
|
+
const { Variable } = dom,
|
|
303
|
+
node = variableNode, ///
|
|
304
|
+
variableName = variableNameFromVariableNode(variableNode),
|
|
305
|
+
string = context.nodeAsString(node),
|
|
306
|
+
name = variableName, ///
|
|
307
|
+
type = null,
|
|
308
|
+
provisional = null,
|
|
309
|
+
propertyRelations = [],
|
|
310
|
+
variable = new Variable(string, node, name, type, provisional, propertyRelations);
|
|
311
|
+
|
|
312
|
+
return variable;
|
|
313
|
+
}
|
|
314
|
+
|
|
317
315
|
function stringFromNameAndPropertyRelations(name, propertyRelations) {
|
|
318
316
|
const propertyRelationsString = propertyRelations.reduce((propertyRelationsString, propertyRelation) => {
|
|
319
317
|
const propertyRelationString = propertyRelation.getString();
|
package/src/index.js
CHANGED
|
@@ -37,7 +37,7 @@ import SubDerivation from "./dom/subDerivation";
|
|
|
37
37
|
import TypeAssertion from "./dom/assertion/type";
|
|
38
38
|
import TypeDeclaration from "./dom/declaration/type";
|
|
39
39
|
import DefinedAssertion from "./dom/assertion/defined";
|
|
40
|
-
import PropertyRelation from "./dom/
|
|
40
|
+
import PropertyRelation from "./dom/propertyRelation";
|
|
41
41
|
import SubproofAssertion from "./dom/assertion/subproof";
|
|
42
42
|
import PropertyAssertion from "./dom/assertion/property";
|
|
43
43
|
import ContainedAssertion from "./dom/assertion/contained";
|
package/src/verifier/topLevel.js
CHANGED
|
@@ -67,7 +67,8 @@ class TopLevelVerifier extends Verifier {
|
|
|
67
67
|
nodeQuery: lemmaNodeQuery,
|
|
68
68
|
verify: (lemmaNode, fileContext) => {
|
|
69
69
|
const { Lemma } = dom,
|
|
70
|
-
|
|
70
|
+
node = lemmaNode, ///
|
|
71
|
+
lemma = Lemma.fromNode(node, fileContext),
|
|
71
72
|
lemmaVerified = lemma.verify();
|
|
72
73
|
|
|
73
74
|
return lemmaVerified;
|
|
@@ -77,7 +78,8 @@ class TopLevelVerifier extends Verifier {
|
|
|
77
78
|
nodeQuery: theoremNodeQuery,
|
|
78
79
|
verify: (theoremNode, fileContext) => {
|
|
79
80
|
const { Theorem } = dom,
|
|
80
|
-
|
|
81
|
+
node = theoremNode, ///
|
|
82
|
+
theorem = Theorem.fromNode(node, fileContext),
|
|
81
83
|
theoremVerified = theorem.verify();
|
|
82
84
|
|
|
83
85
|
return theoremVerified;
|
|
@@ -87,7 +89,8 @@ class TopLevelVerifier extends Verifier {
|
|
|
87
89
|
nodeQuery: metaLemmaNodeQuery,
|
|
88
90
|
verify: (metaLemmaNode, fileContext) => {
|
|
89
91
|
const { MetaLemma } = dom,
|
|
90
|
-
|
|
92
|
+
node = metaLemmaNode, ///
|
|
93
|
+
metaLemma = MetaLemma.fromNode(node, fileContext),
|
|
91
94
|
metaLemmaVerified = metaLemma.verify();
|
|
92
95
|
|
|
93
96
|
return metaLemmaVerified;
|
|
@@ -97,7 +100,8 @@ class TopLevelVerifier extends Verifier {
|
|
|
97
100
|
nodeQuery: conjectureNodeQuery,
|
|
98
101
|
verify: (conjectureNode, fileContext) => {
|
|
99
102
|
const { Conjecture } = dom,
|
|
100
|
-
|
|
103
|
+
node = conjectureNode, ///
|
|
104
|
+
conjecture = Conjecture.fromNode(node, fileContext),
|
|
101
105
|
conjectureVerified = conjecture.verify();
|
|
102
106
|
|
|
103
107
|
return conjectureVerified;
|
|
@@ -107,7 +111,8 @@ class TopLevelVerifier extends Verifier {
|
|
|
107
111
|
nodeQuery: metatheoremNodeQuery,
|
|
108
112
|
verify: (metatheoremNode, fileContext) => {
|
|
109
113
|
const { Metatheorem } = dom,
|
|
110
|
-
|
|
114
|
+
node = metatheoremNode, ///
|
|
115
|
+
metatheorem = Metatheorem.fromNode(node, fileContext),
|
|
111
116
|
metatheoremVerified = metatheorem.verify();
|
|
112
117
|
|
|
113
118
|
return metatheoremVerified;
|
|
@@ -1,212 +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 _query = require("../../utilities/query");
|
|
13
|
-
function _class_call_check(instance, Constructor) {
|
|
14
|
-
if (!(instance instanceof Constructor)) {
|
|
15
|
-
throw new TypeError("Cannot call a class as a function");
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
function _defineProperties(target, props) {
|
|
19
|
-
for(var i = 0; i < props.length; i++){
|
|
20
|
-
var descriptor = props[i];
|
|
21
|
-
descriptor.enumerable = descriptor.enumerable || false;
|
|
22
|
-
descriptor.configurable = true;
|
|
23
|
-
if ("value" in descriptor) descriptor.writable = true;
|
|
24
|
-
Object.defineProperty(target, descriptor.key, descriptor);
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
function _create_class(Constructor, protoProps, staticProps) {
|
|
28
|
-
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
|
|
29
|
-
if (staticProps) _defineProperties(Constructor, staticProps);
|
|
30
|
-
return Constructor;
|
|
31
|
-
}
|
|
32
|
-
function _define_property(obj, key, value) {
|
|
33
|
-
if (key in obj) {
|
|
34
|
-
Object.defineProperty(obj, key, {
|
|
35
|
-
value: value,
|
|
36
|
-
enumerable: true,
|
|
37
|
-
configurable: true,
|
|
38
|
-
writable: true
|
|
39
|
-
});
|
|
40
|
-
} else {
|
|
41
|
-
obj[key] = value;
|
|
42
|
-
}
|
|
43
|
-
return obj;
|
|
44
|
-
}
|
|
45
|
-
function _getRequireWildcardCache(nodeInterop) {
|
|
46
|
-
if (typeof WeakMap !== "function") return null;
|
|
47
|
-
var cacheBabelInterop = new WeakMap();
|
|
48
|
-
var cacheNodeInterop = new WeakMap();
|
|
49
|
-
return (_getRequireWildcardCache = function(nodeInterop) {
|
|
50
|
-
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
51
|
-
})(nodeInterop);
|
|
52
|
-
}
|
|
53
|
-
function _interop_require_wildcard(obj, nodeInterop) {
|
|
54
|
-
if (!nodeInterop && obj && obj.__esModule) {
|
|
55
|
-
return obj;
|
|
56
|
-
}
|
|
57
|
-
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
58
|
-
return {
|
|
59
|
-
default: obj
|
|
60
|
-
};
|
|
61
|
-
}
|
|
62
|
-
var cache = _getRequireWildcardCache(nodeInterop);
|
|
63
|
-
if (cache && cache.has(obj)) {
|
|
64
|
-
return cache.get(obj);
|
|
65
|
-
}
|
|
66
|
-
var newObj = {
|
|
67
|
-
__proto__: null
|
|
68
|
-
};
|
|
69
|
-
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
70
|
-
for(var key in obj){
|
|
71
|
-
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
72
|
-
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
73
|
-
if (desc && (desc.get || desc.set)) {
|
|
74
|
-
Object.defineProperty(newObj, key, desc);
|
|
75
|
-
} else {
|
|
76
|
-
newObj[key] = obj[key];
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
newObj.default = obj;
|
|
81
|
-
if (cache) {
|
|
82
|
-
cache.set(obj, newObj);
|
|
83
|
-
}
|
|
84
|
-
return newObj;
|
|
85
|
-
}
|
|
86
|
-
var _PropertyRelation;
|
|
87
|
-
var termNodeQuery = (0, _query.nodeQuery)("/propertyRelation/term"), propertyNodeQuery = (0, _query.nodeQuery)("/propertyRelation/property");
|
|
88
|
-
var _default = (0, _dom.domAssigned)((_PropertyRelation = /*#__PURE__*/ function() {
|
|
89
|
-
function PropertyRelation(string, node, tokens, property, term) {
|
|
90
|
-
_class_call_check(this, PropertyRelation);
|
|
91
|
-
this.string = string;
|
|
92
|
-
this.node = node;
|
|
93
|
-
this.tokens = tokens;
|
|
94
|
-
this.property = property;
|
|
95
|
-
this.term = term;
|
|
96
|
-
}
|
|
97
|
-
_create_class(PropertyRelation, [
|
|
98
|
-
{
|
|
99
|
-
key: "getString",
|
|
100
|
-
value: function getString() {
|
|
101
|
-
return this.string;
|
|
102
|
-
}
|
|
103
|
-
},
|
|
104
|
-
{
|
|
105
|
-
key: "getNode",
|
|
106
|
-
value: function getNode() {
|
|
107
|
-
return this.node;
|
|
108
|
-
}
|
|
109
|
-
},
|
|
110
|
-
{
|
|
111
|
-
key: "getTokens",
|
|
112
|
-
value: function getTokens() {
|
|
113
|
-
return this.tokens;
|
|
114
|
-
}
|
|
115
|
-
},
|
|
116
|
-
{
|
|
117
|
-
key: "getProperty",
|
|
118
|
-
value: function getProperty() {
|
|
119
|
-
return this.property;
|
|
120
|
-
}
|
|
121
|
-
},
|
|
122
|
-
{
|
|
123
|
-
key: "getTerm",
|
|
124
|
-
value: function getTerm() {
|
|
125
|
-
return this.term;
|
|
126
|
-
}
|
|
127
|
-
},
|
|
128
|
-
{
|
|
129
|
-
key: "getType",
|
|
130
|
-
value: function getType() {
|
|
131
|
-
return this.property.getType();
|
|
132
|
-
}
|
|
133
|
-
},
|
|
134
|
-
{
|
|
135
|
-
key: "isEqualTo",
|
|
136
|
-
value: function isEqualTo(propertyRelation) {
|
|
137
|
-
var propertyRelationString = propertyRelation.getString(), equalTo = propertyRelationString === this.string;
|
|
138
|
-
return equalTo;
|
|
139
|
-
}
|
|
140
|
-
},
|
|
141
|
-
{
|
|
142
|
-
key: "verify",
|
|
143
|
-
value: function verify(context) {
|
|
144
|
-
var verified = false;
|
|
145
|
-
var propertyRelationString = this.string; ///
|
|
146
|
-
context.trace("Verifying the '".concat(propertyRelationString, "' property relation..."));
|
|
147
|
-
var termVerified = this.verifyTerm(context);
|
|
148
|
-
if (termVerified) {
|
|
149
|
-
var propertyVerified = this.verifyProperty(context);
|
|
150
|
-
verified = propertyVerified;
|
|
151
|
-
}
|
|
152
|
-
if (verified) {
|
|
153
|
-
context.debug("...verified the '".concat(propertyRelationString, "' property relation."));
|
|
154
|
-
}
|
|
155
|
-
return verified;
|
|
156
|
-
}
|
|
157
|
-
},
|
|
158
|
-
{
|
|
159
|
-
key: "verifyTerm",
|
|
160
|
-
value: function verifyTerm(context) {
|
|
161
|
-
var termVerified;
|
|
162
|
-
var termString = this.term.getString(), propertyRelationString = this.string; ///
|
|
163
|
-
context.trace("Verifying the '".concat(propertyRelationString, "' property relation's '").concat(termString, "' term..."));
|
|
164
|
-
termVerified = this.term.verify(context, function() {
|
|
165
|
-
var verifiedAhead = true;
|
|
166
|
-
return verifiedAhead;
|
|
167
|
-
});
|
|
168
|
-
if (termVerified) {
|
|
169
|
-
context.debug("...verified the '".concat(propertyRelationString, "' property relation's '").concat(termString, "' term."));
|
|
170
|
-
}
|
|
171
|
-
return termVerified;
|
|
172
|
-
}
|
|
173
|
-
},
|
|
174
|
-
{
|
|
175
|
-
key: "verifyProperty",
|
|
176
|
-
value: function verifyProperty(context) {
|
|
177
|
-
var propertyVerified;
|
|
178
|
-
var propertyString = this.property.getString(), propertyRelationString = this.string; ///
|
|
179
|
-
context.trace("Verifying the '".concat(propertyRelationString, "' property relation's '").concat(propertyString, "' property..."));
|
|
180
|
-
var variableType = this.term.getType(), propertyNames = this.property.getNames(), variableTypeProperties = variableType.getProperties(), variableTypeProperty = variableTypeProperties.find(function(variableTypeProperty) {
|
|
181
|
-
var propertyNamesMatch = variableTypeProperty.matchPropertyNames(propertyNames);
|
|
182
|
-
if (propertyNamesMatch) {
|
|
183
|
-
return true;
|
|
184
|
-
}
|
|
185
|
-
}) || null;
|
|
186
|
-
if (variableTypeProperty === null) {
|
|
187
|
-
var variableString = this.term.getString(), variableTypeName = variableType.getName();
|
|
188
|
-
context.debug("The '".concat(propertyNames, "' property is not a property of the '").concat(variableString, "' variable's '").concat(variableTypeName, "' type."));
|
|
189
|
-
} else {
|
|
190
|
-
var type = variableType;
|
|
191
|
-
this.property.setType(type);
|
|
192
|
-
propertyVerified = true;
|
|
193
|
-
}
|
|
194
|
-
if (propertyVerified) {
|
|
195
|
-
context.debug("...verified the '".concat(propertyRelationString, "' property relation's '").concat(propertyString, "' property."));
|
|
196
|
-
}
|
|
197
|
-
return propertyVerified;
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
], [
|
|
201
|
-
{
|
|
202
|
-
key: "fromPropertyRelationNode",
|
|
203
|
-
value: function fromPropertyRelationNode(propertyRelationNode, context) {
|
|
204
|
-
var Term = _dom.default.Term, Property = _dom.default.Property, node = propertyRelationNode, string = context.nodeAsString(node), tokens = context.nodeAsTokens(node), propertyNode = propertyNodeQuery(propertyRelationNode), termNode = termNodeQuery(propertyRelationNode), property = Property.fromPropertyNode(propertyNode, context), term = Term.fromTermNode(termNode, context), propertyRelation = new PropertyRelation(string, node, tokens, property, term);
|
|
205
|
-
return propertyRelation;
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
]);
|
|
209
|
-
return PropertyRelation;
|
|
210
|
-
}(), _define_property(_PropertyRelation, "name", "PropertyRelation"), _PropertyRelation));
|
|
211
|
-
|
|
212
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/relation/property.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../../dom\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { domAssigned } from \"../../dom\";\n\nconst termNodeQuery = nodeQuery(\"/propertyRelation/term\"),\n      propertyNodeQuery = nodeQuery(\"/propertyRelation/property\");\n\nexport default domAssigned(class PropertyRelation {\n  constructor(string, node, tokens, property, term) {\n    this.string = string;\n    this.node = node;\n    this.tokens = tokens;\n    this.property = property;\n    this.term = term;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getTokens() {\n    return this.tokens;\n  }\n\n  getProperty() {\n    return this.property;\n  }\n\n  getTerm() {\n    return this.term;\n  }\n\n  getType() { return this.property.getType(); }\n\n  isEqualTo(propertyRelation) {\n    const propertyRelationString = propertyRelation.getString(),\n          equalTo = (propertyRelationString === this.string);\n\n    return equalTo;\n  }\n\n  verify(context) {\n    let verified = false;\n\n    const propertyRelationString = this.string; ///\n\n    context.trace(`Verifying the '${propertyRelationString}' property relation...`);\n\n    const termVerified = this.verifyTerm(context);\n\n    if (termVerified) {\n      const propertyVerified = this.verifyProperty(context);\n\n      verified = propertyVerified;\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${propertyRelationString}' property relation.`);\n    }\n\n    return verified;\n  }\n\n  verifyTerm(context) {\n    let termVerified;\n\n    const termString = this.term.getString(),\n          propertyRelationString = this.string; ///\n\n    context.trace(`Verifying the '${propertyRelationString}' property relation's '${termString}' term...`);\n\n    termVerified = this.term.verify(context, () => {\n      const verifiedAhead = true;\n\n      return verifiedAhead;\n    });\n\n    if (termVerified) {\n      context.debug(`...verified the '${propertyRelationString}' property relation's '${termString}' term.`);\n    }\n\n    return termVerified;\n  }\n\n  verifyProperty(context) {\n    let propertyVerified;\n\n    const propertyString = this.property.getString(),\n          propertyRelationString = this.string; ///\n\n    context.trace(`Verifying the '${propertyRelationString}' property relation's '${propertyString}' property...`);\n\n    const variableType = this.term.getType(),\n          propertyNames = this.property.getNames(),\n          variableTypeProperties = variableType.getProperties(),\n          variableTypeProperty = variableTypeProperties.find((variableTypeProperty) => {\n            const propertyNamesMatch = variableTypeProperty.matchPropertyNames(propertyNames);\n\n            if (propertyNamesMatch) {\n              return true;\n            }\n          }) || null;\n\n    if (variableTypeProperty === null) {\n      const variableString = this.term.getString(),\n            variableTypeName = variableType.getName();\n\n      context.debug(`The '${propertyNames}' property is not a property of the '${variableString}' variable's '${variableTypeName}' type.`);\n    } else {\n      const type = variableType;\n\n      this.property.setType(type);\n\n      propertyVerified = true;\n    }\n\n    if (propertyVerified) {\n      context.debug(`...verified the '${propertyRelationString}' property relation's '${propertyString}' property.`);\n    }\n\n    return propertyVerified;\n  }\n\n  static name = \"PropertyRelation\";\n\n  static fromPropertyRelationNode(propertyRelationNode, context) {\n    const { Term, Property } = dom,\n          node = propertyRelationNode,  ///\n          string = context.nodeAsString(node),\n          tokens = context.nodeAsTokens(node),\n          propertyNode = propertyNodeQuery(propertyRelationNode),\n          termNode = termNodeQuery(propertyRelationNode),\n          property = Property.fromPropertyNode(propertyNode, context),\n          term = Term.fromTermNode(termNode, context),\n          propertyRelation = new PropertyRelation(string, node, tokens, property, term);\n\n    return propertyRelation;\n  }\n});\n"],"names":["termNodeQuery","nodeQuery","propertyNodeQuery","domAssigned","PropertyRelation","string","node","tokens","property","term","getString","getNode","getTokens","getProperty","getTerm","getType","isEqualTo","propertyRelation","propertyRelationString","equalTo","verify","context","verified","trace","termVerified","verifyTerm","propertyVerified","verifyProperty","debug","termString","verifiedAhead","propertyString","variableType","propertyNames","getNames","variableTypeProperties","getProperties","variableTypeProperty","find","propertyNamesMatch","matchPropertyNames","variableString","variableTypeName","getName","type","setType","fromPropertyRelationNode","propertyRelationNode","Term","dom","Property","nodeAsString","nodeAsTokens","propertyNode","termNode","fromPropertyNode","fromTermNode","name"],"mappings":"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"}
|