occam-verify-cli 0.0.479 → 0.0.481
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/conclusion.js +21 -20
- package/lib/constants.js +5 -1
- package/lib/equality.js +10 -13
- package/lib/metaSubstitution.js +26 -24
- package/lib/premise.js +21 -16
- package/lib/substitution.js +27 -25
- package/lib/utilities/node.js +16 -15
- package/lib/verify/statement.js +14 -16
- package/lib/verify/statementAsEquality.js +139 -0
- package/lib/verify/statementTypeAssertion.js +82 -0
- package/package.json +1 -1
- package/src/conclusion.js +35 -41
- package/src/constants.js +1 -0
- package/src/equality.js +14 -16
- package/src/metaSubstitution.js +33 -29
- package/src/premise.js +24 -26
- package/src/substitution.js +34 -30
- package/src/utilities/node.js +13 -13
- package/src/verify/statement.js +15 -19
- package/src/verify/statementAsEquality.js +146 -0
- package/src/verify/{assertion/type.js → statementTypeAssertion.js} +35 -29
- package/lib/verify/assertion/type.js +0 -79
- package/lib/verify/equality.js +0 -133
- package/src/verify/equality.js +0 -136
|
@@ -0,0 +1,139 @@
|
|
|
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 verifyStatementAsEquality;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
var _equality = /*#__PURE__*/ _interopRequireDefault(require("../equality"));
|
|
12
|
+
var _variable = /*#__PURE__*/ _interopRequireDefault(require("../variable"));
|
|
13
|
+
var _term = /*#__PURE__*/ _interopRequireWildcard(require("../verify/term"));
|
|
14
|
+
var _query = require("../utilities/query");
|
|
15
|
+
var _string = require("../utilities/string");
|
|
16
|
+
var _array = require("../utilities/array");
|
|
17
|
+
var _constants = require("../constants");
|
|
18
|
+
function _interopRequireDefault(obj) {
|
|
19
|
+
return obj && obj.__esModule ? obj : {
|
|
20
|
+
default: obj
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
function _getRequireWildcardCache(nodeInterop) {
|
|
24
|
+
if (typeof WeakMap !== "function") return null;
|
|
25
|
+
var cacheBabelInterop = new WeakMap();
|
|
26
|
+
var cacheNodeInterop = new WeakMap();
|
|
27
|
+
return (_getRequireWildcardCache = function(nodeInterop) {
|
|
28
|
+
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
29
|
+
})(nodeInterop);
|
|
30
|
+
}
|
|
31
|
+
function _interopRequireWildcard(obj, nodeInterop) {
|
|
32
|
+
if (!nodeInterop && obj && obj.__esModule) {
|
|
33
|
+
return obj;
|
|
34
|
+
}
|
|
35
|
+
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
36
|
+
return {
|
|
37
|
+
default: obj
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
var cache = _getRequireWildcardCache(nodeInterop);
|
|
41
|
+
if (cache && cache.has(obj)) {
|
|
42
|
+
return cache.get(obj);
|
|
43
|
+
}
|
|
44
|
+
var newObj = {};
|
|
45
|
+
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
46
|
+
for(var key in obj){
|
|
47
|
+
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
48
|
+
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
49
|
+
if (desc && (desc.get || desc.set)) {
|
|
50
|
+
Object.defineProperty(newObj, key, desc);
|
|
51
|
+
} else {
|
|
52
|
+
newObj[key] = obj[key];
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
newObj.default = obj;
|
|
57
|
+
if (cache) {
|
|
58
|
+
cache.set(obj, newObj);
|
|
59
|
+
}
|
|
60
|
+
return newObj;
|
|
61
|
+
}
|
|
62
|
+
var specialNodeQuery = (0, _query.nodeQuery)("/statement/@special!"), leftTermNodeQuery = (0, _query.nodeQuery)("/statement/term[0]"), rightTermNodeQuery = (0, _query.nodeQuery)("/statement/term[1]");
|
|
63
|
+
function verifyStatementAsEquality(statementNode, proofContext) {
|
|
64
|
+
var statementVerifiedAsEquality = false;
|
|
65
|
+
proofContext.begin(statementNode);
|
|
66
|
+
var statementString = (0, _string.nodeAsString)(statementNode);
|
|
67
|
+
proofContext.debug("Verifying the '".concat(statementString, "' statement as an equality..."));
|
|
68
|
+
var specialNode = specialNodeQuery(statementNode);
|
|
69
|
+
if (specialNode !== null) {
|
|
70
|
+
var terminalNode = specialNode, terminalNodeContent = terminalNode.getContent();
|
|
71
|
+
if (terminalNodeContent === _constants.EQUALS_CHARACTER) {
|
|
72
|
+
var types = [], context = proofContext, leftTermNode = leftTermNodeQuery(statementNode), rightTermNode = rightTermNodeQuery(statementNode), leftTermVerified = (0, _term.default)(leftTermNode, types, context), rightTermVerified = (0, _term.default)(rightTermNode, types, context);
|
|
73
|
+
if (leftTermVerified && rightTermVerified) {
|
|
74
|
+
var firstType = (0, _array.first)(types), secondType = (0, _array.second)(types), leftType = firstType, rightType = secondType, leftTermString = (0, _string.nodeAsString)(leftTermNode), rightTermString = (0, _string.nodeAsString)(rightTermNode);
|
|
75
|
+
if (leftType === null && rightType === null) {
|
|
76
|
+
proofContext.error("The types of the '".concat(leftTermString, "' and '").concat(rightTermString, "' terms are both undefined and therefore the terms cannot be equated."));
|
|
77
|
+
} else if (rightType === null) {
|
|
78
|
+
var type = leftType, termNode = rightTermNode, variable = addVariable(type, termNode, proofContext);
|
|
79
|
+
if (variable !== null) {
|
|
80
|
+
var leftTypeName = leftType.getName();
|
|
81
|
+
proofContext.info("The '".concat(rightTermString, "' variable has been given the '").concat(leftTypeName, "' type."));
|
|
82
|
+
statementVerifiedAsEquality = true;
|
|
83
|
+
}
|
|
84
|
+
} else if (leftType === null) {
|
|
85
|
+
var type1 = rightType, termNode1 = leftType, variable1 = addVariable(type1, termNode1, proofContext);
|
|
86
|
+
if (variable1 !== null) {
|
|
87
|
+
var rightTypeName = rightType.getName();
|
|
88
|
+
proofContext.info("The '".concat(rightTermString, "' variable has been given the '").concat(rightTypeName, "' type."));
|
|
89
|
+
statementVerifiedAsEquality = true;
|
|
90
|
+
}
|
|
91
|
+
} else {
|
|
92
|
+
var leftTypeMatchesRightType = leftType.match(rightType);
|
|
93
|
+
if (!leftTypeMatchesRightType) {
|
|
94
|
+
proofContext.error("The types of the '".concat(leftTermString, "' and '").concat(rightTermString, "' terms do not match and therefore the terms cannot be equated."));
|
|
95
|
+
} else {
|
|
96
|
+
var derived = proofContext.isDerived();
|
|
97
|
+
if (!derived) {
|
|
98
|
+
statementVerifiedAsEquality = true;
|
|
99
|
+
} else {
|
|
100
|
+
var equality = _equality.default.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode), proofSteps = proofContext.getProofSteps(), equalities = equalitiesFromProofSteps(proofSteps), equalityEquates = equality.equate(equalities, proofContext);
|
|
101
|
+
statementVerifiedAsEquality = equalityEquates; ///
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
if (statementVerifiedAsEquality) {
|
|
109
|
+
proofContext.info("Verified the '".concat(statementString, "' equality."));
|
|
110
|
+
}
|
|
111
|
+
statementVerifiedAsEquality ? proofContext.complete(statementNode) : proofContext.halt(statementNode);
|
|
112
|
+
return statementVerifiedAsEquality;
|
|
113
|
+
}
|
|
114
|
+
function equalitiesFromProofSteps(proofSteps) {
|
|
115
|
+
var start = -_constants.MAXIMUM_INDEXES_LENGTH; ///
|
|
116
|
+
proofSteps = proofSteps.slice(start); ///
|
|
117
|
+
var equalities = proofSteps.reduce(function(equalities, proofStep, index) {
|
|
118
|
+
var equality = _equality.default.fromProofStep(proofStep);
|
|
119
|
+
if (equality !== null) {
|
|
120
|
+
equalities.push(equality);
|
|
121
|
+
}
|
|
122
|
+
return equalities;
|
|
123
|
+
}, []);
|
|
124
|
+
return equalities;
|
|
125
|
+
}
|
|
126
|
+
function addVariable(type, termNode, proofContext) {
|
|
127
|
+
var variable = null;
|
|
128
|
+
var variables = [], termVerifiedAsVariable = (0, _term.verifyTermAsVariable)(termNode, variables, proofContext);
|
|
129
|
+
if (termVerifiedAsVariable) {
|
|
130
|
+
var firstVariable = (0, _array.first)(variables);
|
|
131
|
+
variable = firstVariable; ///
|
|
132
|
+
var name = variable.getName();
|
|
133
|
+
variable = _variable.default.fromTypeAndName(type, name); ///
|
|
134
|
+
proofContext.addVariable(variable);
|
|
135
|
+
}
|
|
136
|
+
return variable;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementAsEquality.js"],"sourcesContent":["\"use strict\";\n\nimport Equality from \"../equality\";\nimport Variable from \"../variable\";\nimport verifyTerm from \"../verify/term\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { first, second } from \"../utilities/array\";\nimport { verifyTermAsVariable } from \"../verify/term\";\nimport { EQUALS_CHARACTER, MAXIMUM_INDEXES_LENGTH } from \"../constants\";\n\nconst specialNodeQuery = nodeQuery(\"/statement/@special!\"),\n      leftTermNodeQuery = nodeQuery(\"/statement/term[0]\"),\n      rightTermNodeQuery = nodeQuery(\"/statement/term[1]\");\n\nexport default function verifyStatementAsEquality(statementNode, proofContext) {\n  let statementVerifiedAsEquality = false;\n\n  proofContext.begin(statementNode);\n\n  const statementString = nodeAsString(statementNode);\n\n  proofContext.debug(`Verifying the '${statementString}' statement as an equality...`);\n\n  const specialNode = specialNodeQuery(statementNode);\n\n  if (specialNode !== null) {\n    const terminalNode = specialNode, ///\n          terminalNodeContent = terminalNode.getContent();\n\n    if (terminalNodeContent === EQUALS_CHARACTER) {\n      const types = [],\n            context = proofContext,  ///\n            leftTermNode = leftTermNodeQuery(statementNode),\n            rightTermNode = rightTermNodeQuery(statementNode),\n            leftTermVerified = verifyTerm(leftTermNode, types, context),\n            rightTermVerified = verifyTerm(rightTermNode, types, context);\n\n      if (leftTermVerified && rightTermVerified) {\n        const firstType = first(types),\n              secondType = second(types),\n              leftType = firstType, ///\n              rightType = secondType, ///\n              leftTermString = nodeAsString(leftTermNode),\n              rightTermString = nodeAsString(rightTermNode);\n\n        if ((leftType === null) && (rightType === null)) {\n          proofContext.error(`The types of the '${leftTermString}' and '${rightTermString}' terms are both undefined and therefore the terms cannot be equated.`);\n        } else if (rightType === null) {\n          const type = leftType,  ///\n                termNode = rightTermNode, ///\n                variable = addVariable(type, termNode, proofContext);\n\n          if (variable !== null) {\n            const leftTypeName = leftType.getName();\n\n            proofContext.info(`The '${rightTermString}' variable has been given the '${leftTypeName}' type.`);\n\n            statementVerifiedAsEquality = true;\n          }\n        } else if (leftType === null) {\n          const type = rightType,  ///\n                termNode = leftType, ///\n                variable = addVariable(type, termNode, proofContext);\n\n          if (variable !== null) {\n            const rightTypeName = rightType.getName();\n\n            proofContext.info(`The '${rightTermString}' variable has been given the '${rightTypeName}' type.`);\n\n            statementVerifiedAsEquality = true;\n          }\n        } else {\n          const leftTypeMatchesRightType = leftType.match(rightType);\n\n          if (!leftTypeMatchesRightType) {\n            proofContext.error(`The types of the '${leftTermString}' and '${rightTermString}' terms do not match and therefore the terms cannot be equated.`);\n          } else {\n            const derived = proofContext.isDerived();\n\n            if (!derived) {\n              statementVerifiedAsEquality = true;\n            } else {\n              const equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode),\n                    proofSteps = proofContext.getProofSteps(),\n                    equalities = equalitiesFromProofSteps(proofSteps),\n                    equalityEquates = equality.equate(equalities, proofContext);\n\n              statementVerifiedAsEquality = equalityEquates;  ///\n            }\n          }\n        }\n      }\n    }\n  }\n\n  if (statementVerifiedAsEquality) {\n    proofContext.info(`Verified the '${statementString}' equality.`);\n  }\n\n  statementVerifiedAsEquality ?\n    proofContext.complete(statementNode) :\n      proofContext.halt(statementNode);\n\n  return statementVerifiedAsEquality;\n}\n\nfunction equalitiesFromProofSteps(proofSteps) {\n  const start = -MAXIMUM_INDEXES_LENGTH;  ///\n\n  proofSteps = proofSteps.slice(start); ///\n\n  const equalities = proofSteps.reduce((equalities, proofStep, index) => {\n    const equality = Equality.fromProofStep(proofStep);\n\n    if (equality !== null) {\n      equalities.push(equality);\n    }\n\n    return equalities;\n  }, []);\n\n  return equalities;\n}\n\nfunction addVariable(type, termNode, proofContext) {\n  let variable = null;\n\n  const variables = [],\n        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, proofContext);\n\n  if (termVerifiedAsVariable) {\n    const firstVariable = first(variables);\n\n    variable = firstVariable;  ///\n\n    const name = variable.getName();\n\n    variable = Variable.fromTypeAndName(type, name);  ///\n\n    proofContext.addVariable(variable);\n  }\n\n  return variable;\n}\n"],"names":["verifyStatementAsEquality","specialNodeQuery","nodeQuery","leftTermNodeQuery","rightTermNodeQuery","statementNode","proofContext","statementVerifiedAsEquality","begin","statementString","nodeAsString","debug","specialNode","terminalNode","terminalNodeContent","getContent","EQUALS_CHARACTER","types","context","leftTermNode","rightTermNode","leftTermVerified","verifyTerm","rightTermVerified","firstType","first","secondType","second","leftType","rightType","leftTermString","rightTermString","error","type","termNode","variable","addVariable","leftTypeName","getName","info","rightTypeName","leftTypeMatchesRightType","match","derived","isDerived","equality","Equality","fromLeftTermNodeAndRightTermNode","proofSteps","getProofSteps","equalities","equalitiesFromProofSteps","equalityEquates","equate","complete","halt","start","MAXIMUM_INDEXES_LENGTH","slice","reduce","proofStep","index","fromProofStep","push","variables","termVerifiedAsVariable","verifyTermAsVariable","firstVariable","name","Variable","fromTypeAndName"],"mappings":"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"}
|
|
@@ -0,0 +1,82 @@
|
|
|
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 verifyStatementTypeAssertion;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
var _variable = /*#__PURE__*/ _interopRequireDefault(require("../variable"));
|
|
12
|
+
var _array = require("../utilities/array");
|
|
13
|
+
var _string = require("../utilities/string");
|
|
14
|
+
var _query = require("../utilities/query");
|
|
15
|
+
var _term = require("../verify/term");
|
|
16
|
+
function _interopRequireDefault(obj) {
|
|
17
|
+
return obj && obj.__esModule ? obj : {
|
|
18
|
+
default: obj
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
var termNodeQuery = (0, _query.nodeQuery)("/typeAssertion/term"), typeNodeQuery = (0, _query.nodeQuery)("/typeAssertion/type"), typeAssertionNodeQuery = (0, _query.nodeQuery)("/statement/typeAssertion!");
|
|
22
|
+
function verifyStatementTypeAssertion(statementNode, proofContext) {
|
|
23
|
+
var typeAssertionVerified = false;
|
|
24
|
+
proofContext.begin(statementNode);
|
|
25
|
+
var statementString = (0, _string.nodeAsString)(statementNode);
|
|
26
|
+
proofContext.debug("Verifying the '".concat(statementString, "' statement type assertion..."));
|
|
27
|
+
var typeAssertionNode = typeAssertionNodeQuery(statementNode);
|
|
28
|
+
if (typeAssertionNode !== null) {
|
|
29
|
+
var typeNode = typeNodeQuery(typeAssertionNode), typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = proofContext.isTypePresentByTypeName(typeName);
|
|
30
|
+
if (!typePresent) {
|
|
31
|
+
proofContext.error("The ".concat(typeName, " type is not present."));
|
|
32
|
+
} else {
|
|
33
|
+
var context = proofContext, termNode = termNodeQuery(typeAssertionNode), variables = [], termVerifiedAsVariable = (0, _term.verifyTermAsVariable)(termNode, variables, context);
|
|
34
|
+
if (termVerifiedAsVariable) {
|
|
35
|
+
var variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, proofContext);
|
|
36
|
+
typeAssertionVerified = variableTypeAssertionVerified; ///
|
|
37
|
+
} else {
|
|
38
|
+
var termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, proofContext);
|
|
39
|
+
typeAssertionVerified = termTypeAssertionVerified; ///
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if (typeAssertionVerified) {
|
|
44
|
+
proofContext.info("Verified the '".concat(statementString, "' statement type assertion."));
|
|
45
|
+
}
|
|
46
|
+
typeAssertionVerified ? proofContext.complete(statementNode) : proofContext.halt(statementNode);
|
|
47
|
+
return typeAssertionVerified;
|
|
48
|
+
}
|
|
49
|
+
function verifyTermTypeAssertion(typeAssertionNode, proofContext) {
|
|
50
|
+
var termTypeAssertionVerified = false;
|
|
51
|
+
var types = [], context = proofContext, termNode = termNodeQuery(typeAssertionNode), termVerifiedAgainstConstructors = (0, _term.verifyTermAgainstConstructors)(termNode, types, context);
|
|
52
|
+
if (termVerifiedAgainstConstructors) {
|
|
53
|
+
var typeNode = typeNodeQuery(typeAssertionNode), typeName = (0, _query.typeNameFromTypeNode)(typeNode), assertedTypeName = typeName, assertedType = proofContext.findTypeByTypeName(assertedTypeName), firstType = (0, _array.first)(types), termType = firstType, assertedTypeEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);
|
|
54
|
+
if (!assertedTypeEqualToOrSubTypeOfTermType) {
|
|
55
|
+
var termString = (0, _string.nodeAsString)(termNode);
|
|
56
|
+
proofContext.error("The asserted type is not equal to or a sub-type of the '".concat(termString, "' term type."));
|
|
57
|
+
} else {
|
|
58
|
+
termTypeAssertionVerified = true;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return termTypeAssertionVerified;
|
|
62
|
+
}
|
|
63
|
+
function verifyVariableTypeAssertion(typeAssertionNode, proofContext) {
|
|
64
|
+
var variableTypeAssertionVerified = false;
|
|
65
|
+
var context = proofContext, variables = [], termNode = termNodeQuery(typeAssertionNode);
|
|
66
|
+
(0, _term.verifyTermAsVariable)(termNode, variables, context);
|
|
67
|
+
var typeNode = typeNodeQuery(typeAssertionNode), typeName = (0, _query.typeNameFromTypeNode)(typeNode), assertedTypeName = typeName, assertedType = proofContext.findTypeByTypeName(assertedTypeName), firstVariable = (0, _array.first)(variables), variable = firstVariable, variableName = variable.getName(), variableType = variable.getType();
|
|
68
|
+
var assertedTypeEqualToOrSubTypeOfVariableType = variableType === null ? true : assertedType.isEqualToOrSubTypeOf(variableType);
|
|
69
|
+
if (!assertedTypeEqualToOrSubTypeOfVariableType) {
|
|
70
|
+
proofContext.error("The asserted type is not equal to or a sub-type of the '".concat(variableName, "' variable type."));
|
|
71
|
+
} else {
|
|
72
|
+
var derived = proofContext.isDerived();
|
|
73
|
+
if (!derived) {
|
|
74
|
+
var type = assertedType, name = variableName, variable1 = _variable.default.fromTypeAndName(type, name);
|
|
75
|
+
proofContext.addVariable(variable1);
|
|
76
|
+
}
|
|
77
|
+
variableTypeAssertionVerified = true;
|
|
78
|
+
}
|
|
79
|
+
return variableTypeAssertionVerified;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statementTypeAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport Variable from \"../variable\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { verifyTermAsVariable, verifyTermAgainstConstructors } from \"../verify/term\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\");\n\nexport default function verifyStatementTypeAssertion(statementNode, proofContext) {\n  let typeAssertionVerified = false;\n\n  proofContext.begin(statementNode);\n\n  const statementString = nodeAsString(statementNode);\n\n  proofContext.debug(`Verifying the '${statementString}' statement type assertion...`);\n\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if (typeAssertionNode !== null) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          typePresent = proofContext.isTypePresentByTypeName(typeName);\n\n    if (!typePresent) {\n      proofContext.error(`The ${typeName} type is not present.`);\n    } else {\n      const context = proofContext, ///\n            termNode = termNodeQuery(typeAssertionNode),\n            variables = [],\n            termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context);\n\n      if (termVerifiedAsVariable) {\n        const variableTypeAssertionVerified = verifyVariableTypeAssertion(typeAssertionNode, proofContext);\n\n        typeAssertionVerified = variableTypeAssertionVerified;  ///\n      } else {\n        const termTypeAssertionVerified = verifyTermTypeAssertion(typeAssertionNode, proofContext);\n\n        typeAssertionVerified = termTypeAssertionVerified;  ///\n      }\n    }\n  }\n\n  if (typeAssertionVerified) {\n    proofContext.info(`Verified the '${statementString}' statement type assertion.`);\n  }\n\n  typeAssertionVerified ?\n    proofContext.complete(statementNode) :\n      proofContext.halt(statementNode);\n\n  return typeAssertionVerified;\n}\n\nfunction verifyTermTypeAssertion(typeAssertionNode, proofContext) {\n  let termTypeAssertionVerified = false;\n\n  const types = [],\n        context = proofContext, ///\n        termNode = termNodeQuery(typeAssertionNode),\n        termVerifiedAgainstConstructors = verifyTermAgainstConstructors(termNode, types, context);\n\n  if (termVerifiedAgainstConstructors) {\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          assertedTypeName = typeName,  ///\n          assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n          firstType = first(types),\n          termType = firstType,\n          assertedTypeEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);\n\n    if (!assertedTypeEqualToOrSubTypeOfTermType) {\n      const termString = nodeAsString(termNode);\n\n      proofContext.error(`The asserted type is not equal to or a sub-type of the '${termString}' term type.`);\n    } else {\n      termTypeAssertionVerified = true;\n    }\n  }\n\n  return termTypeAssertionVerified;\n}\n\nfunction verifyVariableTypeAssertion(typeAssertionNode, proofContext) {\n  let variableTypeAssertionVerified = false;\n\n  const context = proofContext, ///\n        variables = [],\n        termNode = termNodeQuery(typeAssertionNode);\n\n  verifyTermAsVariable(termNode, variables, context);\n\n  const typeNode = typeNodeQuery(typeAssertionNode),\n        typeName = typeNameFromTypeNode(typeNode),\n        assertedTypeName = typeName,  ///\n        assertedType = proofContext.findTypeByTypeName(assertedTypeName),\n        firstVariable = first(variables),\n        variable = firstVariable, ///\n        variableName = variable.getName(),\n        variableType = variable.getType();\n\n  const assertedTypeEqualToOrSubTypeOfVariableType = (variableType === null) ?\n                                                        true :  ///\n                                                          assertedType.isEqualToOrSubTypeOf(variableType);\n\n  if (!assertedTypeEqualToOrSubTypeOfVariableType) {\n    proofContext.error(`The asserted type is not equal to or a sub-type of the '${variableName}' variable type.`);\n  } else {\n    const derived = proofContext.isDerived();\n\n    if (!derived) {\n      const type = assertedType,  ///\n            name = variableName,  ///\n            variable = Variable.fromTypeAndName(type, name);\n\n      proofContext.addVariable(variable);\n    }\n\n    variableTypeAssertionVerified = true;\n  }\n\n  return variableTypeAssertionVerified;\n}\n"],"names":["verifyStatementTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","typeAssertionNodeQuery","statementNode","proofContext","typeAssertionVerified","begin","statementString","nodeAsString","debug","typeAssertionNode","typeNode","typeName","typeNameFromTypeNode","typePresent","isTypePresentByTypeName","error","context","termNode","variables","termVerifiedAsVariable","verifyTermAsVariable","variableTypeAssertionVerified","verifyVariableTypeAssertion","termTypeAssertionVerified","verifyTermTypeAssertion","info","complete","halt","types","termVerifiedAgainstConstructors","verifyTermAgainstConstructors","assertedTypeName","assertedType","findTypeByTypeName","firstType","first","termType","assertedTypeEqualToOrSubTypeOfTermType","isEqualToOrSubTypeOf","termString","firstVariable","variable","variableName","getName","variableType","getType","assertedTypeEqualToOrSubTypeOfVariableType","derived","isDerived","type","name","Variable","fromTypeAndName","addVariable"],"mappings":"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"}
|
package/package.json
CHANGED
package/src/conclusion.js
CHANGED
|
@@ -118,6 +118,8 @@ function matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNo
|
|
|
118
118
|
childNodes = nonTerminalNode.getChildNodes(),
|
|
119
119
|
conclusionNonTerminalNodeRuleName = conclusionNonTerminalNode.getRuleName(),
|
|
120
120
|
conclusionNonTerminalNodeChildNodes = conclusionNonTerminalNode.getChildNodes(),
|
|
121
|
+
nodes = childNodes, ///
|
|
122
|
+
conclusionNodes = conclusionNonTerminalNodeChildNodes, ///
|
|
121
123
|
ruleNameStatementRuleName = (ruleName === STATEMENT_RULE_NAME),
|
|
122
124
|
conclusionNonTerminalNodeRuleNameMetastatementRuleName = (conclusionNonTerminalNodeRuleName === METASTATEMENT_RULE_NAME);
|
|
123
125
|
|
|
@@ -129,16 +131,12 @@ function matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNo
|
|
|
129
131
|
if (conclusionMetastatementNodeMatches) {
|
|
130
132
|
conclusionNonTerminalNodeMatches = true; ///
|
|
131
133
|
} else {
|
|
132
|
-
const
|
|
133
|
-
conclusionNodes = conclusionNonTerminalNodeChildNodes, ///
|
|
134
|
-
conclusionNonTerminalNodeChildNodesMatches = matchConclusionNodes(conclusionNodes, nodes, substitutions);
|
|
134
|
+
const conclusionNonTerminalNodeChildNodesMatches = matchConclusionNodes(conclusionNodes, nodes, substitutions);
|
|
135
135
|
|
|
136
136
|
conclusionNonTerminalNodeMatches = conclusionNonTerminalNodeChildNodesMatches; ///
|
|
137
137
|
}
|
|
138
138
|
} else if (ruleName === conclusionNonTerminalNodeRuleName) {
|
|
139
|
-
const
|
|
140
|
-
conclusionNodes = conclusionNonTerminalNodeChildNodes, ///
|
|
141
|
-
conclusionNonTerminalNodeChildNodesMatches = matchConclusionNodes(conclusionNodes, nodes, substitutions);
|
|
139
|
+
const conclusionNonTerminalNodeChildNodesMatches = matchConclusionNodes(conclusionNodes, nodes, substitutions);
|
|
142
140
|
|
|
143
141
|
conclusionNonTerminalNodeMatches = conclusionNonTerminalNodeChildNodesMatches; ///
|
|
144
142
|
}
|
|
@@ -146,7 +144,7 @@ function matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNo
|
|
|
146
144
|
return conclusionNonTerminalNodeMatches;
|
|
147
145
|
}
|
|
148
146
|
|
|
149
|
-
function matchConclusionMetavariableNode(conclusionMetavariableNode,
|
|
147
|
+
function matchConclusionMetavariableNode(conclusionMetavariableNode, statementNode, substitutions) {
|
|
150
148
|
let conclusionMetavariableNodeMatches = true;
|
|
151
149
|
|
|
152
150
|
const conclusionMetavariableName = metavariableNameFromMetavariableNode(conclusionMetavariableNode),
|
|
@@ -159,7 +157,7 @@ function matchConclusionMetavariableNode(conclusionMetavariableNode, nodes, subs
|
|
|
159
157
|
}) || null;
|
|
160
158
|
|
|
161
159
|
if (substitution !== null) {
|
|
162
|
-
const substitutionNodesMatch = substitution.
|
|
160
|
+
const substitutionNodesMatch = substitution.matchStatementNode(statementNode);
|
|
163
161
|
|
|
164
162
|
conclusionMetavariableNodeMatches = substitutionNodesMatch; ///
|
|
165
163
|
}
|
|
@@ -186,10 +184,7 @@ function matchConclusionMetastatementNode(conclusionMetastatementNode, statement
|
|
|
186
184
|
|
|
187
185
|
if (conclusionNonTerminalChildNodeRuleNameMetavariableRuleName) {
|
|
188
186
|
const conclusionMetavariableNode = conclusionNonTerminalChildNode, ///
|
|
189
|
-
|
|
190
|
-
childNodes = nonTerminalNode.getChildNodes(),
|
|
191
|
-
nodes = childNodes, ///
|
|
192
|
-
conclusionMetavariableNodeMatches = matchConclusionMetavariableNode(conclusionMetavariableNode, nodes, substitutions);
|
|
187
|
+
conclusionMetavariableNodeMatches = matchConclusionMetavariableNode(conclusionMetavariableNode, statementNode, substitutions);
|
|
193
188
|
|
|
194
189
|
conclusionMetastatementNodeMatches = conclusionMetavariableNodeMatches; ///
|
|
195
190
|
}
|
|
@@ -255,47 +250,49 @@ function metaMatchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTermin
|
|
|
255
250
|
let conclusionNonTerminalNodeMatches = false;
|
|
256
251
|
|
|
257
252
|
const ruleName = nonTerminalNode.getRuleName(),
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
conclusionNonTerminalNodeChildNodesMatches = metaMatchConclusionNodes(conclusionNodes, nodes, metaSubstitutions);
|
|
266
|
-
|
|
267
|
-
conclusionNonTerminalNodeMatches = conclusionNonTerminalNodeChildNodesMatches; ///
|
|
253
|
+
childNodes = nonTerminalNode.getChildNodes(),
|
|
254
|
+
conclusionNonTerminalNodeRuleName = conclusionNonTerminalNode.getRuleName(),
|
|
255
|
+
conclusionNonTerminalNodeChildNodes = conclusionNonTerminalNode.getChildNodes(),
|
|
256
|
+
nodes = childNodes, ///
|
|
257
|
+
conclusionNodes = conclusionNonTerminalNodeChildNodes, ///
|
|
258
|
+
ruleNameMetastatementRuleName = (ruleName === METASTATEMENT_RULE_NAME),
|
|
259
|
+
conclusionNonTerminalNodeRuleNameMetastatementRuleName = (conclusionNonTerminalNodeRuleName === METASTATEMENT_RULE_NAME);
|
|
268
260
|
|
|
269
|
-
|
|
270
|
-
|
|
261
|
+
if (ruleNameMetastatementRuleName && conclusionNonTerminalNodeRuleNameMetastatementRuleName) {
|
|
262
|
+
const statementNode = nonTerminalNode, ///
|
|
263
|
+
conclusionMetastatementNode = conclusionNonTerminalNode, ///
|
|
264
|
+
conclusionMetastatementNodeMatches = metaMatchConclusionMetastatementNode(conclusionMetastatementNode, statementNode, metaSubstitutions);
|
|
271
265
|
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
266
|
+
if (conclusionMetastatementNodeMatches) {
|
|
267
|
+
conclusionNonTerminalNodeMatches = true; ///
|
|
268
|
+
} else {
|
|
269
|
+
const conclusionNonTerminalNodeChildNodesMatches = metaMatchConclusionNodes(conclusionNodes, nodes, metaSubstitutions);
|
|
276
270
|
|
|
277
|
-
|
|
278
|
-
}
|
|
271
|
+
conclusionNonTerminalNodeMatches = conclusionNonTerminalNodeChildNodesMatches; ///
|
|
279
272
|
}
|
|
273
|
+
} else if (ruleName === conclusionNonTerminalNodeRuleName) {
|
|
274
|
+
const conclusionNonTerminalNodeChildNodesMatches = metaMatchConclusionNodes(conclusionNodes, nodes, metaSubstitutions);
|
|
275
|
+
|
|
276
|
+
conclusionNonTerminalNodeMatches = conclusionNonTerminalNodeChildNodesMatches; ///
|
|
280
277
|
}
|
|
281
278
|
|
|
282
279
|
return conclusionNonTerminalNodeMatches;
|
|
283
280
|
}
|
|
284
281
|
|
|
285
|
-
function metaMatchConclusionMetavariableNode(conclusionMetavariableNode,
|
|
282
|
+
function metaMatchConclusionMetavariableNode(conclusionMetavariableNode, metastatementNode, metaSubstitutions) {
|
|
286
283
|
let conclusionMetavariableNodeMatches = true;
|
|
287
284
|
|
|
288
285
|
const conclusionMetavariableName = metavariableNameFromMetavariableNode(conclusionMetavariableNode),
|
|
289
286
|
metaSubstitution = metaSubstitutions.find((metaSubstitution) => {
|
|
290
|
-
|
|
287
|
+
const metavariableName = metaSubstitution.getMetavariableName();
|
|
291
288
|
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
289
|
+
if (metavariableName === conclusionMetavariableName) {
|
|
290
|
+
return true;
|
|
291
|
+
}
|
|
292
|
+
}) || null;
|
|
296
293
|
|
|
297
294
|
if (metaSubstitution !== null) {
|
|
298
|
-
const metaSubstitutionNodesMatch = metaSubstitution.
|
|
295
|
+
const metaSubstitutionNodesMatch = metaSubstitution.matchMetastatementNode(metastatementNode);
|
|
299
296
|
|
|
300
297
|
conclusionMetavariableNodeMatches = metaSubstitutionNodesMatch; ///
|
|
301
298
|
}
|
|
@@ -322,10 +319,7 @@ function metaMatchConclusionMetastatementNode(conclusionMetastatementNode, metas
|
|
|
322
319
|
|
|
323
320
|
if (conclusionNonTerminalChildNodeRuleNameMetavariableRuleName) {
|
|
324
321
|
const conclusionMetavariableNode = conclusionNonTerminalChildNode, ///
|
|
325
|
-
|
|
326
|
-
childNodes = nonTerminalNode.getChildNodes(),
|
|
327
|
-
nodes = childNodes, ///
|
|
328
|
-
conclusionMetavariableNodeMatches = metaMatchConclusionMetavariableNode(conclusionMetavariableNode, nodes, metaSubstitutions);
|
|
322
|
+
conclusionMetavariableNodeMatches = metaMatchConclusionMetavariableNode(conclusionMetavariableNode, metastatementNode, metaSubstitutions);
|
|
329
323
|
|
|
330
324
|
conclusionMetastatementNodeMatches = conclusionMetavariableNodeMatches; ///
|
|
331
325
|
}
|
package/src/constants.js
CHANGED
|
@@ -7,6 +7,7 @@ export const BOOLEAN = "boolean";
|
|
|
7
7
|
export const EMPTY_STRING = "";
|
|
8
8
|
export const LEFT_BRACKET = "(";
|
|
9
9
|
export const RIGHT_BRACKET = ")";
|
|
10
|
+
export const EQUALS_CHARACTER = "=";
|
|
10
11
|
export const MAXIMUM_INDEXES_LENGTH = 10;
|
|
11
12
|
export const MAXIMUM_PERMUTATION_LENGTH = 5;
|
|
12
13
|
export const BRACKETED_CHILD_NODES_LENGTH = 3;
|
package/src/equality.js
CHANGED
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
import { nodeQuery } from "./utilities/query";
|
|
4
4
|
import { TERM_RULE_NAME } from "./ruleNames";
|
|
5
|
+
import { EQUALS_CHARACTER } from "./constants";
|
|
5
6
|
|
|
6
|
-
const
|
|
7
|
-
leftTermNodeQuery = nodeQuery("/
|
|
8
|
-
rightTermNodeQuery = nodeQuery("/
|
|
7
|
+
const specialNodeQuery = nodeQuery("/statement/@special!"),
|
|
8
|
+
leftTermNodeQuery = nodeQuery("/statement/term[0]"),
|
|
9
|
+
rightTermNodeQuery = nodeQuery("/statement/term[1]");
|
|
9
10
|
|
|
10
11
|
export default class Equality {
|
|
11
12
|
constructor(leftTermNode, rightTermNode) {
|
|
@@ -85,23 +86,20 @@ export default class Equality {
|
|
|
85
86
|
const statementNode = proofStep.getStatementNode();
|
|
86
87
|
|
|
87
88
|
if (statementNode !== null) {
|
|
88
|
-
const
|
|
89
|
+
const specialNode = specialNodeQuery(statementNode);
|
|
89
90
|
|
|
90
|
-
if (
|
|
91
|
-
const
|
|
92
|
-
|
|
91
|
+
if (specialNode !== null) {
|
|
92
|
+
const terminalNode = specialNode, ///
|
|
93
|
+
terminalNodeContent = terminalNode.getContent();
|
|
93
94
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
95
|
+
if (terminalNodeContent === EQUALS_CHARACTER) {
|
|
96
|
+
const leftTermNode = leftTermNodeQuery(statementNode),
|
|
97
|
+
rightTermNode = rightTermNodeQuery(statementNode);
|
|
97
98
|
|
|
98
|
-
return equality;
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
static fromEqualityNode(equalityNode) {
|
|
102
|
-
const leftTermNode = leftTermNodeQuery(equalityNode),
|
|
103
|
-
rightTermNode = rightTermNodeQuery(equalityNode),
|
|
104
99
|
equality = new Equality(leftTermNode, rightTermNode);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
105
103
|
|
|
106
104
|
return equality;
|
|
107
105
|
}
|
package/src/metaSubstitution.js
CHANGED
|
@@ -1,58 +1,62 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { METASTATEMENT_RULE_NAME } from "./ruleNames";
|
|
4
|
+
import { matchNode, bracketedNonTerminalChildNodeFromChildNodes } from "./utilities/node";
|
|
4
5
|
|
|
5
6
|
export default class MetaSubstitution {
|
|
6
|
-
constructor(metavariableName,
|
|
7
|
+
constructor(metavariableName, metastatementNode) {
|
|
7
8
|
this.metavariableName = metavariableName;
|
|
8
|
-
this.
|
|
9
|
+
this.metastatementNode = metastatementNode;
|
|
9
10
|
}
|
|
10
11
|
|
|
11
12
|
getMetavariableName() {
|
|
12
13
|
return this.metavariableName;
|
|
13
14
|
}
|
|
14
15
|
|
|
15
|
-
|
|
16
|
-
return this.
|
|
16
|
+
getMetastatementNode() {
|
|
17
|
+
return this.metastatementNode;
|
|
17
18
|
}
|
|
18
19
|
|
|
19
|
-
|
|
20
|
-
let
|
|
20
|
+
matchMetastatementNode(metastatementNode) {
|
|
21
|
+
let matchesMetastatementNode;
|
|
21
22
|
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const nodeA = this.metastatementNode, ///
|
|
24
|
+
nodeB = metastatementNode,
|
|
25
|
+
nodeMatches = matchNode(nodeA, nodeB);
|
|
25
26
|
|
|
26
|
-
|
|
27
|
+
matchesMetastatementNode = nodeMatches; ///
|
|
27
28
|
|
|
28
|
-
if (!
|
|
29
|
-
const
|
|
30
|
-
|
|
29
|
+
if (!matchesMetastatementNode) {
|
|
30
|
+
const nonTerminalNode = metastatementNode, ///
|
|
31
|
+
childNodes = nonTerminalNode.getChildNodes(), ///
|
|
32
|
+
ruleName = METASTATEMENT_RULE_NAME;
|
|
31
33
|
|
|
32
|
-
|
|
33
|
-
const nonTerminalNode = bracketedChildNode, ///
|
|
34
|
-
childNodes = nonTerminalNode.getChildNodes(),
|
|
35
|
-
nodesB = childNodes, ///
|
|
36
|
-
nodesMatch = matchNodes(nodesA, nodesB);
|
|
34
|
+
metastatementNode = bracketedNonTerminalChildNodeFromChildNodes(childNodes, ruleName); ///
|
|
37
35
|
|
|
38
|
-
|
|
36
|
+
if (metastatementNode !== null) {
|
|
37
|
+
const nodeA = this.metastatementNode, ///
|
|
38
|
+
nodeB = metastatementNode,
|
|
39
|
+
nodeMatches = matchNode(nodeA, nodeB);
|
|
40
|
+
|
|
41
|
+
matchesMetastatementNode = nodeMatches; ///
|
|
39
42
|
}
|
|
40
43
|
}
|
|
41
44
|
|
|
42
|
-
return
|
|
45
|
+
return matchesMetastatementNode;
|
|
43
46
|
}
|
|
44
47
|
|
|
45
|
-
static
|
|
46
|
-
|
|
48
|
+
static fromMetavariableNameAndMetastatementNode(metavariableName, metastatementNode) {
|
|
49
|
+
let metaSubstitution = new MetaSubstitution(metavariableName, metastatementNode);
|
|
47
50
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
+
const nonTerminalNode = metastatementNode, ///
|
|
52
|
+
childNodes = nonTerminalNode.getChildNodes(),
|
|
53
|
+
ruleName = METASTATEMENT_RULE_NAME;
|
|
51
54
|
|
|
52
|
-
|
|
53
|
-
}
|
|
55
|
+
metastatementNode = bracketedNonTerminalChildNodeFromChildNodes(childNodes, ruleName); ///
|
|
54
56
|
|
|
55
|
-
|
|
57
|
+
if (metastatementNode !== null) {
|
|
58
|
+
metaSubstitution = new MetaSubstitution(metavariableName, metastatementNode);
|
|
59
|
+
}
|
|
56
60
|
|
|
57
61
|
return metaSubstitution;
|
|
58
62
|
}
|