occam-verify-cli 1.0.428 → 1.0.436

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.
Files changed (123) hide show
  1. package/lib/context/file.js +1 -1
  2. package/lib/element/assertion.js +115 -24
  3. package/lib/element/assumption.js +120 -20
  4. package/lib/element/axiomLemmaTheoremConjecture.js +118 -30
  5. package/lib/element/conclusion.js +113 -25
  6. package/lib/element/declaration.js +112 -37
  7. package/lib/element/deduction.js +112 -66
  8. package/lib/element/derivation.js +114 -5
  9. package/lib/element/equality.js +119 -26
  10. package/lib/element/equivalence.js +121 -28
  11. package/lib/element/equivalences.js +122 -7
  12. package/lib/element/error.js +115 -32
  13. package/lib/element/frame.js +119 -59
  14. package/lib/element/hypothesis.js +115 -27
  15. package/lib/element/judgement.js +120 -33
  16. package/lib/element/label.js +116 -63
  17. package/lib/element/lemma.js +1 -9
  18. package/lib/element/metaLemma.js +1 -8
  19. package/lib/element/metaLemmaMetatheorem.js +117 -29
  20. package/lib/element/metaType.js +68 -61
  21. package/lib/element/metatheorem.js +1 -8
  22. package/lib/element/metavariable.js +122 -93
  23. package/lib/element/parameter.js +120 -20
  24. package/lib/element/premise.js +114 -35
  25. package/lib/element/procedureCall.js +117 -99
  26. package/lib/element/procedureReference.js +120 -20
  27. package/lib/element/proof.js +111 -55
  28. package/lib/element/property.js +121 -35
  29. package/lib/element/propertyRelation.js +116 -72
  30. package/lib/element/reference.js +120 -70
  31. package/lib/element/rule.js +116 -41
  32. package/lib/element/section.js +114 -133
  33. package/lib/element/signature.js +120 -20
  34. package/lib/element/statement/combinator/bracketed.js +4 -9
  35. package/lib/element/statement.js +110 -125
  36. package/lib/element/step.js +115 -27
  37. package/lib/element/subDerivation.js +111 -43
  38. package/lib/element/subproof.js +115 -20
  39. package/lib/element/substitution.js +115 -31
  40. package/lib/element/substitutions.js +120 -6
  41. package/lib/element/supposition.js +114 -35
  42. package/lib/element/term/constructor/bracketed.js +4 -8
  43. package/lib/element/term.js +111 -98
  44. package/lib/element/theorem.js +1 -8
  45. package/lib/element/type.js +71 -91
  46. package/lib/element/typePrefix.js +120 -20
  47. package/lib/element/variable.js +116 -111
  48. package/lib/element.js +67 -0
  49. package/lib/node/{nonsense.js → equivalences.js} +10 -10
  50. package/lib/node/frame.js +11 -5
  51. package/lib/node/procedureReference.js +6 -6
  52. package/lib/node/statement.js +11 -5
  53. package/lib/node/term.js +8 -1
  54. package/lib/nonTerminalNodeMap.js +3 -3
  55. package/lib/process/instantiate.js +8 -39
  56. package/lib/process/verify.js +22 -29
  57. package/lib/ruleNames.js +5 -5
  58. package/lib/utilities/brackets.js +11 -11
  59. package/lib/utilities/element.js +588 -94
  60. package/lib/utilities/instance.js +61 -0
  61. package/lib/utilities/string.js +73 -1
  62. package/package.json +1 -1
  63. package/src/context/file.js +1 -1
  64. package/src/element/assertion.js +4 -16
  65. package/src/element/assumption.js +5 -12
  66. package/src/element/axiomLemmaTheoremConjecture.js +4 -16
  67. package/src/element/conclusion.js +4 -16
  68. package/src/element/declaration.js +4 -16
  69. package/src/element/deduction.js +5 -19
  70. package/src/element/derivation.js +5 -2
  71. package/src/element/equality.js +4 -16
  72. package/src/element/equivalence.js +4 -16
  73. package/src/element/equivalences.js +12 -5
  74. package/src/element/error.js +4 -24
  75. package/src/element/frame.js +5 -56
  76. package/src/element/hypothesis.js +6 -23
  77. package/src/element/judgement.js +5 -30
  78. package/src/element/label.js +8 -19
  79. package/src/element/lemma.js +0 -7
  80. package/src/element/metaLemma.js +0 -7
  81. package/src/element/metaLemmaMetatheorem.js +4 -16
  82. package/src/element/metaType.js +23 -64
  83. package/src/element/metatheorem.js +0 -7
  84. package/src/element/metavariable.js +6 -94
  85. package/src/element/parameter.js +10 -18
  86. package/src/element/premise.js +4 -31
  87. package/src/element/procedureCall.js +5 -77
  88. package/src/element/procedureReference.js +7 -17
  89. package/src/element/proof.js +5 -17
  90. package/src/element/property.js +8 -30
  91. package/src/element/propertyRelation.js +5 -33
  92. package/src/element/reference.js +8 -72
  93. package/src/element/rule.js +4 -41
  94. package/src/element/section.js +4 -129
  95. package/src/element/signature.js +7 -13
  96. package/src/element/statement/combinator/bracketed.js +3 -9
  97. package/src/element/statement.js +3 -126
  98. package/src/element/step.js +4 -16
  99. package/src/element/subDerivation.js +5 -3
  100. package/src/element/subproof.js +5 -12
  101. package/src/element/substitution.js +4 -24
  102. package/src/element/substitutions.js +6 -2
  103. package/src/element/supposition.js +4 -31
  104. package/src/element/term/constructor/bracketed.js +4 -9
  105. package/src/element/term.js +6 -59
  106. package/src/element/theorem.js +0 -7
  107. package/src/element/type.js +9 -104
  108. package/src/element/typePrefix.js +8 -13
  109. package/src/element/variable.js +6 -109
  110. package/src/element.js +29 -0
  111. package/src/node/{nonsense.js → equivalences.js} +2 -2
  112. package/src/node/frame.js +10 -5
  113. package/src/node/procedureReference.js +4 -4
  114. package/src/node/statement.js +10 -5
  115. package/src/node/term.js +7 -0
  116. package/src/nonTerminalNodeMap.js +3 -3
  117. package/src/process/instantiate.js +4 -36
  118. package/src/process/verify.js +42 -47
  119. package/src/ruleNames.js +1 -1
  120. package/src/utilities/brackets.js +13 -13
  121. package/src/utilities/element.js +731 -129
  122. package/src/utilities/instance.js +53 -0
  123. package/src/utilities/string.js +97 -0
