occam-verify-cli 1.0.521 → 1.0.524
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/action/verify.js +2 -2
- package/lib/context/release.js +3 -3
- package/lib/element/combinator.js +4 -4
- package/lib/element/conclusion.js +5 -5
- package/lib/element/declaration/combinator.js +5 -5
- package/lib/element/declaration/complexType.js +17 -17
- package/lib/element/declaration/constructor.js +13 -13
- package/lib/element/declaration/metavariable.js +14 -14
- package/lib/element/declaration/simpleType.js +14 -14
- package/lib/element/declaration/typePrefix.js +12 -12
- package/lib/element/declaration/variable.js +10 -10
- package/lib/element/deduction.js +5 -5
- package/lib/element/hypothesis.js +4 -4
- package/lib/element/proofAssertion/premise.js +7 -7
- package/lib/element/proofAssertion/step.js +5 -5
- package/lib/element/proofAssertion/supposition.js +11 -11
- package/lib/element/rule.js +5 -5
- package/lib/element/topLevelAssertion/axiom.js +9 -9
- package/lib/element/topLevelAssertion/conjecture.js +5 -5
- package/lib/element/topLevelAssertion/lemma.js +5 -5
- package/lib/element/topLevelAssertion/theorem.js +5 -5
- package/lib/element/topLevelMetaAssertion/metaLemma.js +5 -5
- package/lib/element/topLevelMetaAssertion/metatheorem.js +5 -5
- package/lib/utilities/customGrammar.js +5 -5
- package/lib/utilities/nominal.js +3 -3
- package/package.json +3 -3
- package/src/action/verify.js +1 -1
- package/src/context/release.js +1 -1
- package/src/element/combinator.js +3 -4
- package/src/element/conclusion.js +4 -5
- package/src/element/declaration/combinator.js +3 -4
- package/src/element/declaration/complexType.js +16 -20
- package/src/element/declaration/constructor.js +12 -15
- package/src/element/declaration/metavariable.js +12 -15
- package/src/element/declaration/simpleType.js +13 -16
- package/src/element/declaration/typePrefix.js +10 -12
- package/src/element/declaration/variable.js +10 -12
- package/src/element/deduction.js +4 -5
- package/src/element/hypothesis.js +3 -4
- package/src/element/proofAssertion/premise.js +6 -7
- package/src/element/proofAssertion/step.js +4 -5
- package/src/element/proofAssertion/supposition.js +10 -13
- package/src/element/rule.js +3 -4
- package/src/element/topLevelAssertion/axiom.js +8 -10
- package/src/element/topLevelAssertion/conjecture.js +3 -4
- package/src/element/topLevelAssertion/lemma.js +5 -6
- package/src/element/topLevelAssertion/theorem.js +3 -4
- package/src/element/topLevelMetaAssertion/metaLemma.js +3 -4
- package/src/element/topLevelMetaAssertion/metatheorem.js +3 -4
- package/src/utilities/customGrammar.js +1 -1
- package/src/utilities/nominal.js +1 -1
|
@@ -260,15 +260,15 @@ var _default = (0, _elements.define)((_Metatheorem = /*#__PURE__*/ function(TopL
|
|
|
260
260
|
return _get(_get_prototype_of(Metatheorem.prototype), "verify", _this);
|
|
261
261
|
};
|
|
262
262
|
return _async_to_generator(function() {
|
|
263
|
-
var verifies,
|
|
263
|
+
var verifies, context, metaLemmaString, metaTheorem;
|
|
264
264
|
return _ts_generator(this, function(_state) {
|
|
265
|
-
|
|
266
|
-
context.trace("Verifying the '".concat(metaLemmaString, "' metatheorem...")
|
|
265
|
+
context = this.getContext(), metaLemmaString = this.getString(); ///
|
|
266
|
+
context.trace("Verifying the '".concat(metaLemmaString, "' metatheorem..."));
|
|
267
267
|
verifies = _superprop_get_verify().call(_this1);
|
|
268
268
|
if (verifies) {
|
|
269
269
|
metaTheorem = this; ///
|
|
270
270
|
context.addMetatheorem(metaTheorem);
|
|
271
|
-
context.debug("...verified the '".concat(metaLemmaString, "' metatheorem.")
|
|
271
|
+
context.debug("...verified the '".concat(metaLemmaString, "' metatheorem."));
|
|
272
272
|
}
|
|
273
273
|
return [
|
|
274
274
|
2,
|
|
@@ -289,4 +289,4 @@ var _default = (0, _elements.define)((_Metatheorem = /*#__PURE__*/ function(TopL
|
|
|
289
289
|
return Metatheorem;
|
|
290
290
|
}(_topLevelMetaAssertion.default), _define_property(_Metatheorem, "name", "Metatheorem"), _Metatheorem));
|
|
291
291
|
|
|
292
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
292
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbGVtZW50L3RvcExldmVsTWV0YUFzc2VydGlvbi9tZXRhdGhlb3JlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFRvcExldmVsTWV0YUFzc2VydGlvbiBmcm9tIFwiLi4vdG9wTGV2ZWxNZXRhQXNzZXJ0aW9uXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi8uLi9lbGVtZW50c1wiO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmUoY2xhc3MgTWV0YXRoZW9yZW0gZXh0ZW5kcyBUb3BMZXZlbE1ldGFBc3NlcnRpb24ge1xuICBhc3luYyB2ZXJpZnkoKSB7XG4gICAgbGV0IHZlcmlmaWVzO1xuXG4gICAgY29uc3QgY29udGV4dCA9IHRoaXMuZ2V0Q29udGV4dCgpLFxuICAgICAgICAgIG1ldGFMZW1tYVN0cmluZyA9IHRoaXMuZ2V0U3RyaW5nKCk7IC8vL1xuXG4gICAgY29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHttZXRhTGVtbWFTdHJpbmd9JyBtZXRhdGhlb3JlbS4uLmApO1xuXG4gICAgdmVyaWZpZXMgPSBzdXBlci52ZXJpZnkoKTtcblxuICAgIGlmICh2ZXJpZmllcykge1xuICAgICAgY29uc3QgbWV0YVRoZW9yZW0gPSB0aGlzOyAvLy9cblxuICAgICAgY29udGV4dC5hZGRNZXRhdGhlb3JlbShtZXRhVGhlb3JlbSk7XG5cbiAgICAgIGNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHttZXRhTGVtbWFTdHJpbmd9JyBtZXRhdGhlb3JlbS5gKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdmVyaWZpZXM7XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiTWV0YXRoZW9yZW1cIjtcblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgY29udGV4dCkgeyByZXR1cm4gVG9wTGV2ZWxNZXRhQXNzZXJ0aW9uLmZyb21KU09OKE1ldGF0aGVvcmVtLCBqc29uLCBjb250ZXh0KTsgfVxufSk7XG4iXSwibmFtZXMiOlsiZGVmaW5lIiwiTWV0YXRoZW9yZW0iLCJ2ZXJpZnkiLCJ2ZXJpZmllcyIsImNvbnRleHQiLCJtZXRhTGVtbWFTdHJpbmciLCJtZXRhVGhlb3JlbSIsImdldENvbnRleHQiLCJnZXRTdHJpbmciLCJ0cmFjZSIsImFkZE1ldGF0aGVvcmVtIiwiZGVidWciLCJmcm9tSlNPTiIsImpzb24iLCJUb3BMZXZlbE1ldGFBc3NlcnRpb24iLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQUE7Ozs0RUFKa0M7d0JBRVg7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0lBRXZCLFdBQWVBLElBQUFBLGdCQUFNLGdDQUFDOzthQUFNQztnQ0FBQUE7UUFBTixPQUFBLGtCQUFNQTs7OztZQUNwQkMsS0FBQUE7bUJBQU4sU0FBTUE7OztrREFEb0JEOzs7d0JBRXBCRSxVQUVFQyxTQUNBQyxpQkFPRUM7O3dCQVJGRixVQUFVLElBQUksQ0FBQ0csVUFBVSxJQUN6QkYsa0JBQWtCLElBQUksQ0FBQ0csU0FBUyxJQUFJLEdBQUc7d0JBRTdDSixRQUFRSyxLQUFLLENBQUMsQUFBQyxrQkFBaUMsT0FBaEJKLGlCQUFnQjt3QkFFaERGLFdBQVcsd0JBQUE7d0JBRVgsSUFBSUEsVUFBVTs0QkFDTkcsY0FBYyxJQUFJLEVBQUUsR0FBRzs0QkFFN0JGLFFBQVFNLGNBQWMsQ0FBQ0o7NEJBRXZCRixRQUFRTyxLQUFLLENBQUMsQUFBQyxvQkFBbUMsT0FBaEJOLGlCQUFnQjt3QkFDcEQ7d0JBRUE7OzRCQUFPRjs7O2dCQUNUOzs7OztZQUlPUyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTQyxJQUFJLEVBQUVULE9BQU87Z0JBQUksT0FBT1UsOEJBQXFCLENBQUNGLFFBQVEsQ0FBQ1gsYUFBYVksTUFBTVQ7WUFBVTs7OztFQXhCdERVLDhCQUFxQixHQXNCbkUsK0JBQU9DLFFBQU8ifQ==
|
|
@@ -22,13 +22,13 @@ _export(exports, {
|
|
|
22
22
|
return _default;
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
|
-
var
|
|
25
|
+
var _occamnominal = require("occam-nominal");
|
|
26
26
|
function customGrammarFromNameAndEntries(name, entries) {
|
|
27
|
-
var termBNF = entries.getTermBNF(), statementBNF = entries.getStatementBNF(), typeVocabulary = entries.getTypeVocabulary(), symbolVocabulary = entries.getSymbolVocabulary(), customGrammar =
|
|
27
|
+
var termBNF = entries.getTermBNF(), statementBNF = entries.getStatementBNF(), typeVocabulary = entries.getTypeVocabulary(), symbolVocabulary = entries.getSymbolVocabulary(), customGrammar = _occamnominal.CustomGrammar.fromNameTermBNFStatementBNFTypeVocabularyAndSymbolVocabulary(name, termBNF, statementBNF, typeVocabulary, symbolVocabulary);
|
|
28
28
|
return customGrammar;
|
|
29
29
|
}
|
|
30
30
|
function combinedCustomGrammarFromNothing() {
|
|
31
|
-
var customGrammars = [], combinedCustomGrammar =
|
|
31
|
+
var customGrammars = [], combinedCustomGrammar = _occamnominal.CombinedCustomGrammar.fromCustomGrammars(customGrammars);
|
|
32
32
|
return combinedCustomGrammar;
|
|
33
33
|
}
|
|
34
34
|
function combinedCustomGrammarFromReleaseContexts(releaseContexts) {
|
|
@@ -37,7 +37,7 @@ function combinedCustomGrammarFromReleaseContexts(releaseContexts) {
|
|
|
37
37
|
return customGrammar;
|
|
38
38
|
});
|
|
39
39
|
customGrammars.reverse(); ///
|
|
40
|
-
var combinedCustomGrammar =
|
|
40
|
+
var combinedCustomGrammar = _occamnominal.CombinedCustomGrammar.fromCustomGrammars(customGrammars);
|
|
41
41
|
return combinedCustomGrammar;
|
|
42
42
|
}
|
|
43
43
|
var _default = {
|
|
@@ -46,4 +46,4 @@ var _default = {
|
|
|
46
46
|
combinedCustomGrammarFromReleaseContexts: combinedCustomGrammarFromReleaseContexts
|
|
47
47
|
};
|
|
48
48
|
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY3VzdG9tR3JhbW1hci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgQ3VzdG9tR3JhbW1hciwgQ29tYmluZWRDdXN0b21HcmFtbWFyIH0gZnJvbSBcIm9jY2FtLW5vbWluYWxcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIGN1c3RvbUdyYW1tYXJGcm9tTmFtZUFuZEVudHJpZXMobmFtZSwgZW50cmllcykge1xuICBjb25zdCB0ZXJtQk5GID0gZW50cmllcy5nZXRUZXJtQk5GKCksXG4gICAgICAgIHN0YXRlbWVudEJORiA9IGVudHJpZXMuZ2V0U3RhdGVtZW50Qk5GKCksXG4gICAgICAgIHR5cGVWb2NhYnVsYXJ5ID0gZW50cmllcy5nZXRUeXBlVm9jYWJ1bGFyeSgpLFxuICAgICAgICBzeW1ib2xWb2NhYnVsYXJ5ID0gZW50cmllcy5nZXRTeW1ib2xWb2NhYnVsYXJ5KCksXG4gICAgICAgIGN1c3RvbUdyYW1tYXIgPSBDdXN0b21HcmFtbWFyLmZyb21OYW1lVGVybUJORlN0YXRlbWVudEJORlR5cGVWb2NhYnVsYXJ5QW5kU3ltYm9sVm9jYWJ1bGFyeShuYW1lLCB0ZXJtQk5GLCBzdGF0ZW1lbnRCTkYsIHR5cGVWb2NhYnVsYXJ5LCBzeW1ib2xWb2NhYnVsYXJ5KTtcblxuICByZXR1cm4gY3VzdG9tR3JhbW1hcjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21Ob3RoaW5nKCkge1xuICBjb25zdCBjdXN0b21HcmFtbWFycyA9IFtdLFxuICAgICAgICBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBDb21iaW5lZEN1c3RvbUdyYW1tYXIuZnJvbUN1c3RvbUdyYW1tYXJzKGN1c3RvbUdyYW1tYXJzKTtcblxuICByZXR1cm4gY29tYmluZWRDdXN0b21HcmFtbWFyO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29tYmluZWRDdXN0b21HcmFtbWFyRnJvbVJlbGVhc2VDb250ZXh0cyhyZWxlYXNlQ29udGV4dHMpIHtcbiAgY29uc3QgY3VzdG9tR3JhbW1hcnMgPSByZWxlYXNlQ29udGV4dHMubWFwKChyZWxlYXNlQ29udGV4dCkgPT4ge1xuICAgIGNvbnN0IGN1c3RvbUdyYW1tYXIgPSByZWxlYXNlQ29udGV4dC5nZXRDdXN0b21HcmFtbWFyKCk7XG5cbiAgICByZXR1cm4gY3VzdG9tR3JhbW1hcjtcbiAgfSk7XG5cbiAgY3VzdG9tR3JhbW1hcnMucmV2ZXJzZSgpOyAvLy9cblxuICBjb25zdCBjb21iaW5lZEN1c3RvbUdyYW1tYXIgPSBDb21iaW5lZEN1c3RvbUdyYW1tYXIuZnJvbUN1c3RvbUdyYW1tYXJzKGN1c3RvbUdyYW1tYXJzKTtcblxuICByZXR1cm4gY29tYmluZWRDdXN0b21HcmFtbWFyO1xufVxuXG5leHBvcnQgZGVmYXVsdCB7XG4gIGN1c3RvbUdyYW1tYXJGcm9tTmFtZUFuZEVudHJpZXMsXG4gIGNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21Ob3RoaW5nLFxuICBjb21iaW5lZEN1c3RvbUdyYW1tYXJGcm9tUmVsZWFzZUNvbnRleHRzXG59O1xuIl0sIm5hbWVzIjpbImNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21Ob3RoaW5nIiwiY29tYmluZWRDdXN0b21HcmFtbWFyRnJvbVJlbGVhc2VDb250ZXh0cyIsImN1c3RvbUdyYW1tYXJGcm9tTmFtZUFuZEVudHJpZXMiLCJuYW1lIiwiZW50cmllcyIsInRlcm1CTkYiLCJnZXRUZXJtQk5GIiwic3RhdGVtZW50Qk5GIiwiZ2V0U3RhdGVtZW50Qk5GIiwidHlwZVZvY2FidWxhcnkiLCJnZXRUeXBlVm9jYWJ1bGFyeSIsInN5bWJvbFZvY2FidWxhcnkiLCJnZXRTeW1ib2xWb2NhYnVsYXJ5IiwiY3VzdG9tR3JhbW1hciIsIkN1c3RvbUdyYW1tYXIiLCJmcm9tTmFtZVRlcm1CTkZTdGF0ZW1lbnRCTkZUeXBlVm9jYWJ1bGFyeUFuZFN5bWJvbFZvY2FidWxhcnkiLCJjdXN0b21HcmFtbWFycyIsImNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsIkNvbWJpbmVkQ3VzdG9tR3JhbW1hciIsImZyb21DdXN0b21HcmFtbWFycyIsInJlbGVhc2VDb250ZXh0cyIsIm1hcCIsInJlbGVhc2VDb250ZXh0IiwiZ2V0Q3VzdG9tR3JhbW1hciIsInJldmVyc2UiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQWNnQkE7ZUFBQUE7O1FBT0FDO2VBQUFBOztRQWpCQUM7ZUFBQUE7O1FBK0JoQjtlQUFBOzs7NEJBakNxRDtBQUU5QyxTQUFTQSxnQ0FBZ0NDLElBQUksRUFBRUMsT0FBTztJQUMzRCxJQUFNQyxVQUFVRCxRQUFRRSxVQUFVLElBQzVCQyxlQUFlSCxRQUFRSSxlQUFlLElBQ3RDQyxpQkFBaUJMLFFBQVFNLGlCQUFpQixJQUMxQ0MsbUJBQW1CUCxRQUFRUSxtQkFBbUIsSUFDOUNDLGdCQUFnQkMsMkJBQWEsQ0FBQ0MsNERBQTRELENBQUNaLE1BQU1FLFNBQVNFLGNBQWNFLGdCQUFnQkU7SUFFOUksT0FBT0U7QUFDVDtBQUVPLFNBQVNiO0lBQ2QsSUFBTWdCLGlCQUFpQixFQUFFLEVBQ25CQyx3QkFBd0JDLG1DQUFxQixDQUFDQyxrQkFBa0IsQ0FBQ0g7SUFFdkUsT0FBT0M7QUFDVDtBQUVPLFNBQVNoQix5Q0FBeUNtQixlQUFlO0lBQ3RFLElBQU1KLGlCQUFpQkksZ0JBQWdCQyxHQUFHLENBQUMsU0FBQ0M7UUFDMUMsSUFBTVQsZ0JBQWdCUyxlQUFlQyxnQkFBZ0I7UUFFckQsT0FBT1Y7SUFDVDtJQUVBRyxlQUFlUSxPQUFPLElBQUksR0FBRztJQUU3QixJQUFNUCx3QkFBd0JDLG1DQUFxQixDQUFDQyxrQkFBa0IsQ0FBQ0g7SUFFdkUsT0FBT0M7QUFDVDtJQUVBLFdBQWU7SUFDYmYsaUNBQUFBO0lBQ0FGLGtDQUFBQTtJQUNBQywwQ0FBQUE7QUFDRiJ9
|
package/lib/utilities/nominal.js
CHANGED
|
@@ -16,7 +16,7 @@ _export(exports, {
|
|
|
16
16
|
return nominalParser;
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
|
-
var
|
|
19
|
+
var _occamnominal = require("occam-nominal");
|
|
20
20
|
var _lexer = /*#__PURE__*/ _interop_require_default(require("../nominal/lexer"));
|
|
21
21
|
var _parser = /*#__PURE__*/ _interop_require_default(require("../nominal/parser"));
|
|
22
22
|
var _customGrammar = require("./customGrammar");
|
|
@@ -25,9 +25,9 @@ function _interop_require_default(obj) {
|
|
|
25
25
|
default: obj
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
-
var nominalLexerFromCombinedCustomGrammar =
|
|
28
|
+
var nominalLexerFromCombinedCustomGrammar = _occamnominal.lexersUtilities.nominalLexerFromCombinedCustomGrammar, nominalParserFromCombinedCustomGrammar = _occamnominal.parsersUtilities.nominalParserFromCombinedCustomGrammar;
|
|
29
29
|
var combinedCustomGrammar = (0, _customGrammar.combinedCustomGrammarFromNothing)();
|
|
30
30
|
var nominalLexer = nominalLexerFromCombinedCustomGrammar(_lexer.default, combinedCustomGrammar);
|
|
31
31
|
var nominalParser = nominalParserFromCombinedCustomGrammar(_parser.default, combinedCustomGrammar);
|
|
32
32
|
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbm9taW5hbC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbGV4ZXJzVXRpbGl0aWVzLCBwYXJzZXJzVXRpbGl0aWVzIH0gZnJvbSBcIm9jY2FtLW5vbWluYWxcIjtcblxuaW1wb3J0IE5vbWluYWxMZXhlciBmcm9tIFwiLi4vbm9taW5hbC9sZXhlclwiO1xuaW1wb3J0IE5vbWluYWxQYXJzZXIgZnJvbSBcIi4uL25vbWluYWwvcGFyc2VyXCI7XG5cbmltcG9ydCB7IGNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21Ob3RoaW5nIH0gZnJvbSBcIi4vY3VzdG9tR3JhbW1hclwiO1xuXG5jb25zdCB7IG5vbWluYWxMZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIgfSA9IGxleGVyc1V0aWxpdGllcyxcbiAgICAgIHsgbm9taW5hbFBhcnNlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIgfSA9IHBhcnNlcnNVdGlsaXRpZXM7XG5cbmNvbnN0IGNvbWJpbmVkQ3VzdG9tR3JhbW1hciA9IGNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21Ob3RoaW5nKCk7XG5cbmV4cG9ydCBjb25zdCBub21pbmFsTGV4ZXIgPSBub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyKE5vbWluYWxMZXhlciwgY29tYmluZWRDdXN0b21HcmFtbWFyKTtcblxuZXhwb3J0IGNvbnN0IG5vbWluYWxQYXJzZXIgPSBub21pbmFsUGFyc2VyRnJvbUNvbWJpbmVkQ3VzdG9tR3JhbW1hcihOb21pbmFsUGFyc2VyLCBjb21iaW5lZEN1c3RvbUdyYW1tYXIpO1xuIl0sIm5hbWVzIjpbIm5vbWluYWxMZXhlciIsIm5vbWluYWxQYXJzZXIiLCJub21pbmFsTGV4ZXJGcm9tQ29tYmluZWRDdXN0b21HcmFtbWFyIiwibGV4ZXJzVXRpbGl0aWVzIiwibm9taW5hbFBhcnNlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIiLCJwYXJzZXJzVXRpbGl0aWVzIiwiY29tYmluZWRDdXN0b21HcmFtbWFyIiwiY29tYmluZWRDdXN0b21HcmFtbWFyRnJvbU5vdGhpbmciLCJOb21pbmFsTGV4ZXIiLCJOb21pbmFsUGFyc2VyIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUFjYUE7ZUFBQUE7O1FBRUFDO2VBQUFBOzs7NEJBZHFDOzREQUV6Qjs2REFDQzs2QkFFdUI7Ozs7OztBQUVqRCxJQUFNLEFBQUVDLHdDQUEwQ0MsNkJBQWUsQ0FBekRELHVDQUNGLEFBQUVFLHlDQUEyQ0MsOEJBQWdCLENBQTNERDtBQUVSLElBQU1FLHdCQUF3QkMsSUFBQUEsK0NBQWdDO0FBRXZELElBQU1QLGVBQWVFLHNDQUFzQ00sY0FBWSxFQUFFRjtBQUV6RSxJQUFNTCxnQkFBZ0JHLHVDQUF1Q0ssZUFBYSxFQUFFSCJ9
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.524",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,12 +12,12 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.36",
|
|
14
14
|
"necessary": "^17.0.9",
|
|
15
|
-
"occam-custom-grammars": "^5.0.1369",
|
|
16
15
|
"occam-file-system": "^6.0.502",
|
|
17
|
-
"occam-furtle": "^3.0.
|
|
16
|
+
"occam-furtle": "^3.0.34",
|
|
18
17
|
"occam-grammars": "^1.3.510",
|
|
19
18
|
"occam-lexers": "^23.1.34",
|
|
20
19
|
"occam-model": "^1.0.489",
|
|
20
|
+
"occam-nominal": "^0.0.4",
|
|
21
21
|
"occam-parsers": "^23.1.37"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
package/src/action/verify.js
CHANGED
package/src/context/release.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { arrayUtilities } from "necessary";
|
|
4
4
|
|
|
5
5
|
import { filePathUtilities } from "occam-model";
|
|
6
|
-
import { lexersUtilities, parsersUtilities } from "occam-
|
|
6
|
+
import { lexersUtilities, parsersUtilities } from "occam-nominal";
|
|
7
7
|
import { FurtleFileContext, asynchronousUtilities } from "occam-furtle";
|
|
8
8
|
|
|
9
9
|
import NominalLexer from "../nominal/lexer";
|
|
@@ -21,11 +21,10 @@ export default define(class Combinator extends Element {
|
|
|
21
21
|
verify() {
|
|
22
22
|
let verifies;
|
|
23
23
|
|
|
24
|
-
const
|
|
25
|
-
context = this.getContext(),
|
|
24
|
+
const context = this.getContext(),
|
|
26
25
|
combinatorString = this.getString(); ///
|
|
27
26
|
|
|
28
|
-
context.trace(`Verifying the '${combinatorString}' combinator
|
|
27
|
+
context.trace(`Verifying the '${combinatorString}' combinator...`);
|
|
29
28
|
|
|
30
29
|
const combinator = this, ///
|
|
31
30
|
combinatorVerifies = verifyCombinator(combinator, context);
|
|
@@ -35,7 +34,7 @@ export default define(class Combinator extends Element {
|
|
|
35
34
|
}
|
|
36
35
|
|
|
37
36
|
if (verifies) {
|
|
38
|
-
context.debug(`...verified the '${combinatorString}' combinator
|
|
37
|
+
context.debug(`...verified the '${combinatorString}' combinator.`);
|
|
39
38
|
}
|
|
40
39
|
|
|
41
40
|
return verifies;
|
|
@@ -20,10 +20,9 @@ export default define(class Conclusion extends Element {
|
|
|
20
20
|
verify(context) {
|
|
21
21
|
let verifies = false;
|
|
22
22
|
|
|
23
|
-
const
|
|
24
|
-
conclusionString = this.getString(); ///
|
|
23
|
+
const conclusionString = this.getString(); ///
|
|
25
24
|
|
|
26
|
-
context.trace(`Verifying the '${conclusionString}' conclusion
|
|
25
|
+
context.trace(`Verifying the '${conclusionString}' conclusion...`);
|
|
27
26
|
|
|
28
27
|
if (this.statement !== null) {
|
|
29
28
|
attempt((context) => {
|
|
@@ -38,11 +37,11 @@ export default define(class Conclusion extends Element {
|
|
|
38
37
|
}
|
|
39
38
|
}, context);
|
|
40
39
|
} else {
|
|
41
|
-
context.debug(`Unable to verify the '${conclusionString}' conclusion because it is nonsense
|
|
40
|
+
context.debug(`Unable to verify the '${conclusionString}' conclusion because it is nonsense.`);
|
|
42
41
|
}
|
|
43
42
|
|
|
44
43
|
if (verifies) {
|
|
45
|
-
context.debug(`...verified the '${conclusionString}' conclusion
|
|
44
|
+
context.debug(`...verified the '${conclusionString}' conclusion.`);
|
|
46
45
|
}
|
|
47
46
|
|
|
48
47
|
return verifies;
|
|
@@ -18,11 +18,10 @@ export default define(class CombinatorDeclaration extends Declaration {
|
|
|
18
18
|
async verify() {
|
|
19
19
|
let verifies = false;
|
|
20
20
|
|
|
21
|
-
const
|
|
22
|
-
context = this.getContext(),
|
|
21
|
+
const context = this.getContext(),
|
|
23
22
|
combinatorDeclarationString = this.getString(); ///
|
|
24
23
|
|
|
25
|
-
context.trace(`Verifying the '${combinatorDeclarationString}' combinator declaration
|
|
24
|
+
context.trace(`Verifying the '${combinatorDeclarationString}' combinator declaration...`);
|
|
26
25
|
|
|
27
26
|
const combinatorVerifies = this.combinator.verify();
|
|
28
27
|
|
|
@@ -33,7 +32,7 @@ export default define(class CombinatorDeclaration extends Declaration {
|
|
|
33
32
|
}
|
|
34
33
|
|
|
35
34
|
if (verifies) {
|
|
36
|
-
context.debug(`...verified the '${combinatorDeclarationString}' combinator declaration
|
|
35
|
+
context.debug(`...verified the '${combinatorDeclarationString}' combinator declaration.`);
|
|
37
36
|
}
|
|
38
37
|
|
|
39
38
|
return verifies;
|
|
@@ -23,11 +23,10 @@ export default define(class ComplexTypeDeclaration extends Declaration {
|
|
|
23
23
|
verifyType() {
|
|
24
24
|
let typeVerifies = false;
|
|
25
25
|
|
|
26
|
-
const
|
|
27
|
-
context = this.getContext(),
|
|
26
|
+
const context = this.getContext(),
|
|
28
27
|
typeString = this.type.getString();
|
|
29
28
|
|
|
30
|
-
context.trace(`Verifying the '${typeString}' complex type
|
|
29
|
+
context.trace(`Verifying the '${typeString}' complex type...`);
|
|
31
30
|
|
|
32
31
|
const typeName = this.type.getName(),
|
|
33
32
|
includeRelease = true,
|
|
@@ -35,20 +34,20 @@ export default define(class ComplexTypeDeclaration extends Declaration {
|
|
|
35
34
|
typePresent = context.isTypePresentByTypeName(typeName, includeRelease, includeDependencies);
|
|
36
35
|
|
|
37
36
|
if (typePresent) {
|
|
38
|
-
context.trace(`The '${typeString}' type is already present
|
|
37
|
+
context.trace(`The '${typeString}' type is already present.`);
|
|
39
38
|
} else {
|
|
40
39
|
const prefixedTypeName = typeName, ///
|
|
41
40
|
typePresent = context.isTypePresentByPrefixedTypeName(prefixedTypeName);
|
|
42
41
|
|
|
43
42
|
if (typePresent) {
|
|
44
|
-
context.trace(`The '${typeString}' type is already present
|
|
43
|
+
context.trace(`The '${typeString}' type is already present.`);
|
|
45
44
|
} else {
|
|
46
45
|
typeVerifies = true;
|
|
47
46
|
}
|
|
48
47
|
}
|
|
49
48
|
|
|
50
49
|
if (typeVerifies) {
|
|
51
|
-
context.trace(`...verified the '${typeString}' complex type
|
|
50
|
+
context.trace(`...verified the '${typeString}' complex type.`);
|
|
52
51
|
}
|
|
53
52
|
|
|
54
53
|
return typeVerifies;
|
|
@@ -57,18 +56,17 @@ export default define(class ComplexTypeDeclaration extends Declaration {
|
|
|
57
56
|
verifySuperType(superType) {
|
|
58
57
|
let superTypeVerifies = false;
|
|
59
58
|
|
|
60
|
-
const
|
|
61
|
-
context = this.getContext(),
|
|
59
|
+
const context = this.getContext(),
|
|
62
60
|
superTypeString = superType.getString();
|
|
63
61
|
|
|
64
|
-
context.trace(`Verifying the '${superTypeString}' super-type
|
|
62
|
+
context.trace(`Verifying the '${superTypeString}' super-type...`);
|
|
65
63
|
|
|
66
64
|
const nominalTypeName = superType.getNominalTypeName(),
|
|
67
65
|
typeName = nominalTypeName, ///
|
|
68
66
|
typeComparesToTypeName = this.type.compareTypeName(typeName);
|
|
69
67
|
|
|
70
68
|
if (typeComparesToTypeName) {
|
|
71
|
-
context.trace(`The super-type's name compares to the ${typeName}' complex type's name
|
|
69
|
+
context.trace(`The super-type's name compares to the ${typeName}' complex type's name.`);
|
|
72
70
|
} else {
|
|
73
71
|
const oldSuperType = superType;
|
|
74
72
|
|
|
@@ -86,7 +84,7 @@ export default define(class ComplexTypeDeclaration extends Declaration {
|
|
|
86
84
|
}
|
|
87
85
|
|
|
88
86
|
if (superTypeVerifies) {
|
|
89
|
-
context.debug(`...verified the '${superTypeString}' super-type
|
|
87
|
+
context.debug(`...verified the '${superTypeString}' super-type.`);
|
|
90
88
|
}
|
|
91
89
|
|
|
92
90
|
return superTypeVerifies;
|
|
@@ -95,18 +93,17 @@ export default define(class ComplexTypeDeclaration extends Declaration {
|
|
|
95
93
|
verifySuperTypes() {
|
|
96
94
|
let superTypesVerify;
|
|
97
95
|
|
|
98
|
-
const
|
|
99
|
-
context = this.getContext(),
|
|
96
|
+
const context = this.getContext(),
|
|
100
97
|
typeString = this.type.getString();
|
|
101
98
|
|
|
102
|
-
context.trace(`Verifying the '${typeString}' complex type's super-types
|
|
99
|
+
context.trace(`Verifying the '${typeString}' complex type's super-types...`);
|
|
103
100
|
|
|
104
101
|
const typeBasic = this.type.isBasic();
|
|
105
102
|
|
|
106
103
|
if (typeBasic) {
|
|
107
104
|
superTypesVerify = true;
|
|
108
105
|
|
|
109
|
-
context.trace(`The '${typeString}' complex type is basic
|
|
106
|
+
context.trace(`The '${typeString}' complex type is basic.`)
|
|
110
107
|
} else {
|
|
111
108
|
const superTypes = this.type.getSuperTypes();
|
|
112
109
|
|
|
@@ -120,7 +117,7 @@ export default define(class ComplexTypeDeclaration extends Declaration {
|
|
|
120
117
|
}
|
|
121
118
|
|
|
122
119
|
if (superTypesVerify) {
|
|
123
|
-
context.debug(`...verified the '${typeString}' complex type's super-types
|
|
120
|
+
context.debug(`...verified the '${typeString}' complex type's super-types.`);
|
|
124
121
|
}
|
|
125
122
|
|
|
126
123
|
return superTypesVerify;
|
|
@@ -129,11 +126,10 @@ export default define(class ComplexTypeDeclaration extends Declaration {
|
|
|
129
126
|
verifyProperty(property, properties) {
|
|
130
127
|
let propertyVerifies = false;
|
|
131
128
|
|
|
132
|
-
const
|
|
133
|
-
context = this.getContext(),
|
|
129
|
+
const context = this.getContext(),
|
|
134
130
|
propertyString = property.getString();
|
|
135
131
|
|
|
136
|
-
context.trace(`Verifying the '${propertyString}' property
|
|
132
|
+
context.trace(`Verifying the '${propertyString}' property...`);
|
|
137
133
|
|
|
138
134
|
const propertyNameVerifies = this.verifyPropertyName(property, properties);
|
|
139
135
|
|
|
@@ -146,7 +142,7 @@ export default define(class ComplexTypeDeclaration extends Declaration {
|
|
|
146
142
|
}
|
|
147
143
|
|
|
148
144
|
if (propertyVerifies) {
|
|
149
|
-
context.debug(`...verified the '${propertyString}' property
|
|
145
|
+
context.debug(`...verified the '${propertyString}' property.`);
|
|
150
146
|
}
|
|
151
147
|
|
|
152
148
|
return propertyVerifies;
|
|
@@ -19,11 +19,10 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
19
19
|
async verify() {
|
|
20
20
|
let verifies;
|
|
21
21
|
|
|
22
|
-
const
|
|
23
|
-
context = this.getContext(),
|
|
22
|
+
const context = this.getContext(),
|
|
24
23
|
constructorDeclarationString = this.getString(); ///
|
|
25
24
|
|
|
26
|
-
context.trace(`Verifying the '${constructorDeclarationString}' constructor declaration
|
|
25
|
+
context.trace(`Verifying the '${constructorDeclarationString}' constructor declaration...`);
|
|
27
26
|
|
|
28
27
|
const constructorTypeVerifies = this.verifyConstructorType();
|
|
29
28
|
|
|
@@ -38,7 +37,7 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
38
37
|
}
|
|
39
38
|
|
|
40
39
|
if (verifies) {
|
|
41
|
-
context.debug(`...verified the '${constructorDeclarationString}' constructor declaration
|
|
40
|
+
context.debug(`...verified the '${constructorDeclarationString}' constructor declaration.`);
|
|
42
41
|
}
|
|
43
42
|
|
|
44
43
|
return verifies;
|
|
@@ -47,11 +46,10 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
47
46
|
verifyConstructor() {
|
|
48
47
|
let constructorValidates = false;
|
|
49
48
|
|
|
50
|
-
const
|
|
51
|
-
context = this.getContext(),
|
|
49
|
+
const context = this.getContext(),
|
|
52
50
|
constructorString = this.constructor.getString();
|
|
53
51
|
|
|
54
|
-
context.trace(`Verifying the '${constructorString}' constructor
|
|
52
|
+
context.trace(`Verifying the '${constructorString}' constructor...`);
|
|
55
53
|
|
|
56
54
|
const term = this.constructor.getTerm(),
|
|
57
55
|
termNode = term.getNode(),
|
|
@@ -62,7 +60,7 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
62
60
|
}
|
|
63
61
|
|
|
64
62
|
if (constructorValidates) {
|
|
65
|
-
context.debug(`...verified the '${constructorString}' constructor
|
|
63
|
+
context.debug(`...verified the '${constructorString}' constructor.`);
|
|
66
64
|
}
|
|
67
65
|
|
|
68
66
|
return constructorValidates;
|
|
@@ -71,8 +69,7 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
71
69
|
verifyConstructorType() {
|
|
72
70
|
let constructorTypeVerifies = false;
|
|
73
71
|
|
|
74
|
-
const
|
|
75
|
-
context = this.getContext();
|
|
72
|
+
const context = this.getContext();
|
|
76
73
|
|
|
77
74
|
let type;
|
|
78
75
|
|
|
@@ -80,7 +77,7 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
80
77
|
|
|
81
78
|
const typeString = type.getString();
|
|
82
79
|
|
|
83
|
-
context.trace(`Verifying the '${typeString}' type
|
|
80
|
+
context.trace(`Verifying the '${typeString}' type...`);
|
|
84
81
|
|
|
85
82
|
const nominalTypeName = type.getNominalTypeName();
|
|
86
83
|
|
|
@@ -89,7 +86,7 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
89
86
|
const typePresent = (type !== null)
|
|
90
87
|
|
|
91
88
|
if (!typePresent) {
|
|
92
|
-
context.debug(`The '${typeString}' type is not present
|
|
89
|
+
context.debug(`The '${typeString}' type is not present.`);
|
|
93
90
|
} else {
|
|
94
91
|
const includeSupertypes = false,
|
|
95
92
|
provisional = type.isProvisional(includeSupertypes),
|
|
@@ -97,8 +94,8 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
97
94
|
|
|
98
95
|
if (!typeComparesToProvisional) {
|
|
99
96
|
provisional ?
|
|
100
|
-
context.debug(`The '${typeString}' type is present but not provisional
|
|
101
|
-
context.debug(`The '${typeString}' type is present but provisional
|
|
97
|
+
context.debug(`The '${typeString}' type is present but not provisional.`) :
|
|
98
|
+
context.debug(`The '${typeString}' type is present but provisional.`);
|
|
102
99
|
} else {
|
|
103
100
|
this.constructor.setType(type);
|
|
104
101
|
|
|
@@ -107,7 +104,7 @@ export default define(class ConstructorDeclaration extends Declaration {
|
|
|
107
104
|
}
|
|
108
105
|
|
|
109
106
|
if (constructorTypeVerifies) {
|
|
110
|
-
context.debug(`...verified the '${typeString}' type
|
|
107
|
+
context.debug(`...verified the '${typeString}' type.`);
|
|
111
108
|
}
|
|
112
109
|
|
|
113
110
|
return constructorTypeVerifies;
|
|
@@ -18,27 +18,26 @@ export default define(class MetavariableDeclaration extends Declaration {
|
|
|
18
18
|
verifyType(type) {
|
|
19
19
|
let typeVerifies;
|
|
20
20
|
|
|
21
|
-
const
|
|
22
|
-
context = this.getContext();
|
|
21
|
+
const context = this.getContext();
|
|
23
22
|
|
|
24
23
|
if (type === null) {
|
|
25
24
|
typeVerifies = true;
|
|
26
25
|
} else {
|
|
27
26
|
const typeString = type.getString();
|
|
28
27
|
|
|
29
|
-
context.trace(`Verifying the '${typeString}' type
|
|
28
|
+
context.trace(`Verifying the '${typeString}' type...`);
|
|
30
29
|
|
|
31
30
|
const nominalTypeName = type.getNominalTypeName(),
|
|
32
31
|
typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);
|
|
33
32
|
|
|
34
33
|
if (!typePresent) {
|
|
35
|
-
context.debug(`The '${typeString}' type is not present
|
|
34
|
+
context.debug(`The '${typeString}' type is not present.`);
|
|
36
35
|
} else {
|
|
37
36
|
typeVerifies = true;
|
|
38
37
|
}
|
|
39
38
|
|
|
40
39
|
if (typeVerifies) {
|
|
41
|
-
context.debug(`...verified the '${typeString}' type
|
|
40
|
+
context.debug(`...verified the '${typeString}' type.`);
|
|
42
41
|
}
|
|
43
42
|
}
|
|
44
43
|
|
|
@@ -48,23 +47,22 @@ export default define(class MetavariableDeclaration extends Declaration {
|
|
|
48
47
|
verifyMetavariable(metavariable) {
|
|
49
48
|
let metavariableVerifies = false;
|
|
50
49
|
|
|
51
|
-
const
|
|
52
|
-
context = this.getContext(),
|
|
50
|
+
const context = this.getContext(),
|
|
53
51
|
metavariableString = metavariable.getString();
|
|
54
52
|
|
|
55
|
-
context.trace(`Verifying the '${metavariableString}' metavariable
|
|
53
|
+
context.trace(`Verifying the '${metavariableString}' metavariable...`);
|
|
56
54
|
|
|
57
55
|
const metavariableNode = metavariable.getNode(), ///
|
|
58
56
|
termNode = metavariableNode.getTermNode();
|
|
59
57
|
|
|
60
58
|
if (termNode !== null) {
|
|
61
|
-
context.debug(`A term was found in the '${metavariableString}' metavariable when a type should have been present
|
|
59
|
+
context.debug(`A term was found in the '${metavariableString}' metavariable when a type should have been present.`);
|
|
62
60
|
} else {
|
|
63
61
|
const metavariableName = metavariable.getName(),
|
|
64
62
|
metavariablePresent = context.isMetavariablePresentByMetavariableName(metavariableName);
|
|
65
63
|
|
|
66
64
|
if (metavariablePresent) {
|
|
67
|
-
context.debug(`The '${metavariableName}' metavariable is already present
|
|
65
|
+
context.debug(`The '${metavariableName}' metavariable is already present.`);
|
|
68
66
|
} else {
|
|
69
67
|
const type = metavariable.getType(),
|
|
70
68
|
typeVerifies = this.verifyType(type);
|
|
@@ -74,7 +72,7 @@ export default define(class MetavariableDeclaration extends Declaration {
|
|
|
74
72
|
}
|
|
75
73
|
|
|
76
74
|
if (metavariableVerifies) {
|
|
77
|
-
context.debug(`...verified the '${metavariableString}' metavariable
|
|
75
|
+
context.debug(`...verified the '${metavariableString}' metavariable.`);
|
|
78
76
|
}
|
|
79
77
|
|
|
80
78
|
return metavariableVerifies;
|
|
@@ -83,11 +81,10 @@ export default define(class MetavariableDeclaration extends Declaration {
|
|
|
83
81
|
async verify() {
|
|
84
82
|
let verifies;
|
|
85
83
|
|
|
86
|
-
const
|
|
87
|
-
context = this.getContext(),
|
|
84
|
+
const context = this.getContext(),
|
|
88
85
|
metavariableDeclarationString = this.getString(); ///
|
|
89
86
|
|
|
90
|
-
context.trace(`Verifying the '${metavariableDeclarationString}' metavariable declaration
|
|
87
|
+
context.trace(`Verifying the '${metavariableDeclarationString}' metavariable declaration...`);
|
|
91
88
|
|
|
92
89
|
const metavariableVerifies = this.verifyMetavariable(this.metavariable);
|
|
93
90
|
|
|
@@ -98,7 +95,7 @@ export default define(class MetavariableDeclaration extends Declaration {
|
|
|
98
95
|
}
|
|
99
96
|
|
|
100
97
|
if (verifies) {
|
|
101
|
-
context.debug(`...verified the '${metavariableDeclarationString}' metavariable declaration
|
|
98
|
+
context.debug(`...verified the '${metavariableDeclarationString}' metavariable declaration.`);
|
|
102
99
|
}
|
|
103
100
|
|
|
104
101
|
return verifies;
|
|
@@ -23,11 +23,10 @@ export default define(class SimpleTypeDeclaration extends Declaration {
|
|
|
23
23
|
verifyType() {
|
|
24
24
|
let typeVerifies = false;
|
|
25
25
|
|
|
26
|
-
const
|
|
27
|
-
context = this.getContext(),
|
|
26
|
+
const context = this.getContext(),
|
|
28
27
|
typeString = this.type.getString();
|
|
29
28
|
|
|
30
|
-
context.trace(`Verifying the '${typeString}' simple type
|
|
29
|
+
context.trace(`Verifying the '${typeString}' simple type...`);
|
|
31
30
|
|
|
32
31
|
const typeName = this.type.getName(),
|
|
33
32
|
includeRelease = true,
|
|
@@ -35,20 +34,20 @@ export default define(class SimpleTypeDeclaration extends Declaration {
|
|
|
35
34
|
typePresent = context.isTypePresentByTypeName(typeName, includeRelease, includeDependencies);
|
|
36
35
|
|
|
37
36
|
if (typePresent) {
|
|
38
|
-
context.trace(`The '${typeString}' type is already present
|
|
37
|
+
context.trace(`The '${typeString}' type is already present.`);
|
|
39
38
|
} else {
|
|
40
39
|
const prefixedTypeName = typeName, ///
|
|
41
40
|
typePresent = context.isTypePresentByPrefixedTypeName(prefixedTypeName);
|
|
42
41
|
|
|
43
42
|
if (typePresent) {
|
|
44
|
-
context.trace(`The '${typeString}' type is already present
|
|
43
|
+
context.trace(`The '${typeString}' type is already present.`);
|
|
45
44
|
} else {
|
|
46
45
|
typeVerifies = true;
|
|
47
46
|
}
|
|
48
47
|
}
|
|
49
48
|
|
|
50
49
|
if (typeVerifies) {
|
|
51
|
-
context.trace(`...verified the '${typeString}' simple type
|
|
50
|
+
context.trace(`...verified the '${typeString}' simple type.`);
|
|
52
51
|
}
|
|
53
52
|
|
|
54
53
|
return typeVerifies;
|
|
@@ -57,18 +56,17 @@ export default define(class SimpleTypeDeclaration extends Declaration {
|
|
|
57
56
|
verifySuperType(superType) {
|
|
58
57
|
let superTypeVerifies = false;
|
|
59
58
|
|
|
60
|
-
const
|
|
61
|
-
context = this.getContext(),
|
|
59
|
+
const context = this.getContext(),
|
|
62
60
|
superTypeString = superType.getString();
|
|
63
61
|
|
|
64
|
-
context.trace(`Verifying the '${superTypeString}' super-type
|
|
62
|
+
context.trace(`Verifying the '${superTypeString}' super-type...`);
|
|
65
63
|
|
|
66
64
|
const nominalTypeName = superType.getNominalTypeName(),
|
|
67
65
|
typeName = nominalTypeName, ///
|
|
68
66
|
typeComparesToTypeName = this.type.compareTypeName(typeName);
|
|
69
67
|
|
|
70
68
|
if (typeComparesToTypeName) {
|
|
71
|
-
context.trace(`The super-type's name compares to the ${typeName}' simple type's name
|
|
69
|
+
context.trace(`The super-type's name compares to the ${typeName}' simple type's name.`);
|
|
72
70
|
} else {
|
|
73
71
|
const oldSuperType = superType;
|
|
74
72
|
|
|
@@ -86,7 +84,7 @@ export default define(class SimpleTypeDeclaration extends Declaration {
|
|
|
86
84
|
}
|
|
87
85
|
|
|
88
86
|
if (superTypeVerifies) {
|
|
89
|
-
context.debug(`...verified the '${superTypeString}' super-type
|
|
87
|
+
context.debug(`...verified the '${superTypeString}' super-type.`);
|
|
90
88
|
}
|
|
91
89
|
|
|
92
90
|
return superTypeVerifies;
|
|
@@ -95,18 +93,17 @@ export default define(class SimpleTypeDeclaration extends Declaration {
|
|
|
95
93
|
verifySuperTypes() {
|
|
96
94
|
let superTypesVerify;
|
|
97
95
|
|
|
98
|
-
const
|
|
99
|
-
context = this.getContext(),
|
|
96
|
+
const context = this.getContext(),
|
|
100
97
|
typeString = this.type.getString();
|
|
101
98
|
|
|
102
|
-
context.trace(`Verifying the '${typeString}' simple type's super-types
|
|
99
|
+
context.trace(`Verifying the '${typeString}' simple type's super-types...`);
|
|
103
100
|
|
|
104
101
|
const typeBasic = this.type.isBasic();
|
|
105
102
|
|
|
106
103
|
if (typeBasic) {
|
|
107
104
|
superTypesVerify = true;
|
|
108
105
|
|
|
109
|
-
context.trace(`The '${typeString}' simple type is basic
|
|
106
|
+
context.trace(`The '${typeString}' simple type is basic.`)
|
|
110
107
|
} else {
|
|
111
108
|
const superTypes = this.type.getSuperTypes();
|
|
112
109
|
|
|
@@ -120,7 +117,7 @@ export default define(class SimpleTypeDeclaration extends Declaration {
|
|
|
120
117
|
}
|
|
121
118
|
|
|
122
119
|
if (superTypesVerify) {
|
|
123
|
-
context.debug(`...verified the '${typeString}' simple type's super-types
|
|
120
|
+
context.debug(`...verified the '${typeString}' simple type's super-types.`);
|
|
124
121
|
}
|
|
125
122
|
|
|
126
123
|
return superTypesVerify;
|