occam-verify-cli 1.0.220 → 1.0.223
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/context/local.js +5 -43
- package/lib/dom/assertion/property.js +4 -2
- package/lib/dom/assertion/type.js +4 -2
- package/lib/dom/axiom.js +9 -9
- package/lib/dom/equality.js +21 -6
- package/lib/dom/judgement.js +4 -2
- package/lib/dom/rule.js +13 -5
- package/lib/dom/statement.js +7 -7
- package/lib/dom/step.js +18 -21
- package/lib/dom/subproof.js +12 -15
- package/lib/dom/substitution/term.js +2 -16
- package/lib/dom/substitution.js +1 -8
- package/lib/dom/topLevelAssertion.js +18 -31
- package/lib/dom/topLevelMetaAssertion.js +13 -5
- package/lib/dom/variable.js +3 -3
- package/lib/equivalence.js +54 -33
- package/lib/equivalences.js +57 -101
- package/lib/mixins/step/unify.js +42 -24
- package/lib/unifier/equantional.js +170 -0
- package/lib/utilities/brackets.js +2 -2
- package/lib/utilities/subproof.js +2 -2
- package/lib/utilities/unification.js +1 -11
- package/package.json +1 -1
- package/src/context/local.js +5 -48
- package/src/dom/assertion/property.js +3 -1
- package/src/dom/assertion/type.js +3 -1
- package/src/dom/axiom.js +12 -10
- package/src/dom/equality.js +26 -9
- package/src/dom/judgement.js +3 -1
- package/src/dom/rule.js +20 -5
- package/src/dom/statement.js +5 -5
- package/src/dom/step.js +28 -34
- package/src/dom/subproof.js +15 -25
- package/src/dom/substitution/term.js +1 -19
- package/src/dom/substitution.js +0 -6
- package/src/dom/topLevelAssertion.js +20 -41
- package/src/dom/topLevelMetaAssertion.js +20 -5
- package/src/dom/variable.js +3 -2
- package/src/equivalence.js +69 -46
- package/src/equivalences.js +53 -115
- package/src/mixins/step/unify.js +54 -33
- package/src/unifier/equantional.js +90 -0
- package/src/utilities/brackets.js +1 -1
- package/src/utilities/subproof.js +1 -1
- package/src/utilities/unification.js +0 -14
- package/lib/unifier/equality.js +0 -155
- package/src/unifier/equality.js +0 -70
|
@@ -0,0 +1,170 @@
|
|
|
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 _unifier = /*#__PURE__*/ _interop_require_default(require("../unifier"));
|
|
12
|
+
var _query = require("../utilities/query");
|
|
13
|
+
function _assert_this_initialized(self) {
|
|
14
|
+
if (self === void 0) {
|
|
15
|
+
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
|
|
16
|
+
}
|
|
17
|
+
return self;
|
|
18
|
+
}
|
|
19
|
+
function _call_super(_this, derived, args) {
|
|
20
|
+
derived = _get_prototype_of(derived);
|
|
21
|
+
return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
|
|
22
|
+
}
|
|
23
|
+
function _class_call_check(instance, Constructor) {
|
|
24
|
+
if (!(instance instanceof Constructor)) {
|
|
25
|
+
throw new TypeError("Cannot call a class as a function");
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
function _defineProperties(target, props) {
|
|
29
|
+
for(var i = 0; i < props.length; i++){
|
|
30
|
+
var descriptor = props[i];
|
|
31
|
+
descriptor.enumerable = descriptor.enumerable || false;
|
|
32
|
+
descriptor.configurable = true;
|
|
33
|
+
if ("value" in descriptor) descriptor.writable = true;
|
|
34
|
+
Object.defineProperty(target, descriptor.key, descriptor);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
function _create_class(Constructor, protoProps, staticProps) {
|
|
38
|
+
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
|
|
39
|
+
if (staticProps) _defineProperties(Constructor, staticProps);
|
|
40
|
+
return Constructor;
|
|
41
|
+
}
|
|
42
|
+
function _define_property(obj, key, value) {
|
|
43
|
+
if (key in obj) {
|
|
44
|
+
Object.defineProperty(obj, key, {
|
|
45
|
+
value: value,
|
|
46
|
+
enumerable: true,
|
|
47
|
+
configurable: true,
|
|
48
|
+
writable: true
|
|
49
|
+
});
|
|
50
|
+
} else {
|
|
51
|
+
obj[key] = value;
|
|
52
|
+
}
|
|
53
|
+
return obj;
|
|
54
|
+
}
|
|
55
|
+
function _get_prototype_of(o) {
|
|
56
|
+
_get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
|
|
57
|
+
return o.__proto__ || Object.getPrototypeOf(o);
|
|
58
|
+
};
|
|
59
|
+
return _get_prototype_of(o);
|
|
60
|
+
}
|
|
61
|
+
function _inherits(subClass, superClass) {
|
|
62
|
+
if (typeof superClass !== "function" && superClass !== null) {
|
|
63
|
+
throw new TypeError("Super expression must either be null or a function");
|
|
64
|
+
}
|
|
65
|
+
subClass.prototype = Object.create(superClass && superClass.prototype, {
|
|
66
|
+
constructor: {
|
|
67
|
+
value: subClass,
|
|
68
|
+
writable: true,
|
|
69
|
+
configurable: true
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
if (superClass) _set_prototype_of(subClass, superClass);
|
|
73
|
+
}
|
|
74
|
+
function _interop_require_default(obj) {
|
|
75
|
+
return obj && obj.__esModule ? obj : {
|
|
76
|
+
default: obj
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
function _possible_constructor_return(self, call) {
|
|
80
|
+
if (call && (_type_of(call) === "object" || typeof call === "function")) {
|
|
81
|
+
return call;
|
|
82
|
+
}
|
|
83
|
+
return _assert_this_initialized(self);
|
|
84
|
+
}
|
|
85
|
+
function _set_prototype_of(o, p) {
|
|
86
|
+
_set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
|
|
87
|
+
o.__proto__ = p;
|
|
88
|
+
return o;
|
|
89
|
+
};
|
|
90
|
+
return _set_prototype_of(o, p);
|
|
91
|
+
}
|
|
92
|
+
function _type_of(obj) {
|
|
93
|
+
"@swc/helpers - typeof";
|
|
94
|
+
return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
95
|
+
}
|
|
96
|
+
function _is_native_reflect_construct() {
|
|
97
|
+
try {
|
|
98
|
+
var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
|
|
99
|
+
} catch (_) {}
|
|
100
|
+
return (_is_native_reflect_construct = function() {
|
|
101
|
+
return !!result;
|
|
102
|
+
})();
|
|
103
|
+
}
|
|
104
|
+
var termNodeQuery = (0, _query.nodeQuery)("/term");
|
|
105
|
+
var EquationalUnifier = /*#__PURE__*/ function(Unifier) {
|
|
106
|
+
_inherits(EquationalUnifier, Unifier);
|
|
107
|
+
function EquationalUnifier() {
|
|
108
|
+
_class_call_check(this, EquationalUnifier);
|
|
109
|
+
return _call_super(this, EquationalUnifier, arguments);
|
|
110
|
+
}
|
|
111
|
+
_create_class(EquationalUnifier, [
|
|
112
|
+
{
|
|
113
|
+
key: "equateTerms",
|
|
114
|
+
value: function equateTerms(leftTermNode, rightTermNode, context) {
|
|
115
|
+
var termsEquated;
|
|
116
|
+
var generalNonTerminalNode = leftTermNode, specificNonTerminalNode = rightTermNode, nonTerminalNodeUnified = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, context);
|
|
117
|
+
termsEquated = nonTerminalNodeUnified; ///
|
|
118
|
+
return termsEquated;
|
|
119
|
+
}
|
|
120
|
+
},
|
|
121
|
+
{
|
|
122
|
+
key: "equateStatements",
|
|
123
|
+
value: function equateStatements(statementANode, statementBNode, context) {
|
|
124
|
+
var statementsEquated;
|
|
125
|
+
var generalNonTerminalNode = statementANode, specificNonTerminalNode = statementBNode, nonTerminalNodeUnified = this.unifyNonTerminalNode(generalNonTerminalNode, specificNonTerminalNode, context);
|
|
126
|
+
statementsEquated = nonTerminalNodeUnified; ///
|
|
127
|
+
return statementsEquated;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
]);
|
|
131
|
+
return EquationalUnifier;
|
|
132
|
+
}(_unifier.default);
|
|
133
|
+
_define_property(EquationalUnifier, "maps", [
|
|
134
|
+
{
|
|
135
|
+
generalNodeQuery: termNodeQuery,
|
|
136
|
+
specificNodeQuery: termNodeQuery,
|
|
137
|
+
unify: function(leftTermNode, rightTermNode, context) {
|
|
138
|
+
var termUnified = false;
|
|
139
|
+
if (!termUnified) {
|
|
140
|
+
var depth = Infinity, leftTermNodeMatchesRightTermNode = leftTermNode.match(rightTermNode, depth);
|
|
141
|
+
if (leftTermNodeMatchesRightTermNode) {
|
|
142
|
+
termUnified = true;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
if (!termUnified) {
|
|
146
|
+
var equivalences = context.getEquivalences(), termNodes = [
|
|
147
|
+
leftTermNode,
|
|
148
|
+
rightTermNode
|
|
149
|
+
], equivalence = equivalences.findEquivalenceByTermNodes(termNodes);
|
|
150
|
+
if (equivalence !== null) {
|
|
151
|
+
termUnified = true;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
if (!termUnified) {
|
|
155
|
+
var depth1 = 1, leftTermNodeMatchesRightTermNode1 = leftTermNode.match(rightTermNode, depth1);
|
|
156
|
+
if (leftTermNodeMatchesRightTermNode1) {
|
|
157
|
+
var leftNonTerminalNode = leftTermNode, rightNonTerminalNode = rightTermNode, leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(), rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(), leftChildNodes = leftNonTerminalNodeChildNodes, rightChildNodes = rightNonTerminalNodeChildNodes, childNodesUnified = equationalUnifier.unifyChildNodes(leftChildNodes, rightChildNodes, context);
|
|
158
|
+
if (childNodesUnified) {
|
|
159
|
+
termUnified = true;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
return termUnified;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
]);
|
|
167
|
+
var equationalUnifier = new EquationalUnifier();
|
|
168
|
+
var _default = equationalUnifier;
|
|
169
|
+
|
|
170
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmaWVyL2VxdWFudGlvbmFsLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgVW5pZmllciBmcm9tIFwiLi4vdW5pZmllclwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGVybVwiKTtcblxuY2xhc3MgRXF1YXRpb25hbFVuaWZpZXIgZXh0ZW5kcyBVbmlmaWVyIHtcbiAgZXF1YXRlVGVybXMobGVmdFRlcm1Ob2RlLCByaWdodFRlcm1Ob2RlLCBjb250ZXh0KSB7XG4gICAgbGV0IHRlcm1zRXF1YXRlZDtcblxuICAgIGNvbnN0IGdlbmVyYWxOb25UZXJtaW5hbE5vZGUgPSBsZWZ0VGVybU5vZGUsIC8vL1xuICAgICAgICAgIHNwZWNpZmljTm9uVGVybWluYWxOb2RlID0gcmlnaHRUZXJtTm9kZSwgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlVW5pZmllZCA9IHRoaXMudW5pZnlOb25UZXJtaW5hbE5vZGUoZ2VuZXJhbE5vblRlcm1pbmFsTm9kZSwgc3BlY2lmaWNOb25UZXJtaW5hbE5vZGUsIGNvbnRleHQpO1xuXG4gICAgdGVybXNFcXVhdGVkID0gbm9uVGVybWluYWxOb2RlVW5pZmllZDsgLy8vXG5cbiAgICByZXR1cm4gdGVybXNFcXVhdGVkO1xuICB9O1xuXG4gIGVxdWF0ZVN0YXRlbWVudHMoc3RhdGVtZW50QU5vZGUsIHN0YXRlbWVudEJOb2RlLCBjb250ZXh0KSB7XG4gICAgbGV0IHN0YXRlbWVudHNFcXVhdGVkO1xuXG4gICAgY29uc3QgZ2VuZXJhbE5vblRlcm1pbmFsTm9kZSA9IHN0YXRlbWVudEFOb2RlLCAvLy9cbiAgICAgICAgICBzcGVjaWZpY05vblRlcm1pbmFsTm9kZSA9IHN0YXRlbWVudEJOb2RlLCAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVVbmlmaWVkID0gdGhpcy51bmlmeU5vblRlcm1pbmFsTm9kZShnZW5lcmFsTm9uVGVybWluYWxOb2RlLCBzcGVjaWZpY05vblRlcm1pbmFsTm9kZSwgY29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRzRXF1YXRlZCA9IG5vblRlcm1pbmFsTm9kZVVuaWZpZWQ7IC8vL1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudHNFcXVhdGVkO1xuICB9O1xuXG4gIHN0YXRpYyBtYXBzID0gW1xuICAgIHtcbiAgICAgIGdlbmVyYWxOb2RlUXVlcnk6IHRlcm1Ob2RlUXVlcnksICAvLy9cbiAgICAgIHNwZWNpZmljTm9kZVF1ZXJ5OiB0ZXJtTm9kZVF1ZXJ5LCAvLy9cbiAgICAgIHVuaWZ5OiAobGVmdFRlcm1Ob2RlLCByaWdodFRlcm1Ob2RlLCBjb250ZXh0KSA9PiB7XG4gICAgICAgIGxldCB0ZXJtVW5pZmllZCA9IGZhbHNlO1xuXG4gICAgICAgIGlmICghdGVybVVuaWZpZWQpIHtcbiAgICAgICAgICBjb25zdCBkZXB0aCA9IEluZmluaXR5LFxuICAgICAgICAgICAgICAgIGxlZnRUZXJtTm9kZU1hdGNoZXNSaWdodFRlcm1Ob2RlID0gbGVmdFRlcm1Ob2RlLm1hdGNoKHJpZ2h0VGVybU5vZGUsIGRlcHRoKTtcblxuICAgICAgICAgIGlmIChsZWZ0VGVybU5vZGVNYXRjaGVzUmlnaHRUZXJtTm9kZSkge1xuICAgICAgICAgICAgdGVybVVuaWZpZWQgPSB0cnVlO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuXG4gICAgICAgIGlmICghdGVybVVuaWZpZWQpIHtcbiAgICAgICAgICBjb25zdCBlcXVpdmFsZW5jZXMgPSBjb250ZXh0LmdldEVxdWl2YWxlbmNlcygpLFxuICAgICAgICAgICAgICAgIHRlcm1Ob2RlcyA9IFtcbiAgICAgICAgICAgICAgICAgIGxlZnRUZXJtTm9kZSxcbiAgICAgICAgICAgICAgICAgIHJpZ2h0VGVybU5vZGVcbiAgICAgICAgICAgICAgICBdLFxuICAgICAgICAgICAgICAgIGVxdWl2YWxlbmNlID0gZXF1aXZhbGVuY2VzLmZpbmRFcXVpdmFsZW5jZUJ5VGVybU5vZGVzKHRlcm1Ob2Rlcyk7XG5cbiAgICAgICAgICBpZiAoZXF1aXZhbGVuY2UgIT09IG51bGwpIHtcbiAgICAgICAgICAgIHRlcm1VbmlmaWVkID0gdHJ1ZTtcbiAgICAgICAgICB9XG4gICAgICAgIH1cblxuICAgICAgICBpZiAoIXRlcm1VbmlmaWVkKSB7XG4gICAgICAgICAgY29uc3QgZGVwdGggPSAxLFxuICAgICAgICAgICAgICAgIGxlZnRUZXJtTm9kZU1hdGNoZXNSaWdodFRlcm1Ob2RlID0gbGVmdFRlcm1Ob2RlLm1hdGNoKHJpZ2h0VGVybU5vZGUsIGRlcHRoKTtcblxuICAgICAgICAgIGlmIChsZWZ0VGVybU5vZGVNYXRjaGVzUmlnaHRUZXJtTm9kZSkge1xuICAgICAgICAgICAgY29uc3QgbGVmdE5vblRlcm1pbmFsTm9kZSA9IGxlZnRUZXJtTm9kZSwgLy8vXG4gICAgICAgICAgICAgICAgICByaWdodE5vblRlcm1pbmFsTm9kZSA9IHJpZ2h0VGVybU5vZGUsIC8vL1xuICAgICAgICAgICAgICAgICAgbGVmdE5vblRlcm1pbmFsTm9kZUNoaWxkTm9kZXMgPSBsZWZ0Tm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgICAgICAgICAgIHJpZ2h0Tm9uVGVybWluYWxOb2RlQ2hpbGROb2RlcyA9IHJpZ2h0Tm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgICAgICAgICAgIGxlZnRDaGlsZE5vZGVzID0gbGVmdE5vblRlcm1pbmFsTm9kZUNoaWxkTm9kZXMsIC8vL1xuICAgICAgICAgICAgICAgICAgcmlnaHRDaGlsZE5vZGVzID0gcmlnaHROb25UZXJtaW5hbE5vZGVDaGlsZE5vZGVzLCAvLy9cbiAgICAgICAgICAgICAgICAgIGNoaWxkTm9kZXNVbmlmaWVkID0gZXF1YXRpb25hbFVuaWZpZXIudW5pZnlDaGlsZE5vZGVzKGxlZnRDaGlsZE5vZGVzLCByaWdodENoaWxkTm9kZXMsIGNvbnRleHQpO1xuXG4gICAgICAgICAgICBpZiAoY2hpbGROb2Rlc1VuaWZpZWQpIHtcbiAgICAgICAgICAgICAgdGVybVVuaWZpZWQgPSB0cnVlO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB0ZXJtVW5pZmllZDtcbiAgICAgIH1cbiAgICB9XG4gIF07XG59XG5cbmNvbnN0IGVxdWF0aW9uYWxVbmlmaWVyID0gbmV3IEVxdWF0aW9uYWxVbmlmaWVyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IGVxdWF0aW9uYWxVbmlmaWVyO1xuIl0sIm5hbWVzIjpbInRlcm1Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJFcXVhdGlvbmFsVW5pZmllciIsImVxdWF0ZVRlcm1zIiwibGVmdFRlcm1Ob2RlIiwicmlnaHRUZXJtTm9kZSIsImNvbnRleHQiLCJ0ZXJtc0VxdWF0ZWQiLCJnZW5lcmFsTm9uVGVybWluYWxOb2RlIiwic3BlY2lmaWNOb25UZXJtaW5hbE5vZGUiLCJub25UZXJtaW5hbE5vZGVVbmlmaWVkIiwidW5pZnlOb25UZXJtaW5hbE5vZGUiLCJlcXVhdGVTdGF0ZW1lbnRzIiwic3RhdGVtZW50QU5vZGUiLCJzdGF0ZW1lbnRCTm9kZSIsInN0YXRlbWVudHNFcXVhdGVkIiwiVW5pZmllciIsIm1hcHMiLCJnZW5lcmFsTm9kZVF1ZXJ5Iiwic3BlY2lmaWNOb2RlUXVlcnkiLCJ1bmlmeSIsInRlcm1VbmlmaWVkIiwiZGVwdGgiLCJJbmZpbml0eSIsImxlZnRUZXJtTm9kZU1hdGNoZXNSaWdodFRlcm1Ob2RlIiwibWF0Y2giLCJlcXVpdmFsZW5jZXMiLCJnZXRFcXVpdmFsZW5jZXMiLCJ0ZXJtTm9kZXMiLCJlcXVpdmFsZW5jZSIsImZpbmRFcXVpdmFsZW5jZUJ5VGVybU5vZGVzIiwibGVmdE5vblRlcm1pbmFsTm9kZSIsInJpZ2h0Tm9uVGVybWluYWxOb2RlIiwibGVmdE5vblRlcm1pbmFsTm9kZUNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwicmlnaHROb25UZXJtaW5hbE5vZGVDaGlsZE5vZGVzIiwibGVmdENoaWxkTm9kZXMiLCJyaWdodENoaWxkTm9kZXMiLCJjaGlsZE5vZGVzVW5pZmllZCIsImVxdWF0aW9uYWxVbmlmaWVyIiwidW5pZnlDaGlsZE5vZGVzIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkF5RkE7OztlQUFBOzs7OERBdkZvQjtxQkFFTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFMUIsSUFBTUEsZ0JBQWdCQyxJQUFBQSxnQkFBUyxFQUFDO0FBRWhDLElBQUEsQUFBTUMsa0NBQU47Y0FBTUE7YUFBQUE7Z0NBQUFBO1FBQU4sT0FBQSxrQkFBTUE7O2tCQUFBQTs7WUFDSkMsS0FBQUE7bUJBQUFBLFNBQUFBLFlBQVlDLFlBQVksRUFBRUMsYUFBYSxFQUFFQyxPQUFPO2dCQUM5QyxJQUFJQztnQkFFSixJQUFNQyx5QkFBeUJKLGNBQ3pCSywwQkFBMEJKLGVBQzFCSyx5QkFBeUIsSUFBSSxDQUFDQyxvQkFBb0IsQ0FBQ0gsd0JBQXdCQyx5QkFBeUJIO2dCQUUxR0MsZUFBZUcsd0JBQXdCLEdBQUc7Z0JBRTFDLE9BQU9IO1lBQ1Q7OztZQUVBSyxLQUFBQTttQkFBQUEsU0FBQUEsaUJBQWlCQyxjQUFjLEVBQUVDLGNBQWMsRUFBRVIsT0FBTztnQkFDdEQsSUFBSVM7Z0JBRUosSUFBTVAseUJBQXlCSyxnQkFDekJKLDBCQUEwQkssZ0JBQzFCSix5QkFBeUIsSUFBSSxDQUFDQyxvQkFBb0IsQ0FBQ0gsd0JBQXdCQyx5QkFBeUJIO2dCQUUxR1Msb0JBQW9CTCx3QkFBd0IsR0FBRztnQkFFL0MsT0FBT0s7WUFDVDs7O1dBdkJJYjtFQUEwQmMsZ0JBQU87QUF5QnJDLGlCQXpCSWQsbUJBeUJHZSxRQUFPO0lBQ1o7UUFDRUMsa0JBQWtCbEI7UUFDbEJtQixtQkFBbUJuQjtRQUNuQm9CLE9BQU8sU0FBQ2hCLGNBQWNDLGVBQWVDO1lBQ25DLElBQUllLGNBQWM7WUFFbEIsSUFBSSxDQUFDQSxhQUFhO2dCQUNoQixJQUFNQyxRQUFRQyxVQUNSQyxtQ0FBbUNwQixhQUFhcUIsS0FBSyxDQUFDcEIsZUFBZWlCO2dCQUUzRSxJQUFJRSxrQ0FBa0M7b0JBQ3BDSCxjQUFjO2dCQUNoQjtZQUNGO1lBRUEsSUFBSSxDQUFDQSxhQUFhO2dCQUNoQixJQUFNSyxlQUFlcEIsUUFBUXFCLGVBQWUsSUFDdENDLFlBQVk7b0JBQ1Z4QjtvQkFDQUM7aUJBQ0QsRUFDRHdCLGNBQWNILGFBQWFJLDBCQUEwQixDQUFDRjtnQkFFNUQsSUFBSUMsZ0JBQWdCLE1BQU07b0JBQ3hCUixjQUFjO2dCQUNoQjtZQUNGO1lBRUEsSUFBSSxDQUFDQSxhQUFhO2dCQUNoQixJQUFNQyxTQUFRLEdBQ1JFLG9DQUFtQ3BCLGFBQWFxQixLQUFLLENBQUNwQixlQUFlaUI7Z0JBRTNFLElBQUlFLG1DQUFrQztvQkFDcEMsSUFBTU8sc0JBQXNCM0IsY0FDdEI0Qix1QkFBdUIzQixlQUN2QjRCLGdDQUFnQ0Ysb0JBQW9CRyxhQUFhLElBQ2pFQyxpQ0FBaUNILHFCQUFxQkUsYUFBYSxJQUNuRUUsaUJBQWlCSCwrQkFDakJJLGtCQUFrQkYsZ0NBQ2xCRyxvQkFBb0JDLGtCQUFrQkMsZUFBZSxDQUFDSixnQkFBZ0JDLGlCQUFpQi9CO29CQUU3RixJQUFJZ0MsbUJBQW1CO3dCQUNyQmpCLGNBQWM7b0JBQ2hCO2dCQUNGO1lBQ0Y7WUFFQSxPQUFPQTtRQUNUO0lBQ0Y7Q0FDRDtBQUdILElBQU1rQixvQkFBb0IsSUFBSXJDO0lBRTlCLFdBQWVxQyJ9
|
|
@@ -42,7 +42,7 @@ function stripBracketsFromTerm(term, context) {
|
|
|
42
42
|
var termNode = term.getNode(), bracketedTermChildNode = bracketedTermChildNodeFromTermNode(termNode);
|
|
43
43
|
if (bracketedTermChildNode !== null) {
|
|
44
44
|
var Term = _dom.default.Term, termNode1 = bracketedTermChildNode; ///
|
|
45
|
-
term = Term.
|
|
45
|
+
term = Term.fromTermNode(termNode1, context);
|
|
46
46
|
}
|
|
47
47
|
return term;
|
|
48
48
|
}
|
|
@@ -93,4 +93,4 @@ function contextFromStatement(statement, context) {
|
|
|
93
93
|
return context;
|
|
94
94
|
}
|
|
95
95
|
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYnJhY2tldHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBkb20gZnJvbSBcIi4uL2RvbVwiO1xuaW1wb3J0IExvY2FsQ29udGV4dCBmcm9tIFwiLi4vY29udGV4dC9sb2NhbFwiO1xuaW1wb3J0IGNvbWJpbmF0b3JCcmFja2V0ZWRDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2JyYWNrZXRlZC9jb21iaW5hdG9yXCI7XG5pbXBvcnQgY29uc3RydWN0b3JCcmFja2V0ZWRDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2JyYWNrZXRlZC9jb25zdHJ1Y3RvclwiO1xuXG5pbXBvcnQgeyBCUkFDS0VURURfVEVSTV9ERVBUSCwgQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIHN0cmlwQnJhY2tldHNGcm9tVGVybSh0ZXJtLCBjb250ZXh0KSB7XG4gIGNvbnN0IHRlcm1Ob2RlID0gdGVybS5nZXROb2RlKCksXG4gICAgICAgIGJyYWNrZXRlZFRlcm1DaGlsZE5vZGUgPSBicmFja2V0ZWRUZXJtQ2hpbGROb2RlRnJvbVRlcm1Ob2RlKHRlcm1Ob2RlKTtcblxuICBpZiAoYnJhY2tldGVkVGVybUNoaWxkTm9kZSAhPT0gbnVsbCkge1xuICAgIGNvbnN0IHsgVGVybSB9ID0gZG9tLFxuICAgICAgICAgIHRlcm1Ob2RlID0gYnJhY2tldGVkVGVybUNoaWxkTm9kZTsgIC8vL1xuXG4gICAgdGVybSA9IFRlcm0uZnJvbVRlcm1Ob2RlKHRlcm1Ob2RlLCBjb250ZXh0KTtcbiAgfVxuXG4gIHJldHVybiB0ZXJtO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gc3RyaXBCcmFja2V0c0Zyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKTtcblxuICBpZiAoYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlICE9PSBudWxsKSB7XG4gICAgY29udGV4dCA9IGNvbnRleHRGcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCk7IC8vL1xuXG4gICAgY29uc3QgeyBTdGF0ZW1lbnQgfSA9IGRvbSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlOyAgLy8vXG5cbiAgICBzdGF0ZW1lbnQgPSBTdGF0ZW1lbnQuZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG4gIH1cblxuICByZXR1cm4gc3RhdGVtZW50O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gc3RyaXBCcmFja2V0c0Zyb21UZXJtTm9kZSh0ZXJtTm9kZSkge1xuICBjb25zdCBicmFja2V0ZWRUZXJtQ2hpbGROb2RlID0gYnJhY2tldGVkVGVybUNoaWxkTm9kZUZyb21UZXJtTm9kZSh0ZXJtTm9kZSk7XG5cbiAgaWYgKGJyYWNrZXRlZFRlcm1DaGlsZE5vZGUgIT09IG51bGwpIHtcbiAgICB0ZXJtTm9kZSA9IGJyYWNrZXRlZFRlcm1DaGlsZE5vZGU7ICAvLy9cbiAgfVxuXG4gIHJldHVybiB0ZXJtTm9kZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHN0cmlwQnJhY2tldHNGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSB7XG4gIGNvbnN0IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpO1xuXG4gIGlmIChicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUgIT09IG51bGwpIHtcbiAgICBzdGF0ZW1lbnROb2RlID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlOyAgLy8vXG4gIH1cblxuICByZXR1cm4gc3RhdGVtZW50Tm9kZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJyYWNrZXRlZFRlcm1DaGlsZE5vZGVGcm9tVGVybU5vZGUodGVybU5vZGUpIHtcbiAgbGV0IGJyYWNrZXRlZFRlcm1DaGlsZE5vZGUgPSBudWxsO1xuXG4gIGNvbnN0IGRlcHRoID0gQlJBQ0tFVEVEX1RFUk1fREVQVEgsXG4gICAgICAgIGJyYWNrZXRlZFRlcm1Ob2RlID0gY29uc3RydWN0b3JCcmFja2V0ZWRDb250ZXh0LmdldEJyYWNrZXRlZFRlcm1Ob2RlKCksXG4gICAgICAgIHRlcm1Ob2RlTWF0Y2hCcmFja2V0ZWRUZXJtTm9kZSA9IHRlcm1Ob2RlLm1hdGNoKGJyYWNrZXRlZFRlcm1Ob2RlLCBkZXB0aCk7XG5cbiAgaWYgKHRlcm1Ob2RlTWF0Y2hCcmFja2V0ZWRUZXJtTm9kZSkge1xuICAgIGNvbnN0IHNpbmd1bGFyVGVybU5vZGUgPSB0ZXJtTm9kZS5nZXRTaW5ndWxhclRlcm1Ob2RlKCk7XG5cbiAgICBicmFja2V0ZWRUZXJtQ2hpbGROb2RlID0gc2luZ3VsYXJUZXJtTm9kZTsgIC8vL1xuICB9XG5cbiAgcmV0dXJuIGJyYWNrZXRlZFRlcm1DaGlsZE5vZGU7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSB7XG4gIGxldCBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUgPSBudWxsO1xuXG4gIGNvbnN0IGRlcHRoID0gQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCxcbiAgICAgICAgYnJhY2tldGVkU3RhdGVtZW50Tm9kZSA9IGNvbWJpbmF0b3JCcmFja2V0ZWRDb250ZXh0LmdldEJyYWNrZXRlZFN0YXRlbWVudE5vZGUoKSxcbiAgICAgICAgc3RhdGVtZW50Tm9kZU1hdGNoQnJhY2tldGVkU3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGUubWF0Y2goYnJhY2tldGVkU3RhdGVtZW50Tm9kZSwgZGVwdGgpO1xuXG4gIGlmIChzdGF0ZW1lbnROb2RlTWF0Y2hCcmFja2V0ZWRTdGF0ZW1lbnROb2RlKSB7XG4gICAgY29uc3Qgc2luZ3VsYXJTdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZS5nZXRTaW5ndWxhclN0YXRlbWVudE5vZGUoKTtcblxuICAgIGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSA9IHNpbmd1bGFyU3RhdGVtZW50Tm9kZTsgIC8vL1xuICB9XG5cbiAgcmV0dXJuIGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZTtcbn1cblxuZnVuY3Rpb24gY29udGV4dEZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KSB7XG4gIGNvbnN0IHN0YXRlbWVudFRva2VucyA9IHN0YXRlbWVudC5nZXRUb2tlbnMoKSxcbiAgICAgICAgdG9rZW5zID0gc3RhdGVtZW50VG9rZW5zLCAvLy9cbiAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21Db250ZXh0QW5kVG9rZW5zKGNvbnRleHQsIHRva2Vucyk7XG5cbiAgY29udGV4dCA9IGxvY2FsQ29udGV4dDsgLy8vXG5cbiAgcmV0dXJuIGNvbnRleHQ7XG59XG4iXSwibmFtZXMiOlsiYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlRnJvbVN0YXRlbWVudE5vZGUiLCJicmFja2V0ZWRUZXJtQ2hpbGROb2RlRnJvbVRlcm1Ob2RlIiwic3RyaXBCcmFja2V0c0Zyb21TdGF0ZW1lbnQiLCJzdHJpcEJyYWNrZXRzRnJvbVN0YXRlbWVudE5vZGUiLCJzdHJpcEJyYWNrZXRzRnJvbVRlcm0iLCJzdHJpcEJyYWNrZXRzRnJvbVRlcm1Ob2RlIiwidGVybSIsImNvbnRleHQiLCJ0ZXJtTm9kZSIsImdldE5vZGUiLCJicmFja2V0ZWRUZXJtQ2hpbGROb2RlIiwiVGVybSIsImRvbSIsImZyb21UZXJtTm9kZSIsInN0YXRlbWVudCIsInN0YXRlbWVudE5vZGUiLCJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUiLCJjb250ZXh0RnJvbVN0YXRlbWVudCIsIlN0YXRlbWVudCIsImZyb21TdGF0ZW1lbnROb2RlIiwiZGVwdGgiLCJCUkFDS0VURURfVEVSTV9ERVBUSCIsImJyYWNrZXRlZFRlcm1Ob2RlIiwiY29uc3RydWN0b3JCcmFja2V0ZWRDb250ZXh0IiwiZ2V0QnJhY2tldGVkVGVybU5vZGUiLCJ0ZXJtTm9kZU1hdGNoQnJhY2tldGVkVGVybU5vZGUiLCJtYXRjaCIsInNpbmd1bGFyVGVybU5vZGUiLCJnZXRTaW5ndWxhclRlcm1Ob2RlIiwiQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCIsImJyYWNrZXRlZFN0YXRlbWVudE5vZGUiLCJjb21iaW5hdG9yQnJhY2tldGVkQ29udGV4dCIsImdldEJyYWNrZXRlZFN0YXRlbWVudE5vZGUiLCJzdGF0ZW1lbnROb2RlTWF0Y2hCcmFja2V0ZWRTdGF0ZW1lbnROb2RlIiwic2luZ3VsYXJTdGF0ZW1lbnROb2RlIiwiZ2V0U2luZ3VsYXJTdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50VG9rZW5zIiwiZ2V0VG9rZW5zIiwidG9rZW5zIiwibG9jYWxDb250ZXh0IiwiTG9jYWxDb250ZXh0IiwiZnJvbUNvbnRleHRBbmRUb2tlbnMiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQTJFZ0JBO2VBQUFBOztRQWhCQUM7ZUFBQUE7O1FBcENBQztlQUFBQTs7UUEwQkFDO2VBQUFBOztRQXhDQUM7ZUFBQUE7O1FBOEJBQztlQUFBQTs7OzBEQXJDQTs0REFDUztpRUFDYztrRUFDQzt5QkFFd0I7Ozs7OztBQUV6RCxTQUFTRCxzQkFBc0JFLElBQUksRUFBRUMsT0FBTztJQUNqRCxJQUFNQyxXQUFXRixLQUFLRyxPQUFPLElBQ3ZCQyx5QkFBeUJULG1DQUFtQ087SUFFbEUsSUFBSUUsMkJBQTJCLE1BQU07UUFDbkMsSUFBTSxBQUFFQyxPQUFTQyxZQUFHLENBQVpELE1BQ0ZILFlBQVdFLHdCQUF5QixHQUFHO1FBRTdDSixPQUFPSyxLQUFLRSxZQUFZLENBQUNMLFdBQVVEO0lBQ3JDO0lBRUEsT0FBT0Q7QUFDVDtBQUVPLFNBQVNKLDJCQUEyQlksU0FBUyxFQUFFUCxPQUFPO0lBQzNELElBQU1RLGdCQUFnQkQsVUFBVUwsT0FBTyxJQUNqQ08sOEJBQThCaEIsNkNBQTZDZTtJQUVqRixJQUFJQyxnQ0FBZ0MsTUFBTTtRQUN4Q1QsVUFBVVUscUJBQXFCSCxXQUFXUCxVQUFVLEdBQUc7UUFFdkQsSUFBTSxBQUFFVyxZQUFjTixZQUFHLENBQWpCTSxXQUNGSCxpQkFBZ0JDLDZCQUE4QixHQUFHO1FBRXZERixZQUFZSSxVQUFVQyxpQkFBaUIsQ0FBQ0osZ0JBQWVSO0lBQ3pEO0lBRUEsT0FBT087QUFDVDtBQUVPLFNBQVNULDBCQUEwQkcsUUFBUTtJQUNoRCxJQUFNRSx5QkFBeUJULG1DQUFtQ087SUFFbEUsSUFBSUUsMkJBQTJCLE1BQU07UUFDbkNGLFdBQVdFLHdCQUF5QixHQUFHO0lBQ3pDO0lBRUEsT0FBT0Y7QUFDVDtBQUVPLFNBQVNMLCtCQUErQlksYUFBYTtJQUMxRCxJQUFNQyw4QkFBOEJoQiw2Q0FBNkNlO0lBRWpGLElBQUlDLGdDQUFnQyxNQUFNO1FBQ3hDRCxnQkFBZ0JDLDZCQUE4QixHQUFHO0lBQ25EO0lBRUEsT0FBT0Q7QUFDVDtBQUVPLFNBQVNkLG1DQUFtQ08sUUFBUTtJQUN6RCxJQUFJRSx5QkFBeUI7SUFFN0IsSUFBTVUsUUFBUUMsK0JBQW9CLEVBQzVCQyxvQkFBb0JDLG9CQUEyQixDQUFDQyxvQkFBb0IsSUFDcEVDLGlDQUFpQ2pCLFNBQVNrQixLQUFLLENBQUNKLG1CQUFtQkY7SUFFekUsSUFBSUssZ0NBQWdDO1FBQ2xDLElBQU1FLG1CQUFtQm5CLFNBQVNvQixtQkFBbUI7UUFFckRsQix5QkFBeUJpQixrQkFBbUIsR0FBRztJQUNqRDtJQUVBLE9BQU9qQjtBQUNUO0FBRU8sU0FBU1YsNkNBQTZDZSxhQUFhO0lBQ3hFLElBQUlDLDhCQUE4QjtJQUVsQyxJQUFNSSxRQUFRUyxvQ0FBeUIsRUFDakNDLHlCQUF5QkMsbUJBQTBCLENBQUNDLHlCQUF5QixJQUM3RUMsMkNBQTJDbEIsY0FBY1csS0FBSyxDQUFDSSx3QkFBd0JWO0lBRTdGLElBQUlhLDBDQUEwQztRQUM1QyxJQUFNQyx3QkFBd0JuQixjQUFjb0Isd0JBQXdCO1FBRXBFbkIsOEJBQThCa0IsdUJBQXdCLEdBQUc7SUFDM0Q7SUFFQSxPQUFPbEI7QUFDVDtBQUVBLFNBQVNDLHFCQUFxQkgsU0FBUyxFQUFFUCxPQUFPO0lBQzlDLElBQU02QixrQkFBa0J0QixVQUFVdUIsU0FBUyxJQUNyQ0MsU0FBU0YsaUJBQ1RHLGVBQWVDLGNBQVksQ0FBQ0Msb0JBQW9CLENBQUNsQyxTQUFTK0I7SUFFaEUvQixVQUFVZ0MsY0FBYyxHQUFHO0lBRTNCLE9BQU9oQztBQUNUIn0=
|
|
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "subproofStringFromSubproofNode", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
function subproofStringFromSubproofNode(subproofNode, fileContext) {
|
|
12
|
-
var suppositionStatementsOrNonsenseString = suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, fileContext), lastStatementOrNonsenseString = lastStatementOrNonsenseStringFromSubproofNode(subproofNode, fileContext), subproofString = "[".concat(suppositionStatementsOrNonsenseString, "]...").concat(lastStatementOrNonsenseString);
|
|
12
|
+
var suppositionStatementsOrNonsenseString = suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, fileContext), lastStatementOrNonsenseString = lastStatementOrNonsenseStringFromSubproofNode(subproofNode, fileContext), subproofString = "[".concat(suppositionStatementsOrNonsenseString, "] ... ").concat(lastStatementOrNonsenseString);
|
|
13
13
|
return subproofString;
|
|
14
14
|
}
|
|
15
15
|
function suppositionStatementOrNonsenseStringFromSubproofNode(subproofNode, fileContext) {
|
|
@@ -39,4 +39,4 @@ function statementOrNonsenseStringFromSuppositionOrStepNode(suppositionOrStepNod
|
|
|
39
39
|
return statementOrNonsenseString;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3VicHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBzdWJwcm9vZlN0cmluZ0Zyb21TdWJwcm9vZk5vZGUoc3VicHJvb2ZOb2RlLCBmaWxlQ29udGV4dCkge1xuICBjb25zdCBzdXBwb3NpdGlvblN0YXRlbWVudHNPck5vbnNlbnNlU3RyaW5nID0gc3VwcG9zaXRpb25TdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nRnJvbVN1YnByb29mTm9kZShzdWJwcm9vZk5vZGUsIGZpbGVDb250ZXh0KSxcbiAgICAgICAgbGFzdFN0YXRlbWVudE9yTm9uc2Vuc2VTdHJpbmcgPSBsYXN0U3RhdGVtZW50T3JOb25zZW5zZVN0cmluZ0Zyb21TdWJwcm9vZk5vZGUoc3VicHJvb2ZOb2RlLCBmaWxlQ29udGV4dCksXG4gICAgICAgIHN1YnByb29mU3RyaW5nID0gYFske3N1cHBvc2l0aW9uU3RhdGVtZW50c09yTm9uc2Vuc2VTdHJpbmd9XSAuLi4gJHtsYXN0U3RhdGVtZW50T3JOb25zZW5zZVN0cmluZ31gO1xuXG4gIHJldHVybiBzdWJwcm9vZlN0cmluZztcbn1cblxuZnVuY3Rpb24gc3VwcG9zaXRpb25TdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nRnJvbVN1YnByb29mTm9kZShzdWJwcm9vZk5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGNvbnN0IHN1cHBvc2l0aW9uTm9kZXMgPSBzdWJwcm9vZk5vZGUuZ2V0U3VwcG9zaXRpb25Ob2RlcygpLFxuICAgICAgICBzdXBwb3NpdGlvblN0YXRlbWVudHNPck5vbnNlbnNlU3RyaW5nID0gc3VwcG9zaXRpb25Ob2Rlcy5yZWR1Y2UoKHN1cHBvc2l0aW9uU3RhdGVtZW50c09yTm9uc2Vuc2VTdHJpbmcsIHN1cHBvc2l0aW9uTm9kZSkgPT4ge1xuICAgICAgICAgIGNvbnN0IHN1cHBvc2l0aW9uT3JTdGVwTm9kZSA9IHN1cHBvc2l0aW9uTm9kZSwgIC8vL1xuICAgICAgICAgICAgICAgIHN0YXRlbWVudE9yTm9uc2Vuc2VTdHJpbmcgPSBzdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nRnJvbVN1cHBvc2l0aW9uT3JTdGVwTm9kZShzdXBwb3NpdGlvbk9yU3RlcE5vZGUsIGZpbGVDb250ZXh0KSxcbiAgICAgICAgICAgICAgICBzdXBwb3NpdGlvblN0YXRlbWVudE9yTm9uc2Vuc2VTdHJpbmcgPSBzdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nOyAvLy9cblxuICAgICAgICAgIHN1cHBvc2l0aW9uU3RhdGVtZW50c09yTm9uc2Vuc2VTdHJpbmcgPSAoc3VwcG9zaXRpb25TdGF0ZW1lbnRzT3JOb25zZW5zZVN0cmluZyAhPT0gbnVsbCkgP1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGAke3N1cHBvc2l0aW9uU3RhdGVtZW50c09yTm9uc2Vuc2VTdHJpbmd9LCAke3N1cHBvc2l0aW9uU3RhdGVtZW50T3JOb25zZW5zZVN0cmluZ31gIDpcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1cHBvc2l0aW9uU3RhdGVtZW50T3JOb25zZW5zZVN0cmluZzsgLy8vXG5cbiAgICAgICAgICByZXR1cm4gc3VwcG9zaXRpb25TdGF0ZW1lbnRzT3JOb25zZW5zZVN0cmluZztcbiAgICAgICAgfSwgbnVsbCk7XG5cbiAgcmV0dXJuIHN1cHBvc2l0aW9uU3RhdGVtZW50c09yTm9uc2Vuc2VTdHJpbmc7XG59XG5cbmZ1bmN0aW9uIGxhc3RTdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nRnJvbVN1YnByb29mTm9kZShzdWJwcm9vZk5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGNvbnN0IGxhc3RTdGVwTm9kZSA9IHN1YnByb29mTm9kZS5nZXRMYXN0U3RlcE5vZGUoKSxcbiAgICAgICAgc3VwcG9zaXRpb25PclN0ZXBOb2RlID0gbGFzdFN0ZXBOb2RlLCAvLy9cbiAgICAgICAgc3RhdGVtZW50T3JOb25zZW5zZVN0cmluZyA9IHN0YXRlbWVudE9yTm9uc2Vuc2VTdHJpbmdGcm9tU3VwcG9zaXRpb25PclN0ZXBOb2RlKHN1cHBvc2l0aW9uT3JTdGVwTm9kZSwgZmlsZUNvbnRleHQpLFxuICAgICAgICBsYXN0U3RhdGVtZW50T3JOb25zZW5zZVN0cmluZyA9IHN0YXRlbWVudE9yTm9uc2Vuc2VTdHJpbmc7IC8vL1xuXG4gIHJldHVybiBsYXN0U3RhdGVtZW50T3JOb25zZW5zZVN0cmluZztcbn1cblxuZnVuY3Rpb24gc3RhdGVtZW50T3JOb25zZW5zZVN0cmluZ0Zyb21TdXBwb3NpdGlvbk9yU3RlcE5vZGUoc3VwcG9zaXRpb25PclN0ZXBOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgc3RhdGVtZW50T3JOb25zZW5zZVN0cmluZztcblxuICBjb25zdCBub25zZW5zZU5vZGUgPSBzdXBwb3NpdGlvbk9yU3RlcE5vZGUuZ2V0Tm9uc2Vuc2VOb2RlKCksXG4gICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdXBwb3NpdGlvbk9yU3RlcE5vZGUuZ2V0U3RhdGVtZW50Tm9kZSgpO1xuXG4gIGlmIChmYWxzZSkge1xuICAgIC8vL1xuICB9IGVsc2UgaWYgKG5vbnNlbnNlTm9kZSAhPT0gbnVsbCkge1xuICAgIGNvbnN0IG5vbnNlbnNlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKG5vbnNlbnNlTm9kZSk7XG5cbiAgICBzdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nID0gbm9uc2Vuc2VTdHJpbmc7IC8vL1xuICB9IGVsc2UgaWYgKHN0YXRlbWVudE5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICBzdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nID0gc3RhdGVtZW50U3RyaW5nOyAgLy8vXG4gIH1cblxuICByZXR1cm4gc3RhdGVtZW50T3JOb25zZW5zZVN0cmluZztcbn0iXSwibmFtZXMiOlsic3VicHJvb2ZTdHJpbmdGcm9tU3VicHJvb2ZOb2RlIiwic3VicHJvb2ZOb2RlIiwiZmlsZUNvbnRleHQiLCJzdXBwb3NpdGlvblN0YXRlbWVudHNPck5vbnNlbnNlU3RyaW5nIiwic3VwcG9zaXRpb25TdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nRnJvbVN1YnByb29mTm9kZSIsImxhc3RTdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nIiwibGFzdFN0YXRlbWVudE9yTm9uc2Vuc2VTdHJpbmdGcm9tU3VicHJvb2ZOb2RlIiwic3VicHJvb2ZTdHJpbmciLCJzdXBwb3NpdGlvbk5vZGVzIiwiZ2V0U3VwcG9zaXRpb25Ob2RlcyIsInJlZHVjZSIsInN1cHBvc2l0aW9uTm9kZSIsInN1cHBvc2l0aW9uT3JTdGVwTm9kZSIsInN0YXRlbWVudE9yTm9uc2Vuc2VTdHJpbmciLCJzdGF0ZW1lbnRPck5vbnNlbnNlU3RyaW5nRnJvbVN1cHBvc2l0aW9uT3JTdGVwTm9kZSIsInN1cHBvc2l0aW9uU3RhdGVtZW50T3JOb25zZW5zZVN0cmluZyIsImxhc3RTdGVwTm9kZSIsImdldExhc3RTdGVwTm9kZSIsIm5vbnNlbnNlTm9kZSIsImdldE5vbnNlbnNlTm9kZSIsInN0YXRlbWVudE5vZGUiLCJnZXRTdGF0ZW1lbnROb2RlIiwibm9uc2Vuc2VTdHJpbmciLCJub2RlQXNTdHJpbmciLCJzdGF0ZW1lbnRTdHJpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQUVnQkE7OztlQUFBQTs7O0FBQVQsU0FBU0EsK0JBQStCQyxZQUFZLEVBQUVDLFdBQVc7SUFDdEUsSUFBTUMsd0NBQXdDQyxxREFBcURILGNBQWNDLGNBQzNHRyxnQ0FBZ0NDLDhDQUE4Q0wsY0FBY0MsY0FDNUZLLGlCQUFpQixBQUFDLElBQWlERixPQUE5Q0YsdUNBQXNDLFVBQXNDLE9BQTlCRTtJQUV6RSxPQUFPRTtBQUNUO0FBRUEsU0FBU0gscURBQXFESCxZQUFZLEVBQUVDLFdBQVc7SUFDckYsSUFBTU0sbUJBQW1CUCxhQUFhUSxtQkFBbUIsSUFDbkROLHdDQUF3Q0ssaUJBQWlCRSxNQUFNLENBQUMsU0FBQ1AsdUNBQXVDUTtRQUN0RyxJQUFNQyx3QkFBd0JELGlCQUN4QkUsNEJBQTRCQyxtREFBbURGLHVCQUF1QlYsY0FDdEdhLHVDQUF1Q0YsMkJBQTJCLEdBQUc7UUFFM0VWLHdDQUF3QyxBQUFDQSwwQ0FBMEMsT0FDekMsQUFBQyxHQUE0Q1ksT0FBMUNaLHVDQUFzQyxNQUF5QyxPQUFyQ1ksd0NBQzNDQSxzQ0FBc0MsR0FBRztRQUVyRixPQUFPWjtJQUNULEdBQUc7SUFFVCxPQUFPQTtBQUNUO0FBRUEsU0FBU0csOENBQThDTCxZQUFZLEVBQUVDLFdBQVc7SUFDOUUsSUFBTWMsZUFBZWYsYUFBYWdCLGVBQWUsSUFDM0NMLHdCQUF3QkksY0FDeEJILDRCQUE0QkMsbURBQW1ERix1QkFBdUJWLGNBQ3RHRyxnQ0FBZ0NRLDJCQUEyQixHQUFHO0lBRXBFLE9BQU9SO0FBQ1Q7QUFFQSxTQUFTUyxtREFBbURGLHFCQUFxQixFQUFFVixXQUFXO0lBQzVGLElBQUlXO0lBRUosSUFBTUssZUFBZU4sc0JBQXNCTyxlQUFlLElBQ3BEQyxnQkFBZ0JSLHNCQUFzQlMsZ0JBQWdCO0lBRTVELElBQUksT0FBTztJQUNULEdBQUc7SUFDTCxPQUFPLElBQUlILGlCQUFpQixNQUFNO1FBQ2hDLElBQU1JLGlCQUFpQnBCLFlBQVlxQixZQUFZLENBQUNMO1FBRWhETCw0QkFBNEJTLGdCQUFnQixHQUFHO0lBQ2pELE9BQU8sSUFBSUYsa0JBQWtCLE1BQU07UUFDakMsSUFBTUksa0JBQWtCdEIsWUFBWXFCLFlBQVksQ0FBQ0g7UUFFakRQLDRCQUE0QlcsaUJBQWtCLEdBQUc7SUFDbkQ7SUFFQSxPQUFPWDtBQUNUIn0=
|
|
@@ -10,9 +10,6 @@ function _export(target, all) {
|
|
|
10
10
|
});
|
|
11
11
|
}
|
|
12
12
|
_export(exports, {
|
|
13
|
-
get unifyEquality () {
|
|
14
|
-
return unifyEquality;
|
|
15
|
-
},
|
|
16
13
|
get unifyMetavariable () {
|
|
17
14
|
return unifyMetavariable;
|
|
18
15
|
},
|
|
@@ -36,7 +33,6 @@ _export(exports, {
|
|
|
36
33
|
}
|
|
37
34
|
});
|
|
38
35
|
var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
|
|
39
|
-
var _equality = /*#__PURE__*/ _interop_require_default(require("../unifier/equality"));
|
|
40
36
|
var _metaLevel = /*#__PURE__*/ _interop_require_default(require("../unifier/metaLevel"));
|
|
41
37
|
var _metavariable = /*#__PURE__*/ _interop_require_default(require("../unifier/metavariable"));
|
|
42
38
|
var _intrinsicLevel = /*#__PURE__*/ _interop_require_default(require("../unifier/intrinsicLevel"));
|
|
@@ -47,12 +43,6 @@ function _interop_require_default(obj) {
|
|
|
47
43
|
default: obj
|
|
48
44
|
};
|
|
49
45
|
}
|
|
50
|
-
function unifyEquality(equality, context) {
|
|
51
|
-
var equalityUnified;
|
|
52
|
-
var leftTerm = equality.getLeftTerm(), rightTerm = equality.getRightTerm(), leftTermNode = leftTerm.getNode(), rightTermNode = rightTerm.getNode();
|
|
53
|
-
equalityUnified = _equality.default.unify(leftTermNode, rightTermNode, context);
|
|
54
|
-
return equalityUnified;
|
|
55
|
-
}
|
|
56
46
|
function unifyStatement(generalStatement, specificStatement, substitutions, generalContext, specificContext) {
|
|
57
47
|
var statementUnified;
|
|
58
48
|
var generalStatementNode = generalStatement.getNode(), specificStatementNode = specificStatement.getNode(), generalStatementTokens = generalStatement.getTokens(), specificStatementTokens = specificStatement.getTokens();
|
|
@@ -118,4 +108,4 @@ function contextFromTokens(tokens, context) {
|
|
|
118
108
|
return context;
|
|
119
109
|
}
|
|
120
110
|
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/unification.js"],"sourcesContent":["\"use string\";\n\nimport LocalContext from \"../context/local\";\nimport equalityUnifier from \"../unifier/equality\";\nimport metaLevelUnifier from \"../unifier/metaLevel\";\nimport metavariableUnifier from \"../unifier/metavariable\";\nimport intrinsicLevelUnifier from \"../unifier/intrinsicLevel\";\nimport termWithConstructorUnifier from \"../unifier/termWithConstructor\";\nimport statementWithCombinatorUnifier from \"../unifier/statementWithCombinator\";\n\nexport function unifyEquality(equality, context) {\n  let equalityUnified;\n\n  const leftTerm = equality.getLeftTerm(),\n        rightTerm = equality.getRightTerm(),\n        leftTermNode = leftTerm.getNode(),\n        rightTermNode = rightTerm.getNode();\n\n  equalityUnified = equalityUnifier.unify(leftTermNode, rightTermNode, context);\n\n  return equalityUnified;\n}\n\nexport function unifyStatement(generalStatement, specificStatement, substitutions, generalContext, specificContext) {\n  let statementUnified;\n\n  const generalStatementNode = generalStatement.getNode(),\n        specificStatementNode = specificStatement.getNode(),\n        generalStatementTokens = generalStatement.getTokens(),\n        specificStatementTokens = specificStatement.getTokens();\n\n  generalContext = contextFromTokens(generalStatementTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificStatementTokens, specificContext);  ///\n\n  const generalNonTerminalNode = generalStatementNode, ///\n        specificNonTerminalNode = specificStatementNode,  ///\n        unifiedAtMetaLevel = metaLevelUnifier.unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);\n\n  statementUnified = unifiedAtMetaLevel; ///\n\n  return statementUnified;\n}\n\nexport function unifySubstitution(generalSubstitution, specificSubstitution, substitutions, generalContext, specificContext) {\n  let substitutionUnified;\n\n  const generalSubstitutionNode = generalSubstitution.getNode(),\n        specificSubstitutionNode = specificSubstitution.getNode(),\n        generalSubstitutionTokens = generalSubstitution.getTokens(),\n        specificSubstitutionTokens = specificSubstitution.getTokens();\n\n  generalContext = contextFromTokens(generalSubstitutionTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificSubstitutionTokens, specificContext);  ///\n\n  const generalNonTerminalNode = generalSubstitutionNode, ///\n        specificNonTerminalNode = specificSubstitutionNode,\n        unifiedAtMetaLevel = metaLevelUnifier.unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);\n\n  substitutionUnified = unifiedAtMetaLevel; ///\n\n  return substitutionUnified;\n}\n\nexport function unifyMetavariable(generalMetavariable, specificMetavariable, generalContext, specificContext) {\n  let metavariableUnified;\n\n  const generalMetavariableNode = generalMetavariable.getNode(),\n        specificMetavariableNode = specificMetavariable.getNode(),\n        generalMetavariableTokens = generalMetavariable.getTokens(),\n        specificMetavariableTokens = specificMetavariable.getTokens();\n\n  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///\n\n  metavariableUnified = metavariableUnifier.unify(generalMetavariableNode, specificMetavariableNode, generalContext, specificContext);\n\n  return metavariableUnified;\n}\n\nexport function unifyTermWithConstructor(term, constructor, context) {\n  let termUnifiedWithConstructor;\n\n  const termNode = term.getNode(),\n        constructorTerm = constructor.getTerm(),\n        constructorTermNode = constructorTerm.getNode();\n\n  termUnifiedWithConstructor = termWithConstructorUnifier.unify(constructorTermNode, termNode, context);\n\n  return termUnifiedWithConstructor;\n}\n\nexport function unifyStatementIntrinsically(generalStatement, specificStatement, substitutions, generalContext, specificContext) {\n  let metavariableUnifiedIntrinsically;\n\n  const generalStatementNode = generalStatement.getNode(),\n        specificStatementNode = specificStatement.getNode(),\n        generalStatementTokens = generalStatement.getTokens(),\n        specificStatementTokens = specificStatement.getTokens();\n\n  generalContext = contextFromTokens(generalStatementTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificStatementTokens, specificContext); ///\n\n  const generalNonTerminalNode = generalStatementNode, ///\n        specificNonTerminalNode = specificStatementNode; ///\n\n  metavariableUnifiedIntrinsically = intrinsicLevelUnifier.unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);\n\n  return metavariableUnifiedIntrinsically;\n}\n\nexport function unifyStatementWithCombinator(statement, combinator, assignments, stated, context) {\n  let statementUnifiedWithCombinator;\n\n  const statementNode = statement.getNode(),\n        statementTokens = statement.getTokens(),\n        combinatorStatement = combinator.getStatement(),\n        combinatorStatementNode = combinatorStatement.getNode(),\n        combinatorStatementTokens = combinatorStatement.getTokens();\n\n  let generalContext = context, ///\n      specificContext = context;  ///\n\n  generalContext = contextFromTokens(combinatorStatementTokens, generalContext);  ///\n\n  specificContext = contextFromTokens(statementTokens, specificContext);  ///\n\n  statementUnifiedWithCombinator = statementWithCombinatorUnifier.unify(combinatorStatementNode, statementNode, assignments, stated, generalContext, specificContext);\n\n  return statementUnifiedWithCombinator;\n}\n\nexport function unifyMetavariableIntrinsically(generalMetavariable, specificMetavariable, substitutions, generalContext, specificContext) {\n  let metavariableUnifiedIntrinsically;\n\n  const generalMetavariableNode = generalMetavariable.getNode(),\n        specificMetavariableNode = specificMetavariable.getNode(),\n        generalMetavariableTokens = generalMetavariable.getTokens(),\n        specificMetavariableTokens = specificMetavariable.getTokens();\n\n  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///\n\n  const generalNonTerminalNode = generalMetavariableNode, ///\n        specificNonTerminalNode = specificMetavariableNode; ///\n\n  metavariableUnifiedIntrinsically = intrinsicLevelUnifier.unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);\n\n  return metavariableUnifiedIntrinsically;\n}\n\nfunction contextFromTokens(tokens, context) {\n  const localContext = LocalContext.fromContextAndTokens(context, tokens);\n\n  context = localContext;  ///\n\n  return context;\n}\n"],"names":["unifyEquality","unifyMetavariable","unifyMetavariableIntrinsically","unifyStatement","unifyStatementIntrinsically","unifyStatementWithCombinator","unifySubstitution","unifyTermWithConstructor","equality","context","equalityUnified","leftTerm","getLeftTerm","rightTerm","getRightTerm","leftTermNode","getNode","rightTermNode","equalityUnifier","unify","generalStatement","specificStatement","substitutions","generalContext","specificContext","statementUnified","generalStatementNode","specificStatementNode","generalStatementTokens","getTokens","specificStatementTokens","contextFromTokens","generalNonTerminalNode","specificNonTerminalNode","unifiedAtMetaLevel","metaLevelUnifier","generalSubstitution","specificSubstitution","substitutionUnified","generalSubstitutionNode","specificSubstitutionNode","generalSubstitutionTokens","specificSubstitutionTokens","generalMetavariable","specificMetavariable","metavariableUnified","generalMetavariableNode","specificMetavariableNode","generalMetavariableTokens","specificMetavariableTokens","metavariableUnifier","term","constructor","termUnifiedWithConstructor","termNode","constructorTerm","getTerm","constructorTermNode","termWithConstructorUnifier","metavariableUnifiedIntrinsically","intrinsicLevelUnifier","statement","combinator","assignments","stated","statementUnifiedWithCombinator","statementNode","statementTokens","combinatorStatement","getStatement","combinatorStatementNode","combinatorStatementTokens","statementWithCombinatorUnifier","tokens","localContext","LocalContext","fromContextAndTokens"],"mappings":"AAAA;;;;;;;;;;;;QAUgBA;eAAAA;;QAuDAC;eAAAA;;QAsEAC;eAAAA;;QAhHAC;eAAAA;;QAuEAC;eAAAA;;QAoBAC;eAAAA;;QAtEAC;eAAAA;;QAsCAC;eAAAA;;;4DAhFS;+DACG;gEACC;mEACG;qEACE;0EACK;8EACI;;;;;;AAEpC,SAASP,cAAcQ,QAAQ,EAAEC,OAAO;IAC7C,IAAIC;IAEJ,IAAMC,WAAWH,SAASI,WAAW,IAC/BC,YAAYL,SAASM,YAAY,IACjCC,eAAeJ,SAASK,OAAO,IAC/BC,gBAAgBJ,UAAUG,OAAO;IAEvCN,kBAAkBQ,iBAAe,CAACC,KAAK,CAACJ,cAAcE,eAAeR;IAErE,OAAOC;AACT;AAEO,SAASP,eAAeiB,gBAAgB,EAAEC,iBAAiB,EAAEC,aAAa,EAAEC,cAAc,EAAEC,eAAe;IAChH,IAAIC;IAEJ,IAAMC,uBAAuBN,iBAAiBJ,OAAO,IAC/CW,wBAAwBN,kBAAkBL,OAAO,IACjDY,yBAAyBR,iBAAiBS,SAAS,IACnDC,0BAA0BT,kBAAkBQ,SAAS;IAE3DN,iBAAiBQ,kBAAkBH,wBAAwBL,iBAAiB,GAAG;IAE/EC,kBAAkBO,kBAAkBD,yBAAyBN,kBAAmB,GAAG;IAEnF,IAAMQ,yBAAyBN,sBACzBO,0BAA0BN,uBAC1BO,qBAAqBC,kBAAgB,CAAChB,KAAK,CAACa,wBAAwBC,yBAAyBX,eAAeC,gBAAgBC;IAElIC,mBAAmBS,oBAAoB,GAAG;IAE1C,OAAOT;AACT;AAEO,SAASnB,kBAAkB8B,mBAAmB,EAAEC,oBAAoB,EAAEf,aAAa,EAAEC,cAAc,EAAEC,eAAe;IACzH,IAAIc;IAEJ,IAAMC,0BAA0BH,oBAAoBpB,OAAO,IACrDwB,2BAA2BH,qBAAqBrB,OAAO,IACvDyB,4BAA4BL,oBAAoBP,SAAS,IACzDa,6BAA6BL,qBAAqBR,SAAS;IAEjEN,iBAAiBQ,kBAAkBU,2BAA2BlB,iBAAiB,GAAG;IAElFC,kBAAkBO,kBAAkBW,4BAA4BlB,kBAAmB,GAAG;IAEtF,IAAMQ,yBAAyBO,yBACzBN,0BAA0BO,0BAC1BN,qBAAqBC,kBAAgB,CAAChB,KAAK,CAACa,wBAAwBC,yBAAyBX,eAAeC,gBAAgBC;IAElIc,sBAAsBJ,oBAAoB,GAAG;IAE7C,OAAOI;AACT;AAEO,SAASrC,kBAAkB0C,mBAAmB,EAAEC,oBAAoB,EAAErB,cAAc,EAAEC,eAAe;IAC1G,IAAIqB;IAEJ,IAAMC,0BAA0BH,oBAAoB3B,OAAO,IACrD+B,2BAA2BH,qBAAqB5B,OAAO,IACvDgC,4BAA4BL,oBAAoBd,SAAS,IACzDoB,6BAA6BL,qBAAqBf,SAAS;IAEjEN,iBAAiBQ,kBAAkBiB,2BAA2BzB,iBAAiB,GAAG;IAElFC,kBAAkBO,kBAAkBkB,4BAA4BzB,kBAAkB,GAAG;IAErFqB,sBAAsBK,qBAAmB,CAAC/B,KAAK,CAAC2B,yBAAyBC,0BAA0BxB,gBAAgBC;IAEnH,OAAOqB;AACT;AAEO,SAAStC,yBAAyB4C,IAAI,EAAEC,WAAW,EAAE3C,OAAO;IACjE,IAAI4C;IAEJ,IAAMC,WAAWH,KAAKnC,OAAO,IACvBuC,kBAAkBH,YAAYI,OAAO,IACrCC,sBAAsBF,gBAAgBvC,OAAO;IAEnDqC,6BAA6BK,4BAA0B,CAACvC,KAAK,CAACsC,qBAAqBH,UAAU7C;IAE7F,OAAO4C;AACT;AAEO,SAASjD,4BAA4BgB,gBAAgB,EAAEC,iBAAiB,EAAEC,aAAa,EAAEC,cAAc,EAAEC,eAAe;IAC7H,IAAImC;IAEJ,IAAMjC,uBAAuBN,iBAAiBJ,OAAO,IAC/CW,wBAAwBN,kBAAkBL,OAAO,IACjDY,yBAAyBR,iBAAiBS,SAAS,IACnDC,0BAA0BT,kBAAkBQ,SAAS;IAE3DN,iBAAiBQ,kBAAkBH,wBAAwBL,iBAAiB,GAAG;IAE/EC,kBAAkBO,kBAAkBD,yBAAyBN,kBAAkB,GAAG;IAElF,IAAMQ,yBAAyBN,sBACzBO,0BAA0BN,uBAAuB,GAAG;IAE1DgC,mCAAmCC,uBAAqB,CAACzC,KAAK,CAACa,wBAAwBC,yBAAyBX,eAAeC,gBAAgBC;IAE/I,OAAOmC;AACT;AAEO,SAAStD,6BAA6BwD,SAAS,EAAEC,UAAU,EAAEC,WAAW,EAAEC,MAAM,EAAEvD,OAAO;IAC9F,IAAIwD;IAEJ,IAAMC,gBAAgBL,UAAU7C,OAAO,IACjCmD,kBAAkBN,UAAUhC,SAAS,IACrCuC,sBAAsBN,WAAWO,YAAY,IAC7CC,0BAA0BF,oBAAoBpD,OAAO,IACrDuD,4BAA4BH,oBAAoBvC,SAAS;IAE/D,IAAIN,iBAAiBd,SACjBe,kBAAkBf,SAAU,GAAG;IAEnCc,iBAAiBQ,kBAAkBwC,2BAA2BhD,iBAAkB,GAAG;IAEnFC,kBAAkBO,kBAAkBoC,iBAAiB3C,kBAAmB,GAAG;IAE3EyC,iCAAiCO,gCAA8B,CAACrD,KAAK,CAACmD,yBAAyBJ,eAAeH,aAAaC,QAAQzC,gBAAgBC;IAEnJ,OAAOyC;AACT;AAEO,SAAS/D,+BAA+ByC,mBAAmB,EAAEC,oBAAoB,EAAEtB,aAAa,EAAEC,cAAc,EAAEC,eAAe;IACtI,IAAImC;IAEJ,IAAMb,0BAA0BH,oBAAoB3B,OAAO,IACrD+B,2BAA2BH,qBAAqB5B,OAAO,IACvDgC,4BAA4BL,oBAAoBd,SAAS,IACzDoB,6BAA6BL,qBAAqBf,SAAS;IAEjEN,iBAAiBQ,kBAAkBiB,2BAA2BzB,iBAAiB,GAAG;IAElFC,kBAAkBO,kBAAkBkB,4BAA4BzB,kBAAkB,GAAG;IAErF,IAAMQ,yBAAyBc,yBACzBb,0BAA0Bc,0BAA0B,GAAG;IAE7DY,mCAAmCC,uBAAqB,CAACzC,KAAK,CAACa,wBAAwBC,yBAAyBX,eAAeC,gBAAgBC;IAE/I,OAAOmC;AACT;AAEA,SAAS5B,kBAAkB0C,MAAM,EAAEhE,OAAO;IACxC,IAAMiE,eAAeC,cAAY,CAACC,oBAAoB,CAACnE,SAASgE;IAEhEhE,UAAUiE,cAAe,GAAG;IAE5B,OAAOjE;AACT"}
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/unification.js"],"sourcesContent":["\"use string\";\n\nimport LocalContext from \"../context/local\";\nimport metaLevelUnifier from \"../unifier/metaLevel\";\nimport metavariableUnifier from \"../unifier/metavariable\";\nimport intrinsicLevelUnifier from \"../unifier/intrinsicLevel\";\nimport termWithConstructorUnifier from \"../unifier/termWithConstructor\";\nimport statementWithCombinatorUnifier from \"../unifier/statementWithCombinator\";\n\nexport function unifyStatement(generalStatement, specificStatement, substitutions, generalContext, specificContext) {\n  let statementUnified;\n\n  const generalStatementNode = generalStatement.getNode(),\n        specificStatementNode = specificStatement.getNode(),\n        generalStatementTokens = generalStatement.getTokens(),\n        specificStatementTokens = specificStatement.getTokens();\n\n  generalContext = contextFromTokens(generalStatementTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificStatementTokens, specificContext);  ///\n\n  const generalNonTerminalNode = generalStatementNode, ///\n        specificNonTerminalNode = specificStatementNode,  ///\n        unifiedAtMetaLevel = metaLevelUnifier.unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);\n\n  statementUnified = unifiedAtMetaLevel; ///\n\n  return statementUnified;\n}\n\nexport function unifySubstitution(generalSubstitution, specificSubstitution, substitutions, generalContext, specificContext) {\n  let substitutionUnified;\n\n  const generalSubstitutionNode = generalSubstitution.getNode(),\n        specificSubstitutionNode = specificSubstitution.getNode(),\n        generalSubstitutionTokens = generalSubstitution.getTokens(),\n        specificSubstitutionTokens = specificSubstitution.getTokens();\n\n  generalContext = contextFromTokens(generalSubstitutionTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificSubstitutionTokens, specificContext);  ///\n\n  const generalNonTerminalNode = generalSubstitutionNode, ///\n        specificNonTerminalNode = specificSubstitutionNode,\n        unifiedAtMetaLevel = metaLevelUnifier.unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);\n\n  substitutionUnified = unifiedAtMetaLevel; ///\n\n  return substitutionUnified;\n}\n\nexport function unifyMetavariable(generalMetavariable, specificMetavariable, generalContext, specificContext) {\n  let metavariableUnified;\n\n  const generalMetavariableNode = generalMetavariable.getNode(),\n        specificMetavariableNode = specificMetavariable.getNode(),\n        generalMetavariableTokens = generalMetavariable.getTokens(),\n        specificMetavariableTokens = specificMetavariable.getTokens();\n\n  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///\n\n  metavariableUnified = metavariableUnifier.unify(generalMetavariableNode, specificMetavariableNode, generalContext, specificContext);\n\n  return metavariableUnified;\n}\n\nexport function unifyTermWithConstructor(term, constructor, context) {\n  let termUnifiedWithConstructor;\n\n  const termNode = term.getNode(),\n        constructorTerm = constructor.getTerm(),\n        constructorTermNode = constructorTerm.getNode();\n\n  termUnifiedWithConstructor = termWithConstructorUnifier.unify(constructorTermNode, termNode, context);\n\n  return termUnifiedWithConstructor;\n}\n\nexport function unifyStatementIntrinsically(generalStatement, specificStatement, substitutions, generalContext, specificContext) {\n  let metavariableUnifiedIntrinsically;\n\n  const generalStatementNode = generalStatement.getNode(),\n        specificStatementNode = specificStatement.getNode(),\n        generalStatementTokens = generalStatement.getTokens(),\n        specificStatementTokens = specificStatement.getTokens();\n\n  generalContext = contextFromTokens(generalStatementTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificStatementTokens, specificContext); ///\n\n  const generalNonTerminalNode = generalStatementNode, ///\n        specificNonTerminalNode = specificStatementNode; ///\n\n  metavariableUnifiedIntrinsically = intrinsicLevelUnifier.unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);\n\n  return metavariableUnifiedIntrinsically;\n}\n\nexport function unifyStatementWithCombinator(statement, combinator, assignments, stated, context) {\n  let statementUnifiedWithCombinator;\n\n  const statementNode = statement.getNode(),\n        statementTokens = statement.getTokens(),\n        combinatorStatement = combinator.getStatement(),\n        combinatorStatementNode = combinatorStatement.getNode(),\n        combinatorStatementTokens = combinatorStatement.getTokens();\n\n  let generalContext = context, ///\n      specificContext = context;  ///\n\n  generalContext = contextFromTokens(combinatorStatementTokens, generalContext);  ///\n\n  specificContext = contextFromTokens(statementTokens, specificContext);  ///\n\n  statementUnifiedWithCombinator = statementWithCombinatorUnifier.unify(combinatorStatementNode, statementNode, assignments, stated, generalContext, specificContext);\n\n  return statementUnifiedWithCombinator;\n}\n\nexport function unifyMetavariableIntrinsically(generalMetavariable, specificMetavariable, substitutions, generalContext, specificContext) {\n  let metavariableUnifiedIntrinsically;\n\n  const generalMetavariableNode = generalMetavariable.getNode(),\n        specificMetavariableNode = specificMetavariable.getNode(),\n        generalMetavariableTokens = generalMetavariable.getTokens(),\n        specificMetavariableTokens = specificMetavariable.getTokens();\n\n  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///\n\n  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///\n\n  const generalNonTerminalNode = generalMetavariableNode, ///\n        specificNonTerminalNode = specificMetavariableNode; ///\n\n  metavariableUnifiedIntrinsically = intrinsicLevelUnifier.unify(generalNonTerminalNode, specificNonTerminalNode, substitutions, generalContext, specificContext);\n\n  return metavariableUnifiedIntrinsically;\n}\n\nfunction contextFromTokens(tokens, context) {\n  const localContext = LocalContext.fromContextAndTokens(context, tokens);\n\n  context = localContext;  ///\n\n  return context;\n}\n"],"names":["unifyMetavariable","unifyMetavariableIntrinsically","unifyStatement","unifyStatementIntrinsically","unifyStatementWithCombinator","unifySubstitution","unifyTermWithConstructor","generalStatement","specificStatement","substitutions","generalContext","specificContext","statementUnified","generalStatementNode","getNode","specificStatementNode","generalStatementTokens","getTokens","specificStatementTokens","contextFromTokens","generalNonTerminalNode","specificNonTerminalNode","unifiedAtMetaLevel","metaLevelUnifier","unify","generalSubstitution","specificSubstitution","substitutionUnified","generalSubstitutionNode","specificSubstitutionNode","generalSubstitutionTokens","specificSubstitutionTokens","generalMetavariable","specificMetavariable","metavariableUnified","generalMetavariableNode","specificMetavariableNode","generalMetavariableTokens","specificMetavariableTokens","metavariableUnifier","term","constructor","context","termUnifiedWithConstructor","termNode","constructorTerm","getTerm","constructorTermNode","termWithConstructorUnifier","metavariableUnifiedIntrinsically","intrinsicLevelUnifier","statement","combinator","assignments","stated","statementUnifiedWithCombinator","statementNode","statementTokens","combinatorStatement","getStatement","combinatorStatementNode","combinatorStatementTokens","statementWithCombinatorUnifier","tokens","localContext","LocalContext","fromContextAndTokens"],"mappings":"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"}
|
package/package.json
CHANGED
package/src/context/local.js
CHANGED
|
@@ -123,53 +123,14 @@ class LocalContext {
|
|
|
123
123
|
|
|
124
124
|
const equalityReflexive = equality.isReflexive();
|
|
125
125
|
|
|
126
|
-
if (equalityReflexive) {
|
|
127
|
-
|
|
128
|
-
} else {
|
|
129
|
-
const leftTerm = equality.getLeftTerm(),
|
|
130
|
-
rightTerm = equality.getRightTerm(),
|
|
131
|
-
leftEquivalence = this.findEquivalenceByTerm(leftTerm),
|
|
132
|
-
rightEquivalence = this.findEquivalenceByTerm(rightTerm);
|
|
133
|
-
|
|
134
|
-
if (false) {
|
|
135
|
-
///
|
|
136
|
-
} else if ((leftEquivalence === null) && (rightEquivalence === null)) {
|
|
137
|
-
const equivalence = Equivalence.fromLeftTermAndRightTerm(leftTerm, rightTerm);
|
|
138
|
-
|
|
139
|
-
this.addEquivalence(equivalence, context);
|
|
140
|
-
|
|
141
|
-
equalityAdded = true;
|
|
142
|
-
} else if ((leftEquivalence !== null) && (rightEquivalence === null)) {
|
|
143
|
-
leftEquivalence.addTerm(rightTerm, context);
|
|
144
|
-
|
|
145
|
-
equalityAdded = true;
|
|
146
|
-
} else if ((leftEquivalence === null) && (rightEquivalence !== null)) {
|
|
147
|
-
rightEquivalence.addTerm(leftTerm, context);
|
|
148
|
-
|
|
149
|
-
equalityAdded = true;
|
|
150
|
-
} else if ((leftEquivalence !== null) && (rightEquivalence !== null)) {
|
|
151
|
-
let equivalence;
|
|
152
|
-
|
|
153
|
-
if (leftEquivalence === rightEquivalence) {
|
|
154
|
-
equivalence = leftEquivalence; ///
|
|
155
|
-
} else {
|
|
156
|
-
equivalence = Equivalence.merge(leftEquivalence, rightEquivalence);
|
|
157
|
-
|
|
158
|
-
this.removeEquivalence(leftEquivalence, context);
|
|
126
|
+
if (!equalityReflexive) {
|
|
127
|
+
const equivalence = Equivalence.fromEquality(equality);
|
|
159
128
|
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
this.addEquivalence(equivalence, context);
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
equivalence.addTerm(leftTerm, context);
|
|
166
|
-
|
|
167
|
-
equivalence.addTerm(rightTerm, context);
|
|
168
|
-
|
|
169
|
-
equalityAdded = true;
|
|
170
|
-
}
|
|
129
|
+
this.equivalences = this.equivalences.mergedWithEquivalence(equivalence, context);
|
|
171
130
|
}
|
|
172
131
|
|
|
132
|
+
equalityAdded = true;
|
|
133
|
+
|
|
173
134
|
return equalityAdded;
|
|
174
135
|
}
|
|
175
136
|
|
|
@@ -188,10 +149,6 @@ class LocalContext {
|
|
|
188
149
|
return variableAdded;
|
|
189
150
|
}
|
|
190
151
|
|
|
191
|
-
addEquivalence(equivalence, context) { return this.equivalences.addEquivalence(equivalence, context); }
|
|
192
|
-
|
|
193
|
-
removeEquivalence(equivalence, context) { return this.equivalences.removeEquivalence(equivalence, context); }
|
|
194
|
-
|
|
195
152
|
addStepOrSubproof(stepOrSubproof) {
|
|
196
153
|
this.stepsOrSubproofs.push(stepOrSubproof);
|
|
197
154
|
}
|
|
@@ -83,7 +83,9 @@ export default domAssigned(class PropertyAssertion {
|
|
|
83
83
|
verifiedWhenDerived = this.verifyWhenDerived(context);
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
|
|
86
|
+
if (verifiedWhenStated || verifiedWhenDerived) {
|
|
87
|
+
verified = true;
|
|
88
|
+
}
|
|
87
89
|
}
|
|
88
90
|
}
|
|
89
91
|
|
|
@@ -43,7 +43,9 @@ export default domAssigned(class TypeAssertion {
|
|
|
43
43
|
verifiedWhenDerived = this.verifyWhenDerived(context);
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
|
|
46
|
+
if (verifiedWhenStated || verifiedWhenDerived) {
|
|
47
|
+
verified = true;
|
|
48
|
+
}
|
|
47
49
|
}
|
|
48
50
|
|
|
49
51
|
if (verified) {
|
package/src/dom/axiom.js
CHANGED
|
@@ -79,17 +79,16 @@ export default domAssigned(class Axiom extends TopLevelAssertion {
|
|
|
79
79
|
return signatureMatches;
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
-
unifyStep(step, substitutions,
|
|
82
|
+
unifyStep(step, substitutions, context) {
|
|
83
83
|
let stepUnified = false;
|
|
84
84
|
|
|
85
|
-
const
|
|
86
|
-
stepString = step.getString(),
|
|
85
|
+
const stepString = step.getString(),
|
|
87
86
|
axiomString = this.string; ///
|
|
88
87
|
|
|
89
88
|
context.trace(`Unifying the '${stepString}' step with the '${axiomString}' axiom...`);
|
|
90
89
|
|
|
91
90
|
const statement = step.getStatement(),
|
|
92
|
-
statementUnified = this.unifyStatement(statement, substitutions,
|
|
91
|
+
statementUnified = this.unifyStatement(statement, substitutions, context);
|
|
93
92
|
|
|
94
93
|
if (statementUnified) {
|
|
95
94
|
stepUnified = true;
|
|
@@ -111,10 +110,10 @@ export default domAssigned(class Axiom extends TopLevelAssertion {
|
|
|
111
110
|
|
|
112
111
|
context.trace(`Unifying the '${lastStepString}' last step with the '${axiomString}' axiom...`)
|
|
113
112
|
|
|
114
|
-
const
|
|
115
|
-
|
|
113
|
+
const statement = lastStep.getStatement(),
|
|
114
|
+
statementUnified = this.unifyStatementWithDeduction(statement, substitutions, generalContext, specificContext);
|
|
116
115
|
|
|
117
|
-
if (
|
|
116
|
+
if (statementUnified) {
|
|
118
117
|
lastStepUnified = true;
|
|
119
118
|
}
|
|
120
119
|
|
|
@@ -125,16 +124,19 @@ export default domAssigned(class Axiom extends TopLevelAssertion {
|
|
|
125
124
|
return lastStepUnified;
|
|
126
125
|
}
|
|
127
126
|
|
|
128
|
-
unifySubproof(subproof, substitutions,
|
|
127
|
+
unifySubproof(subproof, substitutions, context) {
|
|
129
128
|
let subproofUnified = false;
|
|
130
129
|
|
|
131
|
-
const
|
|
132
|
-
axiomString = this.string, ///
|
|
130
|
+
const axiomString = this.string, ///
|
|
133
131
|
subproofString = subproof.getString();
|
|
134
132
|
|
|
135
133
|
context.trace(`Unifying the '${subproofString}' subproof with the '${axiomString}' axiom...`);
|
|
136
134
|
|
|
137
135
|
const lastStep = subproof.getLastStep(),
|
|
136
|
+
fileContext = this.getFileContext(),
|
|
137
|
+
localContext = LocalContext.fromFileContext(fileContext),
|
|
138
|
+
generalContext = localContext, ///
|
|
139
|
+
specificContext = context, ///
|
|
138
140
|
lastStepUnified = this.unifyLastStep(lastStep, substitutions, generalContext, specificContext);
|
|
139
141
|
|
|
140
142
|
if (lastStepUnified) {
|
package/src/dom/equality.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import dom from "../dom";
|
|
4
|
+
import equationalUnifier from "../unifier/equantional";
|
|
4
5
|
import EqualityAssignment from "../assignment/equality";
|
|
5
6
|
import VariableAssignment from "../assignment/variable";
|
|
6
7
|
|
|
7
8
|
import { domAssigned } from "../dom";
|
|
8
|
-
import { unifyEquality } from "../utilities/unification";
|
|
9
9
|
|
|
10
10
|
export default domAssigned(class Equality {
|
|
11
11
|
constructor(string, leftTerm, rightTerm) {
|
|
@@ -45,6 +45,15 @@ export default domAssigned(class Equality {
|
|
|
45
45
|
return type;
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
+
getTerms() {
|
|
49
|
+
const terms = [
|
|
50
|
+
this.leftTerm,
|
|
51
|
+
this.rightTerm
|
|
52
|
+
];
|
|
53
|
+
|
|
54
|
+
return terms;
|
|
55
|
+
}
|
|
56
|
+
|
|
48
57
|
isReflexive() {
|
|
49
58
|
const leftTermString = this.leftTerm.getString(),
|
|
50
59
|
rightTermString = this.rightTerm.getString(),
|
|
@@ -54,9 +63,15 @@ export default domAssigned(class Equality {
|
|
|
54
63
|
}
|
|
55
64
|
|
|
56
65
|
isEqual(context) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
66
|
+
let equal = false;
|
|
67
|
+
|
|
68
|
+
const leftTermNode = this.leftTerm.getNode(),
|
|
69
|
+
rightTermNode = this.rightTerm.getNode(),
|
|
70
|
+
termsEquated = equationalUnifier.equateTerms(leftTermNode, rightTermNode, context);
|
|
71
|
+
|
|
72
|
+
if (termsEquated) {
|
|
73
|
+
equal = true;
|
|
74
|
+
}
|
|
60
75
|
|
|
61
76
|
return equal;
|
|
62
77
|
}
|
|
@@ -80,11 +95,15 @@ export default domAssigned(class Equality {
|
|
|
80
95
|
verifiedWhenDerived = this.verifyWhenDerived(context);
|
|
81
96
|
}
|
|
82
97
|
|
|
83
|
-
|
|
98
|
+
if (verifiedWhenStated || verifiedWhenDerived) {
|
|
99
|
+
verified = true;
|
|
100
|
+
}
|
|
84
101
|
}
|
|
85
102
|
|
|
86
103
|
if (verified) {
|
|
87
|
-
|
|
104
|
+
|
|
105
|
+
this.assign(assignments, context);
|
|
106
|
+
|
|
88
107
|
}
|
|
89
108
|
|
|
90
109
|
if (verified) {
|
|
@@ -153,9 +172,7 @@ export default domAssigned(class Equality {
|
|
|
153
172
|
|
|
154
173
|
context.trace(`Verifying the '${equalityString}' derived equality...`);
|
|
155
174
|
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
verifiedWhenDerived = equal; ///
|
|
175
|
+
verifiedWhenDerived = true; ///
|
|
159
176
|
|
|
160
177
|
if (verifiedWhenDerived) {
|
|
161
178
|
context.debug(`...verified the '${equalityString}' derived equality.`);
|
package/src/dom/judgement.js
CHANGED
|
@@ -50,7 +50,9 @@ export default domAssigned(class Judgement {
|
|
|
50
50
|
verifiedWhenDerived = this.verifyWhenDerived(context);
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
-
|
|
53
|
+
if (verifiedWhenStated || verifiedWhenDerived) {
|
|
54
|
+
verified = true;
|
|
55
|
+
}
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
|