@@ -0,0 +1,61 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ function _export(target, all) {
6
+ for(var name in all)Object.defineProperty(target, name, {
7
+ enumerable: true,
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
+ });
10
+ }
11
+ _export(exports, {
12
+ get bracketedCombinatorStatementFromNothing () {
13
+ return bracketedCombinatorStatementFromNothing;
14
+ },
15
+ get bracketedConstructorTermFromNothing () {
16
+ return bracketedConstructorTermFromNothing;
17
+ }
18
+ });
19
+ var _nominal = /*#__PURE__*/ _interop_require_default(require("../context/nominal"));
20
+ var _constants = require("../constants");
21
+ var _metaTypeNames = require("../metaTypeNames");
22
+ var _instantiate = require("../process/instantiate");
23
+ var _element = require("../utilities/element");
24
+ function _interop_require_default(obj) {
25
+ return obj && obj.__esModule ? obj : {
26
+ default: obj
27
+ };
28
+ }
29
+ var bracketedConstructorTerm = null, bracketedCombinatorStatement = null;
30
+ function bracketedConstructorTermFromNothing() {
31
+ if (bracketedConstructorTerm === null) {
32
+ var context;
33
+ var string = "(".concat(_constants.BASE_TYPE_SYMBOL, ")");
34
+ context = _nominal.default; ///
35
+ var node = (0, _instantiate.instantiateTerm)(string, context), bracketedConstructorTermNode = node; ///
36
+ context = {
37
+ nodeAsString: function() {
38
+ return string;
39
+ }
40
+ };
41
+ bracketedConstructorTerm = (0, _element.termFromTermNode)(bracketedConstructorTermNode, context);
42
+ }
43
+ return bracketedConstructorTerm;
44
+ }
45
+ function bracketedCombinatorStatementFromNothing() {
46
+ if (bracketedCombinatorStatement === null) {
47
+ var context;
48
+ var string = "(".concat(_metaTypeNames.STATEMENT_META_TYPE_NAME, ")");
49
+ context = _nominal.default; ///
50
+ var node = (0, _instantiate.instantiateStatement)(string, context), bracketedCombinatorStatementNode = node; ///
51
+ context = {
52
+ nodeAsString: function() {
53
+ return string;
54
+ }
55
+ };
56
+ bracketedCombinatorStatement = (0, _element.statementFromStatementNode)(bracketedCombinatorStatementNode, context);
57
+ }
58
+ return bracketedCombinatorStatement;
59
+ }
60
+
61
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvaW5zdGFuY2UuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBub21pbmFsQ29udGV4dCBmcm9tIFwiLi4vY29udGV4dC9ub21pbmFsXCI7XG5cbmltcG9ydCB7IEJBU0VfVFlQRV9TWU1CT0wgfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5pbXBvcnQgeyBTVEFURU1FTlRfTUVUQV9UWVBFX05BTUUgfSBmcm9tIFwiLi4vbWV0YVR5cGVOYW1lc1wiO1xuaW1wb3J0IHsgaW5zdGFudGlhdGVUZXJtLCBpbnN0YW50aWF0ZVN0YXRlbWVudCB9IGZyb20gXCIuLi9wcm9jZXNzL2luc3RhbnRpYXRlXCI7XG5pbXBvcnQgeyB0ZXJtRnJvbVRlcm1Ob2RlLCBzdGF0ZW1lbnRGcm9tU3RhdGVtZW50Tm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvZWxlbWVudFwiO1xuXG5sZXQgYnJhY2tldGVkQ29uc3RydWN0b3JUZXJtID0gbnVsbCxcbiAgICBicmFja2V0ZWRDb21iaW5hdG9yU3RhdGVtZW50ID0gbnVsbDtcblxuZXhwb3J0IGZ1bmN0aW9uIGJyYWNrZXRlZENvbnN0cnVjdG9yVGVybUZyb21Ob3RoaW5nKCkge1xuICBpZiAoYnJhY2tldGVkQ29uc3RydWN0b3JUZXJtID09PSBudWxsKSB7XG4gICAgbGV0IGNvbnRleHQ7XG5cbiAgICBjb25zdCBzdHJpbmcgPSBgKCR7QkFTRV9UWVBFX1NZTUJPTH0pYDtcblxuICAgIGNvbnRleHQgPSBub21pbmFsQ29udGV4dDsgLy8vXG5cbiAgICBjb25zdCBub2RlID0gaW5zdGFudGlhdGVUZXJtKHN0cmluZywgY29udGV4dCksXG4gICAgICAgICAgYnJhY2tldGVkQ29uc3RydWN0b3JUZXJtTm9kZSA9IG5vZGU7ICAvLy9cblxuICAgIGNvbnRleHQgPSB7XG4gICAgICBub2RlQXNTdHJpbmc6ICgpID0+IHN0cmluZ1xuICAgIH07XG5cbiAgICBicmFja2V0ZWRDb25zdHJ1Y3RvclRlcm0gPSB0ZXJtRnJvbVRlcm1Ob2RlKGJyYWNrZXRlZENvbnN0cnVjdG9yVGVybU5vZGUsIGNvbnRleHQpO1xuICB9XG5cbiAgcmV0dXJuIGJyYWNrZXRlZENvbnN0cnVjdG9yVGVybTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJyYWNrZXRlZENvbWJpbmF0b3JTdGF0ZW1lbnRGcm9tTm90aGluZygpIHtcbiAgaWYgKGJyYWNrZXRlZENvbWJpbmF0b3JTdGF0ZW1lbnQgPT09IG51bGwpIHtcbiAgICBsZXQgY29udGV4dDtcblxuICAgIGNvbnN0IHN0cmluZyA9IGAoJHtTVEFURU1FTlRfTUVUQV9UWVBFX05BTUV9KWA7XG5cbiAgICBjb250ZXh0ID0gbm9taW5hbENvbnRleHQ7IC8vL1xuXG4gICAgY29uc3Qgbm9kZSA9IGluc3RhbnRpYXRlU3RhdGVtZW50KHN0cmluZywgY29udGV4dCksXG4gICAgICAgICAgYnJhY2tldGVkQ29tYmluYXRvclN0YXRlbWVudE5vZGUgPSBub2RlOyAgLy8vXG5cbiAgICBjb250ZXh0ID0ge1xuICAgICAgbm9kZUFzU3RyaW5nOiAoKSA9PiBzdHJpbmdcbiAgICB9O1xuXG4gICAgYnJhY2tldGVkQ29tYmluYXRvclN0YXRlbWVudCA9IHN0YXRlbWVudEZyb21TdGF0ZW1lbnROb2RlKGJyYWNrZXRlZENvbWJpbmF0b3JTdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcbiAgfVxuXG4gIHJldHVybiBicmFja2V0ZWRDb21iaW5hdG9yU3RhdGVtZW50O1xufVxuIl0sIm5hbWVzIjpbImJyYWNrZXRlZENvbWJpbmF0b3JTdGF0ZW1lbnRGcm9tTm90aGluZyIsImJyYWNrZXRlZENvbnN0cnVjdG9yVGVybUZyb21Ob3RoaW5nIiwiYnJhY2tldGVkQ29uc3RydWN0b3JUZXJtIiwiYnJhY2tldGVkQ29tYmluYXRvclN0YXRlbWVudCIsImNvbnRleHQiLCJzdHJpbmciLCJCQVNFX1RZUEVfU1lNQk9MIiwibm9taW5hbENvbnRleHQiLCJub2RlIiwiaW5zdGFudGlhdGVUZXJtIiwiYnJhY2tldGVkQ29uc3RydWN0b3JUZXJtTm9kZSIsIm5vZGVBc1N0cmluZyIsInRlcm1Gcm9tVGVybU5vZGUiLCJTVEFURU1FTlRfTUVUQV9UWVBFX05BTUUiLCJpbnN0YW50aWF0ZVN0YXRlbWVudCIsImJyYWNrZXRlZENvbWJpbmF0b3JTdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50RnJvbVN0YXRlbWVudE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQWlDZ0JBO2VBQUFBOztRQXJCQUM7ZUFBQUE7Ozs4REFWVzt5QkFFTTs2QkFDUTsyQkFDYTt1QkFDTzs7Ozs7O0FBRTdELElBQUlDLDJCQUEyQixNQUMzQkMsK0JBQStCO0FBRTVCLFNBQVNGO0lBQ2QsSUFBSUMsNkJBQTZCLE1BQU07UUFDckMsSUFBSUU7UUFFSixJQUFNQyxTQUFTLEFBQUMsSUFBb0IsT0FBakJDLDJCQUFnQixFQUFDO1FBRXBDRixVQUFVRyxnQkFBYyxFQUFFLEdBQUc7UUFFN0IsSUFBTUMsT0FBT0MsSUFBQUEsNEJBQWUsRUFBQ0osUUFBUUQsVUFDL0JNLCtCQUErQkYsTUFBTyxHQUFHO1FBRS9DSixVQUFVO1lBQ1JPLGNBQWM7dUJBQU1OOztRQUN0QjtRQUVBSCwyQkFBMkJVLElBQUFBLHlCQUFnQixFQUFDRiw4QkFBOEJOO0lBQzVFO0lBRUEsT0FBT0Y7QUFDVDtBQUVPLFNBQVNGO0lBQ2QsSUFBSUcsaUNBQWlDLE1BQU07UUFDekMsSUFBSUM7UUFFSixJQUFNQyxTQUFTLEFBQUMsSUFBNEIsT0FBekJRLHVDQUF3QixFQUFDO1FBRTVDVCxVQUFVRyxnQkFBYyxFQUFFLEdBQUc7UUFFN0IsSUFBTUMsT0FBT00sSUFBQUEsaUNBQW9CLEVBQUNULFFBQVFELFVBQ3BDVyxtQ0FBbUNQLE1BQU8sR0FBRztRQUVuREosVUFBVTtZQUNSTyxjQUFjO3VCQUFNTjs7UUFDdEI7UUFFQUYsK0JBQStCYSxJQUFBQSxtQ0FBMEIsRUFBQ0Qsa0NBQWtDWDtJQUM5RjtJQUVBLE9BQU9EO0FBQ1QifQ==
@@ -9,15 +9,39 @@ function _export(target, all) {
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
+ get assumptionsStringFromAssumptions () {
13
+ return assumptionsStringFromAssumptions;
14
+ },
12
15
  get axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction () {
13
16
  return axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction;
14
17
  },
15
18
  get equivalenceStringFromTerms () {
16
19
  return equivalenceStringFromTerms;
17
20
  },
21
+ get hypothesesStringFromHypotheses () {
22
+ return hypothesesStringFromHypotheses;
23
+ },
18
24
  get labelsStringFromLabels () {
19
25
  return labelsStringFromLabels;
20
26
  },
27
+ get metaLemmaMetatheoremStringFromLabelSuppositionsAndDeduction () {
28
+ return metaLemmaMetatheoremStringFromLabelSuppositionsAndDeduction;
29
+ },
30
+ get parametersStringFromParameters () {
31
+ return parametersStringFromParameters;
32
+ },
33
+ get premisesStringFromPremises () {
34
+ return premisesStringFromPremises;
35
+ },
36
+ get procedureCallStringFromProcedureReferenceAndParameters () {
37
+ return procedureCallStringFromProcedureReferenceAndParameters;
38
+ },
39
+ get rulsStringFromLabelsPremisesAndConclusion () {
40
+ return rulsStringFromLabelsPremisesAndConclusion;
41
+ },
42
+ get sectionStringFromHypothesesAxiomLemmaTheoremAndConjecture () {
43
+ return sectionStringFromHypothesesAxiomLemmaTheoremAndConjecture;
44
+ },
21
45
  get signatureStringFromTerms () {
22
46
  return signatureStringFromTerms;
23
47
  },
@@ -54,6 +78,22 @@ function labelsStringFromLabels(labels) {
54
78
  }, null);
