occam-nominal 1.0.149 → 1.0.152
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/constants.js +5 -1
- package/lib/value.js +20 -1
- package/package.json +1 -1
- package/src/constants.js +1 -0
- package/src/value.js +35 -0
package/lib/constants.js
CHANGED
|
@@ -24,6 +24,9 @@ _export(exports, {
|
|
|
24
24
|
get MISSING () {
|
|
25
25
|
return MISSING;
|
|
26
26
|
},
|
|
27
|
+
get NULL () {
|
|
28
|
+
return NULL;
|
|
29
|
+
},
|
|
27
30
|
get PROVISIONAL () {
|
|
28
31
|
return PROVISIONAL;
|
|
29
32
|
},
|
|
@@ -41,6 +44,7 @@ _export(exports, {
|
|
|
41
44
|
}
|
|
42
45
|
});
|
|
43
46
|
const S = "s";
|
|
47
|
+
const NULL = "null";
|
|
44
48
|
const MISSING = "missing";
|
|
45
49
|
const UNDEFINED = "undefined";
|
|
46
50
|
const PROVISIONAL = "Provisional";
|
|
@@ -51,4 +55,4 @@ const BASE_TYPE_SYMBOL = "<>";
|
|
|
51
55
|
const BRACKETED_TERM_DEPTH = 2;
|
|
52
56
|
const BRACKETED_STATEMENT_DEPTH = 2;
|
|
53
57
|
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdGFudHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBjb25zdCBTID0gXCJzXCI7XG5leHBvcnQgY29uc3QgTlVMTCA9IFwibnVsbFwiO1xuZXhwb3J0IGNvbnN0IE1JU1NJTkcgPSBcIm1pc3NpbmdcIjtcbmV4cG9ydCBjb25zdCBVTkRFRklORUQgPSBcInVuZGVmaW5lZFwiO1xuZXhwb3J0IGNvbnN0IFBST1ZJU0lPTkFMID0gXCJQcm92aXNpb25hbFwiO1xuZXhwb3J0IGNvbnN0IEVNUFRZX1NUUklORyA9IFwiXCI7XG5leHBvcnQgY29uc3QgU0lOR0xFX1NQQUNFID0gXCIgXCI7XG5leHBvcnQgY29uc3QgUFJPVklTSU9OQUxMWSA9IFwicHJvdmlzaW9uYWxseVwiO1xuZXhwb3J0IGNvbnN0IEJBU0VfVFlQRV9TWU1CT0wgPSBcIjw+XCI7XG5leHBvcnQgY29uc3QgQlJBQ0tFVEVEX1RFUk1fREVQVEggPSAyO1xuZXhwb3J0IGNvbnN0IEJSQUNLRVRFRF9TVEFURU1FTlRfREVQVEggPSAyO1xuIl0sIm5hbWVzIjpbIkJBU0VfVFlQRV9TWU1CT0wiLCJCUkFDS0VURURfU1RBVEVNRU5UX0RFUFRIIiwiQlJBQ0tFVEVEX1RFUk1fREVQVEgiLCJFTVBUWV9TVFJJTkciLCJNSVNTSU5HIiwiTlVMTCIsIlBST1ZJU0lPTkFMIiwiUFJPVklTSU9OQUxMWSIsIlMiLCJTSU5HTEVfU1BBQ0UiLCJVTkRFRklORUQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQVVhQTtlQUFBQTs7UUFFQUM7ZUFBQUE7O1FBREFDO2VBQUFBOztRQUpBQztlQUFBQTs7UUFIQUM7ZUFBQUE7O1FBREFDO2VBQUFBOztRQUdBQztlQUFBQTs7UUFHQUM7ZUFBQUE7O1FBUEFDO2VBQUFBOztRQU1BQztlQUFBQTs7UUFIQUM7ZUFBQUE7OztBQUhOLE1BQU1GLElBQUk7QUFDVixNQUFNSCxPQUFPO0FBQ2IsTUFBTUQsVUFBVTtBQUNoQixNQUFNTSxZQUFZO0FBQ2xCLE1BQU1KLGNBQWM7QUFDcEIsTUFBTUgsZUFBZTtBQUNyQixNQUFNTSxlQUFlO0FBQ3JCLE1BQU1GLGdCQUFnQjtBQUN0QixNQUFNUCxtQkFBbUI7QUFDekIsTUFBTUUsdUJBQXVCO0FBQzdCLE1BQU1ELDRCQUE0QiJ9
|
package/lib/value.js
CHANGED
|
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Value;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
const _constants = require("./constants");
|
|
11
12
|
class Value {
|
|
12
13
|
constructor(context, string, node){
|
|
13
14
|
this.context = context;
|
|
@@ -23,14 +24,32 @@ class Value {
|
|
|
23
24
|
getNode() {
|
|
24
25
|
return this.node;
|
|
25
26
|
}
|
|
27
|
+
match(value) {
|
|
28
|
+
const node = value.getNode(), nodeA = node, nodeB = this.node, nodesMatch = matchNodes(nodeA, nodeB), matches = nodesMatch; ///
|
|
29
|
+
return matches;
|
|
30
|
+
}
|
|
26
31
|
static fromNode(node, context) {
|
|
27
32
|
const string = context.nodeAsString(node), value = new Value(context, string, node);
|
|
28
33
|
return value;
|
|
29
34
|
}
|
|
35
|
+
static fromNothing() {
|
|
36
|
+
const context = null, string = _constants.NULL, node = null, value = new Value(context, string, node);
|
|
37
|
+
return value;
|
|
38
|
+
}
|
|
30
39
|
static fromSubstitution(substitution) {
|
|
31
40
|
const replacementNode = substitution.getReplacementNode(), specificContext = substitution.getSpecificContext(), node = replacementNode, context = specificContext, string = context.nodeAsString(node), value = new Value(context, string, node);
|
|
32
41
|
return value;
|
|
33
42
|
}
|
|
34
43
|
}
|
|
44
|
+
function matchNodes(nodeA, nodeB) {
|
|
45
|
+
let nodesMatch;
|
|
46
|
+
if (nodeA === null || nodeB === null) {
|
|
47
|
+
nodesMatch = nodeA === nodeB;
|
|
48
|
+
} else {
|
|
49
|
+
const nodeAMatchesNodeB = nodeA.match(nodeB);
|
|
50
|
+
nodesMatch = nodeAMatchesNodeB; ///
|
|
51
|
+
}
|
|
52
|
+
return nodesMatch;
|
|
53
|
+
}
|
|
35
54
|
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy92YWx1ZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgTlVMTCB9IGZyb20gXCIuL2NvbnN0YW50c1wiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBWYWx1ZSB7XG4gIGNvbnN0cnVjdG9yKGNvbnRleHQsIHN0cmluZywgbm9kZSkge1xuICAgIHRoaXMuY29udGV4dCA9IGNvbnRleHQ7XG4gICAgdGhpcy5zdHJpbmcgPSBzdHJpbmc7XG4gICAgdGhpcy5ub2RlID0gbm9kZTtcbiAgfVxuXG4gIGdldENvbnRleHQoKSB7XG4gICAgcmV0dXJuIHRoaXMuY29udGV4dDtcbiAgfVxuXG4gIGdldFN0cmluZygpIHtcbiAgICByZXR1cm4gdGhpcy5zdHJpbmc7XG4gIH1cblxuICBnZXROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLm5vZGU7XG4gIH1cblxuICBtYXRjaCh2YWx1ZSkge1xuICAgIGNvbnN0IG5vZGUgPSB2YWx1ZS5nZXROb2RlKCksXG4gICAgICAgICAgbm9kZUEgPSBub2RlLCAvLy9cbiAgICAgICAgICBub2RlQiA9IHRoaXMubm9kZSwgIC8vL1xuICAgICAgICAgIG5vZGVzTWF0Y2ggPSBtYXRjaE5vZGVzKG5vZGVBLCBub2RlQiksXG4gICAgICAgICAgbWF0Y2hlcyA9IG5vZGVzTWF0Y2g7IC8vL1xuXG4gICAgcmV0dXJuIG1hdGNoZXM7XG4gIH1cblxuICBzdGF0aWMgZnJvbU5vZGUobm9kZSwgY29udGV4dCkge1xuICAgIGNvbnN0IHN0cmluZyA9IGNvbnRleHQubm9kZUFzU3RyaW5nKG5vZGUpLFxuICAgICAgICAgIHZhbHVlID0gbmV3IFZhbHVlKGNvbnRleHQsIHN0cmluZywgbm9kZSk7XG5cbiAgICByZXR1cm4gdmFsdWU7XG4gIH1cblxuICBzdGF0aWMgZnJvbU5vdGhpbmcoKSB7XG4gICAgY29uc3QgY29udGV4dCA9IG51bGwsXG4gICAgICAgICAgc3RyaW5nID0gTlVMTCxcbiAgICAgICAgICBub2RlID0gbnVsbCxcbiAgICAgICAgICB2YWx1ZSA9IG5ldyBWYWx1ZShjb250ZXh0LCBzdHJpbmcsIG5vZGUpO1xuXG4gICAgcmV0dXJuIHZhbHVlO1xuICB9XG5cbiAgc3RhdGljIGZyb21TdWJzdGl0dXRpb24oc3Vic3RpdHV0aW9uKSB7XG4gICAgY29uc3QgcmVwbGFjZW1lbnROb2RlID0gc3Vic3RpdHV0aW9uLmdldFJlcGxhY2VtZW50Tm9kZSgpLFxuICAgICAgICAgIHNwZWNpZmljQ29udGV4dCA9IHN1YnN0aXR1dGlvbi5nZXRTcGVjaWZpY0NvbnRleHQoKSxcbiAgICAgICAgICBub2RlID0gcmVwbGFjZW1lbnROb2RlLCAvLy9cbiAgICAgICAgICBjb250ZXh0ID0gc3BlY2lmaWNDb250ZXh0LCAgLy8vXG4gICAgICAgICAgc3RyaW5nID0gY29udGV4dC5ub2RlQXNTdHJpbmcobm9kZSksXG4gICAgICAgICAgdmFsdWUgPSBuZXcgVmFsdWUoY29udGV4dCwgc3RyaW5nLCBub2RlKTtcblxuICAgIHJldHVybiB2YWx1ZTtcbiAgfVxufVxuXG5mdW5jdGlvbiBtYXRjaE5vZGVzKG5vZGVBLCBub2RlQikge1xuICBsZXQgbm9kZXNNYXRjaDtcblxuICBpZiAoKG5vZGVBID09PSBudWxsKSB8fCAobm9kZUIgPT09IG51bGwpKSB7XG4gICAgbm9kZXNNYXRjaCA9IChub2RlQSA9PT0gbm9kZUIpO1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IG5vZGVBTWF0Y2hlc05vZGVCID0gbm9kZUEubWF0Y2gobm9kZUIpO1xuXG4gICAgbm9kZXNNYXRjaCA9IG5vZGVBTWF0Y2hlc05vZGVCOyAgLy8vXG4gIH1cblxuICByZXR1cm4gbm9kZXNNYXRjaDtcbn1cbiJdLCJuYW1lcyI6WyJWYWx1ZSIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwiZ2V0Q29udGV4dCIsImdldFN0cmluZyIsImdldE5vZGUiLCJtYXRjaCIsInZhbHVlIiwibm9kZUEiLCJub2RlQiIsIm5vZGVzTWF0Y2giLCJtYXRjaE5vZGVzIiwibWF0Y2hlcyIsImZyb21Ob2RlIiwibm9kZUFzU3RyaW5nIiwiZnJvbU5vdGhpbmciLCJOVUxMIiwiZnJvbVN1YnN0aXR1dGlvbiIsInN1YnN0aXR1dGlvbiIsInJlcGxhY2VtZW50Tm9kZSIsImdldFJlcGxhY2VtZW50Tm9kZSIsInNwZWNpZmljQ29udGV4dCIsImdldFNwZWNpZmljQ29udGV4dCIsIm5vZGVBTWF0Y2hlc05vZGVCIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFJQTs7O2VBQXFCQTs7OzJCQUZBO0FBRU4sTUFBTUE7SUFDbkIsWUFBWUMsT0FBTyxFQUFFQyxNQUFNLEVBQUVDLElBQUksQ0FBRTtRQUNqQyxJQUFJLENBQUNGLE9BQU8sR0FBR0E7UUFDZixJQUFJLENBQUNDLE1BQU0sR0FBR0E7UUFDZCxJQUFJLENBQUNDLElBQUksR0FBR0E7SUFDZDtJQUVBQyxhQUFhO1FBQ1gsT0FBTyxJQUFJLENBQUNILE9BQU87SUFDckI7SUFFQUksWUFBWTtRQUNWLE9BQU8sSUFBSSxDQUFDSCxNQUFNO0lBQ3BCO0lBRUFJLFVBQVU7UUFDUixPQUFPLElBQUksQ0FBQ0gsSUFBSTtJQUNsQjtJQUVBSSxNQUFNQyxLQUFLLEVBQUU7UUFDWCxNQUFNTCxPQUFPSyxNQUFNRixPQUFPLElBQ3BCRyxRQUFRTixNQUNSTyxRQUFRLElBQUksQ0FBQ1AsSUFBSSxFQUNqQlEsYUFBYUMsV0FBV0gsT0FBT0MsUUFDL0JHLFVBQVVGLFlBQVksR0FBRztRQUUvQixPQUFPRTtJQUNUO0lBRUEsT0FBT0MsU0FBU1gsSUFBSSxFQUFFRixPQUFPLEVBQUU7UUFDN0IsTUFBTUMsU0FBU0QsUUFBUWMsWUFBWSxDQUFDWixPQUM5QkssUUFBUSxJQUFJUixNQUFNQyxTQUFTQyxRQUFRQztRQUV6QyxPQUFPSztJQUNUO0lBRUEsT0FBT1EsY0FBYztRQUNuQixNQUFNZixVQUFVLE1BQ1ZDLFNBQVNlLGVBQUksRUFDYmQsT0FBTyxNQUNQSyxRQUFRLElBQUlSLE1BQU1DLFNBQVNDLFFBQVFDO1FBRXpDLE9BQU9LO0lBQ1Q7SUFFQSxPQUFPVSxpQkFBaUJDLFlBQVksRUFBRTtRQUNwQyxNQUFNQyxrQkFBa0JELGFBQWFFLGtCQUFrQixJQUNqREMsa0JBQWtCSCxhQUFhSSxrQkFBa0IsSUFDakRwQixPQUFPaUIsaUJBQ1BuQixVQUFVcUIsaUJBQ1ZwQixTQUFTRCxRQUFRYyxZQUFZLENBQUNaLE9BQzlCSyxRQUFRLElBQUlSLE1BQU1DLFNBQVNDLFFBQVFDO1FBRXpDLE9BQU9LO0lBQ1Q7QUFDRjtBQUVBLFNBQVNJLFdBQVdILEtBQUssRUFBRUMsS0FBSztJQUM5QixJQUFJQztJQUVKLElBQUksQUFBQ0YsVUFBVSxRQUFVQyxVQUFVLE1BQU87UUFDeENDLGFBQWNGLFVBQVVDO0lBQzFCLE9BQU87UUFDTCxNQUFNYyxvQkFBb0JmLE1BQU1GLEtBQUssQ0FBQ0c7UUFFdENDLGFBQWFhLG1CQUFvQixHQUFHO0lBQ3RDO0lBRUEsT0FBT2I7QUFDVCJ9
|
package/package.json
CHANGED
package/src/constants.js
CHANGED
package/src/value.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { NULL } from "./constants";
|
|
4
|
+
|
|
3
5
|
export default class Value {
|
|
4
6
|
constructor(context, string, node) {
|
|
5
7
|
this.context = context;
|
|
@@ -19,6 +21,16 @@ export default class Value {
|
|
|
19
21
|
return this.node;
|
|
20
22
|
}
|
|
21
23
|
|
|
24
|
+
match(value) {
|
|
25
|
+
const node = value.getNode(),
|
|
26
|
+
nodeA = node, ///
|
|
27
|
+
nodeB = this.node, ///
|
|
28
|
+
nodesMatch = matchNodes(nodeA, nodeB),
|
|
29
|
+
matches = nodesMatch; ///
|
|
30
|
+
|
|
31
|
+
return matches;
|
|
32
|
+
}
|
|
33
|
+
|
|
22
34
|
static fromNode(node, context) {
|
|
23
35
|
const string = context.nodeAsString(node),
|
|
24
36
|
value = new Value(context, string, node);
|
|
@@ -26,6 +38,15 @@ export default class Value {
|
|
|
26
38
|
return value;
|
|
27
39
|
}
|
|
28
40
|
|
|
41
|
+
static fromNothing() {
|
|
42
|
+
const context = null,
|
|
43
|
+
string = NULL,
|
|
44
|
+
node = null,
|
|
45
|
+
value = new Value(context, string, node);
|
|
46
|
+
|
|
47
|
+
return value;
|
|
48
|
+
}
|
|
49
|
+
|
|
29
50
|
static fromSubstitution(substitution) {
|
|
30
51
|
const replacementNode = substitution.getReplacementNode(),
|
|
31
52
|
specificContext = substitution.getSpecificContext(),
|
|
@@ -37,3 +58,17 @@ export default class Value {
|
|
|
37
58
|
return value;
|
|
38
59
|
}
|
|
39
60
|
}
|
|
61
|
+
|
|
62
|
+
function matchNodes(nodeA, nodeB) {
|
|
63
|
+
let nodesMatch;
|
|
64
|
+
|
|
65
|
+
if ((nodeA === null) || (nodeB === null)) {
|
|
66
|
+
nodesMatch = (nodeA === nodeB);
|
|
67
|
+
} else {
|
|
68
|
+
const nodeAMatchesNodeB = nodeA.match(nodeB);
|
|
69
|
+
|
|
70
|
+
nodesMatch = nodeAMatchesNodeB; ///
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
return nodesMatch;
|
|
74
|
+
}
|