55
79
  return labelsString;
56
80
  }
81
+ function premisesStringFromPremises(premises) {
82
+ var premisesString = premises.reduce(function(premisesString, premise) {
83
+ var premiseString = premise.getString();
84
+ premisesString = premisesString !== null ? "".concat(premisesString, ", ").concat(premiseString) : premiseString; ///
85
+ return premisesString;
86
+ }, null);
87
+ return premisesString;
88
+ }
89
+ function hypothesesStringFromHypotheses(hypotheses, context) {
90
+ var hypothesesString = hypotheses.reduce(function(hypothesesString, hypothesis) {
91
+ var hypothesisString = hypothesis.getString();
92
+ hypothesesString = hypothesesString !== null ? "".concat(hypothesesString, ", ").concat(hypothesisString) : hypothesisString; ///
93
+ return hypothesesString;
94
+ }, null);
95
+ return hypothesesString;
96
+ }
57
97
  function superTypesStringFromSuperTypes(superTypes) {
58
98
  var superTypesString = superTypes.reduce(function(superTypesString, superType) {
59
99
  if (superType !== _type.baseType) {
@@ -64,6 +104,22 @@ function superTypesStringFromSuperTypes(superTypes) {
64
104
  }, null);
65
105
  return superTypesString;
66
106
  }
107
+ function parametersStringFromParameters(parameters) {
108
+ var parametersString = parameters.reduce(function(parametersString, parameter) {
109
+ var parameterString = parameter.getString();
110
+ parametersString = parametersString === null ? parameterString : "".concat(parametersString, ", ").concat(parameterString);
111
+ return parametersString;
112
+ }, null);
113
+ return parametersString;
114
+ }
115
+ function assumptionsStringFromAssumptions(assumptions) {
116
+ var assumptionsString = assumptions.reduce(function(assumptionsString, assumption) {
117
+ var assumptionString = assumption.getString();
118
+ assumptionsString = assumptionsString === null ? assumptionString : "".concat(assumptionsString, ", ").concat(assumptionString);
119
+ return assumptionsString;
120
+ }, null);
121
+ return assumptionsString;
122
+ }
67
123
  function suppositionsStringFromSuppositions(suppositions) {
68
124
  var suppositionsString = suppositions.reduce(function(suppositionsString, supposition) {
69
125
  var suppositionString = supposition.getString();
@@ -84,6 +140,10 @@ function subproofStringFromSubproof(subproof) {
84
140
  var lastStep = subproof.getLastStep(), suppositions = subproof.getSuppositions(), lastStepString = lastStep.getString(), suppositionsString = suppositionsStringFromSuppositions(suppositions), subproofString = "[".concat(suppositionsString, "] ... ").concat(lastStepString);
85
141
  return subproofString;
86
142
  }
143
+ function rulsStringFromLabelsPremisesAndConclusion(labels, premises, conclusion) {
144
+ var premisesString = premisesStringFromPremises(premises), conclusionString = conclusion.getString(), labelsString = labelsStringFromLabels(labels), ruleString = premisesString !== null ? "".concat(labelsString, " :: [").concat(premisesString, "] ... ").concat(conclusionString) : "".concat(labelsString, " :: ").concat(conclusionString);
145
+ return ruleString;
146
+ }
87
147
  function typeStringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {
88
148
  var typeString;
89
149
  typeString = typePrefixName !== null ? "".concat(typePrefixName).concat(typeName) : typeName;
@@ -93,6 +153,18 @@ function typeStringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixN
93
153
  }
94
154
  return typeString;
95
155
  }
156
+ function procedureCallStringFromProcedureReferenceAndParameters(procedureReference, parameters) {
157
+ var procedureReferenceName = procedureReference.getName(), parametersString = parametersStringFromParameters(parameters), procedureCallString = "".concat(procedureReferenceName, "(").concat(parametersString, ")");
158
+ return procedureCallString;
159
+ }
160
+ function sectionStringFromHypothesesAxiomLemmaTheoremAndConjecture(hypotheses, axiom, lemma, theorem, conjecture, context) {
161
+ var axiomLemmaTheoremOrConjecture = axiom || lemma || theorem || conjecture, axiomLemmaTheoremOrConjectureString = axiomLemmaTheoremOrConjecture.getString(), hypothesesString = hypothesesStringFromHypotheses(hypotheses, context), sectionString = axiomLemmaTheoremOrConjectureString !== null ? "[".concat(hypothesesString, "]::: ").concat(axiomLemmaTheoremOrConjectureString) : "[".concat(hypothesesString, "]::: ");
162
+ return sectionString;
163
+ }
164
+ function metaLemmaMetatheoremStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction) {
165
+ var suppositionsString = suppositionsStringFromSuppositions(suppositions), deductionString = deduction.getString(), labelString = label.getString(), metaLemmaMetatheoremString = suppositionsString !== null ? "".concat(labelString, " :: [").concat(suppositionsString, "] ... ").concat(deductionString) : "".concat(labelString, " :: ").concat(deductionString);
166
+ return metaLemmaMetatheoremString;
167
+ }
96
168
  function axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction) {
97
169
  var axiomLemmaTheoremConjectureString;
98
170
  var suppositionsString = suppositionsStringFromSuppositions(suppositions), deductionString = deduction.getString(), labelsString = labelsStringFromLabels(labels);
@@ -104,4 +176,4 @@ function axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction(lab
104
176
  return axiomLemmaTheoremConjectureString;
105
177
  }
106
178
 
107
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/string.js"],"sourcesContent":["\"use strict\";\n\nimport { baseType } from \"../element/type\";\n\nexport function termsStringFromTerms(terms) {\n  const termsString = terms.reduce((termsString, term) => {\n    const termString = term.getString();\n\n    termsString = (termsString !== null) ?\n                   `${termsString}, ${termString}` :\n                      termString;\n\n    return termsString;\n  }, null);\n\n  return termsString;\n}\n\nexport function labelsStringFromLabels(labels) {\n  const labelsString = labels.reduce((labelsString, label) => {\n    const labelString = label.getString();\n\n    labelsString = (labelsString === null) ?\n                     labelString: ///\n                      `${labelsString}, ${labelString}`;\n\n    return labelsString;\n  }, null);\n\n  return labelsString;\n}\n\nexport function superTypesStringFromSuperTypes(superTypes) {\n  const superTypesString = superTypes.reduce((superTypesString, superType) => {\n    if (superType !== baseType) {\n      const superTypeString = superType.getString();\n\n      superTypesString = (superTypesString === null) ?\n                           `'${superTypeString}'` :\n                             `${superTypesString}, '${superTypeString}'`;\n    }\n\n    return superTypesString;\n  }, null);\n\n  return superTypesString;\n}\n\nexport function suppositionsStringFromSuppositions(suppositions) {\n  const suppositionsString = suppositions.reduce((suppositionsString, supposition) => {\n    const suppositionString = supposition.getString();\n\n    suppositionsString = (suppositionsString === null) ?\n                           suppositionString: ///\n                            `${suppositionsString}, ${suppositionString}`;\n\n    return suppositionsString;\n  }, null);\n\n  return suppositionsString;\n}\n\nexport function signatureStringFromTerms(terms) {\n  const termsString = termsStringFromTerms(terms),\n        signatureString = `[${termsString}]`;\n\n  return signatureString;\n}\n\nexport function equivalenceStringFromTerms(terms) {\n  const termsString = termsStringFromTerms(terms),\n        equivalenceString = termsString;  ///\n\n  return equivalenceString;\n}\n\nexport function subproofStringFromSubproof(subproof) {\n  const lastStep = subproof.getLastStep(),\n        suppositions = subproof.getSuppositions(),\n        lastStepString = lastStep.getString(),\n        suppositionsString = suppositionsStringFromSuppositions(suppositions),\n        subproofString = `[${suppositionsString}] ... ${lastStepString}`;\n\n  return subproofString;\n}\n\nexport function typeStringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {\n  let typeString;\n\n  typeString = (typePrefixName !== null) ?\n                 `${typePrefixName}${typeName}`:\n                   typeName;\n\n  const superTypesString = superTypesStringFromSuperTypes(superTypes);\n\n  if (superTypesString !== null) {\n    typeString = `${typeString}:${superTypesString}`;\n  }\n\n  return typeString;\n}\n\nexport function axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction) {\n  let axiomLemmaTheoremConjectureString;\n\n  const suppositionsString = suppositionsStringFromSuppositions(suppositions),\n        deductionString = deduction.getString(),\n        labelsString = labelsStringFromLabels(labels);\n\n  if (labelsString !== null) {\n    axiomLemmaTheoremConjectureString = (suppositionsString !== null) ?\n                                          `${labelsString} :: [${suppositionsString}] ... ${deductionString}` :\n                                            `${labelsString} :: ${deductionString}`;\n  } else {\n    axiomLemmaTheoremConjectureString = (suppositionsString !== null) ?\n                                         `[${suppositionsString}] ... ${deductionString}` :\n                                            deductionString;\n  }\n\n  return axiomLemmaTheoremConjectureString;\n}\n"],"names":["axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction","equivalenceStringFromTerms","labelsStringFromLabels","signatureStringFromTerms","subproofStringFromSubproof","superTypesStringFromSuperTypes","suppositionsStringFromSuppositions","termsStringFromTerms","typeStringFromTypeNameTypePrefixNameAndSuperTypes","terms","termsString","reduce","term","termString","getString","labels","labelsString","label","labelString","superTypes","superTypesString","superType","baseType","superTypeString","suppositions","suppositionsString","supposition","suppositionString","signatureString","equivalenceString","subproof","lastStep","getLastStep","getSuppositions","lastStepString","subproofString","typeName","typePrefixName","typeString","deduction","axiomLemmaTheoremConjectureString","deductionString"],"mappings":"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"}
179
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/string.js"],"sourcesContent":["\"use strict\";\n\nimport { baseType } from \"../element/type\";\n\nexport function termsStringFromTerms(terms) {\n  const termsString = terms.reduce((termsString, term) => {\n    const termString = term.getString();\n\n    termsString = (termsString !== null) ?\n                   `${termsString}, ${termString}` :\n                      termString;\n\n    return termsString;\n  }, null);\n\n  return termsString;\n}\n\nexport function labelsStringFromLabels(labels) {\n  const labelsString = labels.reduce((labelsString, label) => {\n    const labelString = label.getString();\n\n    labelsString = (labelsString === null) ?\n                     labelString: ///\n                      `${labelsString}, ${labelString}`;\n\n    return labelsString;\n  }, null);\n\n  return labelsString;\n}\n\nexport function premisesStringFromPremises(premises) {\n  const premisesString = premises.reduce((premisesString, premise) => {\n    const premiseString = premise.getString();\n\n    premisesString = (premisesString !== null) ?\n                       `${premisesString}, ${premiseString}` :\n                         premiseString;  ///\n\n    return premisesString;\n  }, null);\n\n  return premisesString;\n}\n\nexport function hypothesesStringFromHypotheses(hypotheses, context) {\n  const hypothesesString = hypotheses.reduce((hypothesesString, hypothesis) => {\n    const hypothesisString = hypothesis.getString();\n\n    hypothesesString = (hypothesesString !== null) ?\n                          `${hypothesesString}, ${hypothesisString}` :\n                            hypothesisString;  ///\n\n    return hypothesesString;\n  }, null);\n\n  return hypothesesString;\n}\n\nexport function superTypesStringFromSuperTypes(superTypes) {\n  const superTypesString = superTypes.reduce((superTypesString, superType) => {\n    if (superType !== baseType) {\n      const superTypeString = superType.getString();\n\n      superTypesString = (superTypesString === null) ?\n                           `'${superTypeString}'` :\n                             `${superTypesString}, '${superTypeString}'`;\n    }\n\n    return superTypesString;\n  }, null);\n\n  return superTypesString;\n}\n\nexport function parametersStringFromParameters(parameters) {\n  const parametersString = parameters.reduce((parametersString, parameter) => {\n    const parameterString = parameter.getString();\n\n    parametersString = (parametersString === null) ?\n                         parameterString : ///\n                          `${parametersString}, ${parameterString}`;\n\n    return parametersString;\n  }, null);\n\n  return parametersString;\n}\n\nexport function assumptionsStringFromAssumptions(assumptions) {\n  const assumptionsString = assumptions.reduce((assumptionsString, assumption) => {\n    const assumptionString = assumption.getString();\n\n    assumptionsString = (assumptionsString === null) ?\n                          assumptionString :\n                            `${assumptionsString}, ${assumptionString}`;\n\n    return assumptionsString;\n  }, null);\n\n  return assumptionsString;\n}\n\nexport function suppositionsStringFromSuppositions(suppositions) {\n  const suppositionsString = suppositions.reduce((suppositionsString, supposition) => {\n    const suppositionString = supposition.getString();\n\n    suppositionsString = (suppositionsString === null) ?\n                           suppositionString: ///\n                            `${suppositionsString}, ${suppositionString}`;\n\n    return suppositionsString;\n  }, null);\n\n  return suppositionsString;\n}\n\nexport function signatureStringFromTerms(terms) {\n  const termsString = termsStringFromTerms(terms),\n        signatureString = `[${termsString}]`;\n\n  return signatureString;\n}\n\nexport function equivalenceStringFromTerms(terms) {\n  const termsString = termsStringFromTerms(terms),\n        equivalenceString = termsString;  ///\n\n  return equivalenceString;\n}\n\nexport function subproofStringFromSubproof(subproof) {\n  const lastStep = subproof.getLastStep(),\n        suppositions = subproof.getSuppositions(),\n        lastStepString = lastStep.getString(),\n        suppositionsString = suppositionsStringFromSuppositions(suppositions),\n        subproofString = `[${suppositionsString}] ... ${lastStepString}`;\n\n  return subproofString;\n}\n\nexport function rulsStringFromLabelsPremisesAndConclusion(labels, premises, conclusion) {\n  const premisesString = premisesStringFromPremises(premises),\n        conclusionString = conclusion.getString(),\n        labelsString = labelsStringFromLabels(labels),\n        ruleString = (premisesString !== null) ?\n                       `${labelsString} :: [${premisesString}] ... ${conclusionString}` :\n                         `${labelsString} :: ${conclusionString}`;\n\n  return ruleString;\n}\n\nexport function typeStringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {\n  let typeString;\n\n  typeString = (typePrefixName !== null) ?\n                 `${typePrefixName}${typeName}`:\n                   typeName;\n\n  const superTypesString = superTypesStringFromSuperTypes(superTypes);\n\n  if (superTypesString !== null) {\n    typeString = `${typeString}:${superTypesString}`;\n  }\n\n  return typeString;\n}\n\nexport function procedureCallStringFromProcedureReferenceAndParameters(procedureReference, parameters) {\n  const procedureReferenceName = procedureReference.getName(),\n        parametersString = parametersStringFromParameters(parameters),\n        procedureCallString = `${procedureReferenceName}(${parametersString})`;\n\n  return procedureCallString;\n}\n\nexport function sectionStringFromHypothesesAxiomLemmaTheoremAndConjecture(hypotheses, axiom, lemma, theorem, conjecture, context) {\n  const axiomLemmaTheoremOrConjecture = (axiom || lemma || theorem || conjecture),\n        axiomLemmaTheoremOrConjectureString = axiomLemmaTheoremOrConjecture.getString(),\n        hypothesesString = hypothesesStringFromHypotheses(hypotheses, context),\n        sectionString = (axiomLemmaTheoremOrConjectureString !== null) ?\n                          `[${hypothesesString}]::: ${axiomLemmaTheoremOrConjectureString}` :\n                            `[${hypothesesString}]::: `;\n\n  return sectionString;\n}\n\nexport function metaLemmaMetatheoremStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction) {\n  const suppositionsString = suppositionsStringFromSuppositions(suppositions),\n        deductionString = deduction.getString(),\n        labelString = label.getString(),\n        metaLemmaMetatheoremString = (suppositionsString !== null) ?\n                                       `${labelString} :: [${suppositionsString}] ... ${deductionString}` :\n                                         `${labelString} :: ${deductionString}`;\n\n  return metaLemmaMetatheoremString;\n}\n\nexport function axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction) {\n  let axiomLemmaTheoremConjectureString;\n\n  const suppositionsString = suppositionsStringFromSuppositions(suppositions),\n        deductionString = deduction.getString(),\n        labelsString = labelsStringFromLabels(labels);\n\n  if (labelsString !== null) {\n    axiomLemmaTheoremConjectureString = (suppositionsString !== null) ?\n                                          `${labelsString} :: [${suppositionsString}] ... ${deductionString}` :\n                                            `${labelsString} :: ${deductionString}`;\n  } else {\n    axiomLemmaTheoremConjectureString = (suppositionsString !== null) ?\n                                         `[${suppositionsString}] ... ${deductionString}` :\n                                            deductionString;\n  }\n\n  return axiomLemmaTheoremConjectureString;\n}\n"],"names":["assumptionsStringFromAssumptions","axiomLemmaTheoremConjectureStringFromLabelsSuppositionsAndDeduction","equivalenceStringFromTerms","hypothesesStringFromHypotheses","labelsStringFromLabels","metaLemmaMetatheoremStringFromLabelSuppositionsAndDeduction","parametersStringFromParameters","premisesStringFromPremises","procedureCallStringFromProcedureReferenceAndParameters","rulsStringFromLabelsPremisesAndConclusion","sectionStringFromHypothesesAxiomLemmaTheoremAndConjecture","signatureStringFromTerms","subproofStringFromSubproof","superTypesStringFromSuperTypes","suppositionsStringFromSuppositions","termsStringFromTerms","typeStringFromTypeNameTypePrefixNameAndSuperTypes","terms","termsString","reduce","term","termString","getString","labels","labelsString","label","labelString","premises","premisesString","premise","premiseString","hypotheses","context","hypothesesString","hypothesis","hypothesisString","superTypes","superTypesString","superType","baseType","superTypeString","parameters","parametersString","parameter","parameterString","assumptions","assumptionsString","assumption","assumptionString","suppositions","suppositionsString","supposition","suppositionString","signatureString","equivalenceString","subproof","lastStep","getLastStep","getSuppositions","lastStepString","subproofString","conclusion","conclusionString","ruleString","typeName","typePrefixName","typeString","procedureReference","procedureReferenceName","getName","procedureCallString","axiom","lemma","theorem","conjecture","axiomLemmaTheoremOrConjecture","axiomLemmaTheoremOrConjectureString","sectionString","deduction","deductionString","metaLemmaMetatheoremString","axiomLemmaTheoremConjectureString"],"mappings":"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"}
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.428",
4
+ "version": "1.0.436",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -25,9 +25,9 @@ import { typesFromJSON,
25
25
  metaLemmasFromNothing,
26
26
  theoremsToTheoremsJSON,
27
27
  variablesToVariablesJSON,
28
- typePrefixesToTypePrefixesJSON,
29
28
  conjecturesToConjecturesJSON,
30
29
  combinatorsToCombinatorsJSON,
30
+ typePrefixesToTypePrefixesJSON,
31
31
  constructorsToConstructorsJSON,
32
32
  metatheoremsToMetatheoremsJSON,
33
33
  metavariablesToMetavariablesJSON } from "../utilities/json";
@@ -1,22 +1,10 @@
1
1
  "use strict";
2
2
 
3
- export default class Assertion {
4
- constructor(context, string, node) {
5
- this.context = context;
6
- this.string = string;
7
- this.node = node;
8
- }
9
-
10
- getContext() {
11
- return this.context;
12
- }
3
+ import Element from "../element";
13
4
 
14
- getString() {
15
- return this.string;
16
- }
17
-
18
- getNode() {
19
- return this.node;
5
+ export default class Assertion extends Element {
6
+ constructor(context, string, node) {
7
+ super(context, string, node);
20
8
  }
21
9
 
22
10
  matchAssertionNode(assertionNode) { return this.node.match(assertionNode); }
@@ -1,27 +1,20 @@
1
1
  "use strict";
2
2
 
3
+ import Element from "../element";
3
4
  import elements from "../elements";
4
5
 
5
6
  import { define } from "../elements";
6
7
  import { unifyStatementIntrinsically } from "../process/unify";
7
8
  import { referenceFromJSON, referenceToReferenceJSON } from "../utilities/json";
8
9
 
9
- export default define(class Assumption {
10
- constructor(string, node, statement, reference) {
11
- this.string = string;
12
- this.node = node;
10
+ export default define(class Assumption extends Element {
11
+ constructor(context, string, node, statement, reference) {
12
+ super(context, string, node);
13
+
13
14
  this.statement = statement;
14
15
  this.reference = reference;
15
16
  }
16
17
 
17
- getString() {
18
- return this.string;
19
- }
20
-
21
- getNode() {
22
- return this.node;
23
- }
24
-
25
18
  getStatement() {
26
19
  return this.statement;
27
20
  }
@@ -2,6 +2,7 @@
2
2
 
3
3
  import { arrayUtilities } from "necessary";
4
4
 
5
+ import Element from "../element";
5
6
  import elements from "../elements";
6
7
  import LocalContext from "../context/local";
7
8
 
@@ -18,11 +19,10 @@ import { labelsFromJSON,
18
19
 
19
20
  const { extract, reverse, correlate, backwardsEvery } = arrayUtilities;
20
21
 
21
- export default class AxiomLemmaTheoremConjecture {
22
+ export default class AxiomLemmaTheoremConjecture extends Element {
22
23
  constructor(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses) {
23
- this.context = context;
24
- this.string = string;
25
- this.node = node;
24
+ super(context, string, node);
25
+
26
26
  this.labels = labels;
27
27
  this.suppositions = suppositions;
28
28
  this.deduction = deduction;
@@ -31,18 +31,6 @@ export default class AxiomLemmaTheoremConjecture {
31
31
  this.hypotheses = hypotheses;
32
32
  }
33
33
 
34
- getContext() {
35
- return this.context;
36
- }
37
-
38
- getNode() {
39
- return this.node;
40
- }
41
-
42
- getString() {
43
- return this.string;
44
- }
45
-
46
34
  getLabels() {
47
35
  return this.labels;
48
36
  }
@@ -1,28 +1,16 @@
1
1
  "use strict";
2
2
 
3
+ import Element from "../element";
3
4
  import TemporaryContext from "../context/temporary";
4
5
 
5
6
  import { define } from "../elements";
6
7
  import { termsFromJSON, framesFromJSON, statementFromJSON, termsToTermsJSON, framesToFramesJSON, statementToStatementJSON } from "../utilities/json";
7
8
 
8
- export default define(class Conclusion {
9
+ export default define(class Conclusion extends Element {
9
10
  constructor(context, string, node, statement) {
10
- this.context = context;
11
- this.string = string;
12
- this.node = node;
13
- this.statement = statement;
14
- }
15
-
16
- getContext() {
17
- return this.context;
18
- }
11
+ super(context, string, node);
19
12
 
20
- getNode() {
21
- return this.node;
22
- }
23
-
24
- getString() {
25
- return this.string;
13
+ this.statement = statement;
26
14
  }
27
15
 
28
16
  getStatement() {
@@ -1,21 +1,9 @@
1
1
  "use strict";
2
2
 
3
- export default class Declaration {
4
- constructor(context, string, node) {
5
- this.context = context;
6
- this.string = string;
7
- this.node = node;
8
- }
9
-
10
- getContext() {
11
- return this.context;
12
- }
3
+ import Element from "../element";
13
4
 
14
- getString() {
15
- return this.string;
16
- }
17
-
18
- getNode() {
19
- return this.node;
5
+ export default class Declaration extends Element {
6
+ constructor(context, string, node) {
7
+ super(context, string, node);
20
8
  }
21
9
  }
@@ -1,30 +1,16 @@
1
1
  "use strict";
2
2
 
3
- import elements from "../elements";
3
+ import Element from "../element";
4
4
  import TemporaryContext from "../context/temporary";
5
5
 
6
6
  import { define } from "../elements";
7
7
  import { termsFromJSON, framesFromJSON, statementFromJSON, termsToTermsJSON, framesToFramesJSON, statementToStatementJSON } from "../utilities/json";
8
8
 
9
- export default define(class Deduction {
10
- constructor(context, string, statement) {
11
- this.context = context;
12
- this.string = string;
13
- this.node = node;
14
- this.string = string;
15
- this.statement = statement;
16
- }
17
-
18
- getContext() {
19
- return this.context;
20
- }
9
+ export default define(class Deduction extends Element {
10
+ constructor(context, string, node, statement) {
11
+ super(context, string, node);
21
12
 
22
- getString() {
23
- return this.string;
24
- }
25
-
26
- getNode() {
27
- return this.node;
13
+ this.statement = statement;
28
14
  }
29
15
 
30
16
  getStatement() {
@@ -2,14 +2,17 @@
2
2
 
3
3
  import { arrayUtilities } from "necessary";
4
4
 
5
+ import Element from "../element";
5
6
  import assignAssignments from "../process/assign";
6
7
 
7
8
  import { define } from "../elements";
8
9
 
9
10
  const { last } = arrayUtilities;
10
11
 
11
- export default define(class Derivation {
12
- constructor(stepsOrSubproofs) {
12
+ export default define(class Derivation extends Element {
13
+ constructor(context, string, node, stepsOrSubproofs) {
14
+ super(context, string, node);
15
+
13
16
  this.stepsOrSubproofs = stepsOrSubproofs;
14
17
  }
15
18
 
@@ -1,32 +1,20 @@
1
1
  "use strict";
2
2
 
3
+ import Element from "../element";
3
4
  import elements from "../elements";
4
5
 
5
6
  import { define } from "../elements";
6
7
  import { equateTerms } from "../process/equate";
7
8
  import { equalityAssignmentFromEquality, variableAssignmentFromVariable } from "../process/assign";
8
9
 
9
- export default define(class Equality {
10
+ export default define(class Equality extends Element {
10
11
  constructor(context, string, node, leftTerm, rightTerm) {
11
- this.context = context;
12
- this.string = string;
13
- this.node = node;
12
+ super(context, string, node);
13
+
14
14
  this.leftTerm = leftTerm;
15
15
  this.rightTerm = rightTerm;
16
16
  }
17
17
 
18
- getContext() {
19
- return this.context;
20
- }
21
-
22
- getString() {
23
- return this.string;
24
- }
25
-
26
- getNode() {
27
- return this.node;
28
- }
29
-
30
18
  getLeftTerm() {
31
19
  return this.leftTerm;
32
20
  }
@@ -2,6 +2,8 @@
2
2
 
3
3
  import { arrayUtilities } from "necessary";
4
4
 
5
+ import Element from "../element";
6
+
5
7
  import { define } from "../elements";
6
8
  import { termsStringFromTerms } from "../utilities/string";
7
9
  import { instantiateEquivalence } from "../process/instantiate";
@@ -10,26 +12,12 @@ import { equalivanceFromEquivalenceNode } from "../utilities/element";
10
12
 
11
13
  const { compress } = arrayUtilities;
12
14
 
13
- export default define(class Equivalence {
15
+ export default define(class Equivalence extends Element {
14
16
  constructor(context, string, node, terms) {
15
- this.context = context;
16
- this.string = string;
17
- this.node = node;
17
+ super(context, string, node);
18
18
  this.terms = terms;
19
19
  }
20
20
 
21
- getContext() {
22
- return this.context;
23
- }
24
-
25
- getString() {
26
- return this.string;
27
- }
28
-
29
- getNode() {
30
- return this.node;
31
- }
32
-
33
21
  getTerms() {
34
22
  return this.terms;
35
23
  }
@@ -2,13 +2,18 @@
2
2
 
3
3
  import { arrayUtilities } from "necessary";
4
4
 
5
+ import Element from "../element";
6
+
5
7
  import { define } from "../elements";
8
+ import { EMPTY_STRING } from "../constants";
6
9
  import { variablesFromTerm } from "./term";
7
10
 
8
11
  const { push, separate } = arrayUtilities;
9
12
 
10
- export default define(class Equivalences {
11
- constructor(array) {
13
+ export default define(class Equivalences extends Element {
14
+ constructor(context, string, node, array) {
15
+ super(context, string, node);
16
+
12
17
  this.array = array;
13
18
  }
14
19
 
@@ -185,9 +190,11 @@ export default define(class Equivalences {
185
190
  return equivalences;
186
191
  }
187
192
 
188
- static fromNothing() {
189
- const array = [],
190
- equivalences = new Equivalences(array);
193
+ static fromNothing(context) {
194
+ const string = EMPTY_STRING,
195
+ node = null,
196
+ array = [],
197
+ equivalences = new Equivalences(context, string, node, array);
191
198
 
192
199
  return equivalences;
193
200
  }
@@ -1,24 +1,12 @@
1
1
  "use strict";
2
2
 
3
+ import Element from "../element";
4
+
3
5
  import { define } from "../elements";
4
6
 
5
- export default define(class Error {
7
+ export default define(class Error extends Element {
6
8
  constructor(context, string, node) {
7
- this.context = context;
8
- this.string = string;
9
- this.node = node;
10
- }
11
-
12
- getContext() {
13
- return this.context;
14
- }
15
-
16
- getString() {
17
- return this.string;
18
- }
19
-
20
- getNode() {
21
- return this.node;
9
+ super(context, string, node);
22
10
  }
23
11
 
24
12
  verify() {
@@ -32,12 +20,4 @@ export default define(class Error {
32
20
  }
33
21
 
34
22
  static name = "Error";
35
-
36
- static fromErrorNode(errorNode, context) {
37
- const node = errorNode, ///
38
- string = context.nodeAsString(node),
39
- error = new Error(context, string, node);
40
-
41
- return error;
42
- }
43
23
  });