occam-verify-cli 1.0.382 → 1.0.385
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 -1
- package/lib/context/file.js +2 -2
- package/lib/context/release.js +2 -2
- package/lib/mixins/statement/verify.js +3 -3
- package/lib/mixins/step/unify.js +4 -4
- package/lib/mixins/term/verify.js +4 -4
- package/lib/ontology/assertion/contained.js +316 -0
- package/lib/ontology/assertion/defined.js +290 -0
- package/lib/ontology/assertion/property.js +271 -0
- package/lib/ontology/assertion/satisfies.js +254 -0
- package/lib/ontology/assertion/subproof.js +186 -0
- package/lib/ontology/assertion/type.js +252 -0
- package/lib/{dom → ontology}/axiom.js +3 -3
- package/lib/{dom → ontology}/combinator/bracketed.js +4 -4
- package/lib/ontology/combinator.js +141 -0
- package/lib/ontology/conclusion.js +172 -0
- package/lib/{dom → ontology}/conjecture.js +3 -3
- package/lib/{dom → ontology}/constructor/bracketed.js +5 -5
- package/lib/ontology/constructor.js +171 -0
- package/lib/ontology/declaration/combinator.js +168 -0
- package/lib/ontology/declaration/complexType.js +346 -0
- package/lib/ontology/declaration/constructor.js +199 -0
- package/lib/ontology/declaration/metavariable.js +209 -0
- package/lib/ontology/declaration/simpleType.js +243 -0
- package/lib/ontology/declaration/typePrefix.js +181 -0
- package/lib/ontology/declaration/variable.js +197 -0
- package/lib/ontology/declaration.js +360 -0
- package/lib/ontology/deduction.js +186 -0
- package/lib/ontology/derivation.js +155 -0
- package/lib/ontology/equality.js +288 -0
- package/lib/{dom → ontology}/error.js +3 -3
- package/lib/ontology/frame.js +362 -0
- package/lib/ontology/hypothesis.js +190 -0
- package/lib/ontology/judgement.js +241 -0
- package/lib/ontology/label.js +199 -0
- package/lib/{dom → ontology}/lemma.js +3 -3
- package/lib/{dom → ontology}/metaLemma.js +3 -3
- package/lib/{dom → ontology}/metaType.js +3 -3
- package/lib/{dom → ontology}/metatheorem.js +3 -3
- package/lib/ontology/metavariable.js +504 -0
- package/lib/{dom → ontology}/parameter.js +3 -3
- package/lib/ontology/premise.js +271 -0
- package/lib/ontology/procedureCall.js +243 -0
- package/lib/{dom → ontology}/procedureReference.js +3 -3
- package/lib/{dom → ontology}/proof.js +4 -4
- package/lib/ontology/property.js +166 -0
- package/lib/ontology/propertyRelation.js +202 -0
- package/lib/ontology/reference.js +293 -0
- package/lib/ontology/rule.js +375 -0
- package/lib/ontology/section.js +255 -0
- package/lib/ontology/signature.js +220 -0
- package/lib/{dom → ontology}/statement.js +3 -3
- package/lib/ontology/step.js +283 -0
- package/lib/ontology/subDerivation.js +147 -0
- package/lib/ontology/subproof.js +266 -0
- package/lib/ontology/substitution/frame.js +216 -0
- package/lib/{dom → ontology}/substitution/reference.js +3 -3
- package/lib/{dom → ontology}/substitution/statement.js +3 -3
- package/lib/ontology/substitution/term.js +230 -0
- package/lib/ontology/substitution.js +207 -0
- package/lib/ontology/supposition.js +283 -0
- package/lib/ontology/term.js +339 -0
- package/lib/{dom → ontology}/theorem.js +3 -3
- package/lib/ontology/topLevelAssertion.js +432 -0
- package/lib/ontology/topLevelMetaAssertion.js +235 -0
- package/lib/ontology/type.js +556 -0
- package/lib/ontology/typePrefix.js +99 -0
- package/lib/ontology/variable.js +331 -0
- package/lib/ontology.js +27 -0
- package/lib/preamble.js +60 -60
- package/lib/prepare.js +25 -0
- package/lib/unifier/intrinsicLevel.js +3 -3
- package/lib/unifier/metaLevel.js +7 -7
- package/lib/unifier/metavariable.js +3 -3
- package/lib/unifier/statementWithCombinator.js +5 -5
- package/lib/unifier/termWithConstructor.js +3 -3
- package/lib/utilities/brackets.js +5 -5
- package/lib/utilities/context.js +12 -12
- package/lib/utilities/fileSystem.js +2 -2
- package/lib/utilities/json.js +30 -30
- package/lib/utilities/node.js +7 -7
- package/lib/utilities/release.js +12 -4
- package/lib/utilities/releaseContext.js +1 -1
- package/lib/utilities/substitutions.js +6 -6
- package/lib/utilities/type.js +2 -2
- package/lib/verifier/combinator.js +4 -4
- package/lib/verifier/constructor.js +3 -3
- package/lib/verifier/topLevel.js +18 -18
- package/package.json +1 -1
- package/src/action/verify.js +2 -0
- package/src/context/file.js +1 -1
- package/src/context/release.js +1 -1
- package/src/mixins/statement/verify.js +2 -2
- package/src/mixins/step/unify.js +3 -3
- package/src/mixins/term/verify.js +3 -3
- package/src/{dom → ontology}/assertion/contained.js +4 -4
- package/src/{dom → ontology}/assertion/defined.js +6 -6
- package/src/{dom → ontology}/assertion/property.js +5 -5
- package/src/{dom → ontology}/assertion/satisfies.js +5 -5
- package/src/{dom → ontology}/assertion/subproof.js +4 -4
- package/src/{dom → ontology}/assertion/type.js +5 -5
- package/src/{dom → ontology}/axiom.js +2 -2
- package/src/{dom → ontology}/combinator/bracketed.js +4 -4
- package/src/{dom → ontology}/combinator.js +4 -4
- package/src/{dom → ontology}/conclusion.js +4 -4
- package/src/{dom → ontology}/conjecture.js +2 -2
- package/src/{dom → ontology}/constructor/bracketed.js +5 -5
- package/src/{dom → ontology}/constructor.js +5 -5
- package/src/{dom → ontology}/declaration/combinator.js +4 -4
- package/src/{dom → ontology}/declaration/complexType.js +4 -4
- package/src/{dom → ontology}/declaration/constructor.js +4 -4
- package/src/{dom → ontology}/declaration/metavariable.js +5 -5
- package/src/{dom → ontology}/declaration/simpleType.js +4 -4
- package/src/{dom → ontology}/declaration/typePrefix.js +4 -4
- package/src/{dom → ontology}/declaration/variable.js +4 -4
- package/src/{dom → ontology}/declaration.js +5 -5
- package/src/{dom → ontology}/deduction.js +4 -4
- package/src/{dom → ontology}/derivation.js +4 -4
- package/src/{dom → ontology}/equality.js +6 -6
- package/src/{dom → ontology}/error.js +2 -2
- package/src/{dom → ontology}/frame.js +6 -6
- package/src/{dom → ontology}/hypothesis.js +5 -6
- package/src/{dom → ontology}/judgement.js +5 -5
- package/src/{dom → ontology}/label.js +4 -4
- package/src/{dom → ontology}/lemma.js +2 -2
- package/src/{dom → ontology}/metaLemma.js +2 -2
- package/src/{dom → ontology}/metaType.js +2 -2
- package/src/{dom → ontology}/metatheorem.js +2 -2
- package/src/{dom → ontology}/metavariable.js +8 -8
- package/src/{dom → ontology}/parameter.js +2 -2
- package/src/{dom → ontology}/premise.js +5 -5
- package/src/{dom → ontology}/procedureCall.js +5 -5
- package/src/{dom → ontology}/procedureReference.js +2 -2
- package/src/{dom → ontology}/proof.js +4 -4
- package/src/{dom → ontology}/property.js +4 -4
- package/src/{dom → ontology}/propertyRelation.js +4 -4
- package/src/{dom → ontology}/reference.js +6 -6
- package/src/{dom → ontology}/rule.js +7 -7
- package/src/{dom → ontology}/section.js +8 -8
- package/src/{dom → ontology}/signature.js +4 -4
- package/src/{dom → ontology}/statement.js +2 -2
- package/src/{dom → ontology}/step.js +4 -4
- package/src/{dom → ontology}/subDerivation.js +4 -4
- package/src/{dom → ontology}/subproof.js +5 -5
- package/src/{dom → ontology}/substitution/frame.js +4 -4
- package/src/{dom → ontology}/substitution/reference.js +2 -2
- package/src/{dom → ontology}/substitution/statement.js +2 -2
- package/src/{dom → ontology}/substitution/term.js +5 -5
- package/src/{dom → ontology}/supposition.js +5 -5
- package/src/{dom → ontology}/term.js +6 -6
- package/src/{dom → ontology}/theorem.js +2 -2
- package/src/{dom → ontology}/topLevelAssertion.js +6 -6
- package/src/{dom → ontology}/topLevelMetaAssertion.js +2 -2
- package/src/{dom → ontology}/type.js +4 -4
- package/src/{dom → ontology}/typePrefix.js +3 -5
- package/src/{dom → ontology}/variable.js +6 -6
- package/src/ontology.js +13 -0
- package/src/preamble.js +59 -59
- package/src/{configure.js → prepare.js} +1 -1
- package/src/unifier/intrinsicLevel.js +2 -2
- package/src/unifier/metaLevel.js +6 -6
- package/src/unifier/metavariable.js +2 -2
- package/src/unifier/statementWithCombinator.js +4 -4
- package/src/unifier/termWithConstructor.js +2 -2
- package/src/utilities/brackets.js +4 -4
- package/src/utilities/context.js +11 -11
- package/src/utilities/fileSystem.js +1 -1
- package/src/utilities/json.js +29 -29
- package/src/utilities/node.js +6 -6
- package/src/utilities/release.js +1 -1
- package/src/utilities/releaseContext.js +3 -3
- package/src/utilities/substitutions.js +5 -5
- package/src/utilities/type.js +1 -1
- package/src/verifier/combinator.js +3 -3
- package/src/verifier/constructor.js +2 -2
- package/src/verifier/topLevel.js +17 -17
- package/verify.js +2 -2
- package/lib/configure.js +0 -25
- package/lib/dom/assertion/contained.js +0 -316
- package/lib/dom/assertion/defined.js +0 -290
- package/lib/dom/assertion/property.js +0 -271
- package/lib/dom/assertion/satisfies.js +0 -254
- package/lib/dom/assertion/subproof.js +0 -186
- package/lib/dom/assertion/type.js +0 -252
- package/lib/dom/combinator.js +0 -141
- package/lib/dom/conclusion.js +0 -172
- package/lib/dom/constructor.js +0 -171
- package/lib/dom/declaration/combinator.js +0 -168
- package/lib/dom/declaration/complexType.js +0 -346
- package/lib/dom/declaration/constructor.js +0 -199
- package/lib/dom/declaration/metavariable.js +0 -209
- package/lib/dom/declaration/simpleType.js +0 -243
- package/lib/dom/declaration/typePrefix.js +0 -181
- package/lib/dom/declaration/variable.js +0 -197
- package/lib/dom/declaration.js +0 -360
- package/lib/dom/deduction.js +0 -186
- package/lib/dom/derivation.js +0 -155
- package/lib/dom/equality.js +0 -288
- package/lib/dom/frame.js +0 -362
- package/lib/dom/hypothesis.js +0 -191
- package/lib/dom/judgement.js +0 -241
- package/lib/dom/label.js +0 -199
- package/lib/dom/metavariable.js +0 -504
- package/lib/dom/premise.js +0 -271
- package/lib/dom/procedureCall.js +0 -243
- package/lib/dom/property.js +0 -166
- package/lib/dom/propertyRelation.js +0 -202
- package/lib/dom/reference.js +0 -293
- package/lib/dom/rule.js +0 -375
- package/lib/dom/section.js +0 -255
- package/lib/dom/signature.js +0 -220
- package/lib/dom/step.js +0 -283
- package/lib/dom/subDerivation.js +0 -147
- package/lib/dom/subproof.js +0 -266
- package/lib/dom/substitution/frame.js +0 -216
- package/lib/dom/substitution/term.js +0 -230
- package/lib/dom/substitution.js +0 -207
- package/lib/dom/supposition.js +0 -283
- package/lib/dom/term.js +0 -339
- package/lib/dom/topLevelAssertion.js +0 -432
- package/lib/dom/topLevelMetaAssertion.js +0 -235
- package/lib/dom/type.js +0 -556
- package/lib/dom/typePrefix.js +0 -100
- package/lib/dom/variable.js +0 -331
- package/lib/dom.js +0 -27
- package/src/dom.js +0 -13
- /package/src/{dom → ontology}/substitution.js +0 -0
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
import { arrayUtilities } from "necessary";
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import ontology from "../ontology";
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { define } from "../ontology";
|
|
8
8
|
import { termsFromJSON, termsToTermsJSON } from "../utilities/json";
|
|
9
9
|
import { stringFromTerms, variableFromTerm, termsFromTermNodes } from "../utilities/node";
|
|
10
10
|
|
|
11
11
|
const { match, compare, correlate } = arrayUtilities;
|
|
12
12
|
|
|
13
|
-
export default
|
|
13
|
+
export default define(class Signature {
|
|
14
14
|
constructor(string, terms) {
|
|
15
15
|
this.string = string;
|
|
16
16
|
this.terms = terms;
|
|
@@ -73,7 +73,7 @@ export default domAssigned(class Signature {
|
|
|
73
73
|
|
|
74
74
|
term = termA; ///
|
|
75
75
|
|
|
76
|
-
const { TermSubstitution } =
|
|
76
|
+
const { TermSubstitution } = ontology,
|
|
77
77
|
termSubstitution = TermSubstitution.fromTernAndVariable(term, variable, context),
|
|
78
78
|
substitution = termSubstitution; ///
|
|
79
79
|
|
|
@@ -5,7 +5,7 @@ import { arrayUtilities } from "necessary";
|
|
|
5
5
|
import verifyMixins from "../mixins/statement/verify";
|
|
6
6
|
import StatementPartialContext from "../context/partial/statement";
|
|
7
7
|
|
|
8
|
-
import {
|
|
8
|
+
import { define } from "../ontology";
|
|
9
9
|
import { unifyStatement } from "../utilities/unification";
|
|
10
10
|
import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
|
|
11
11
|
import { statementFromStatementNode } from "../utilities/node";
|
|
@@ -14,7 +14,7 @@ import { definedAssertionFromStatement, containedAssertionFromStatement, subproo
|
|
|
14
14
|
|
|
15
15
|
const { match, backwardsSome } = arrayUtilities;
|
|
16
16
|
|
|
17
|
-
export default
|
|
17
|
+
export default define(class Statement {
|
|
18
18
|
constructor(string, node, tokens) {
|
|
19
19
|
this.string = string;
|
|
20
20
|
this.node = node;
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import ontology from "../ontology";
|
|
4
4
|
import unifyMixins from "../mixins/step/unify";
|
|
5
5
|
import Substitutions from "../substitutions";
|
|
6
6
|
import equationalUnifier from "../unifier/equantional";
|
|
7
7
|
|
|
8
|
-
import {
|
|
8
|
+
import { define } from "../ontology";
|
|
9
9
|
import { propertyAssertionFromStatement } from "../utilities/context";
|
|
10
10
|
|
|
11
|
-
export default
|
|
11
|
+
export default define(class Step {
|
|
12
12
|
constructor(node, string, statement, reference, satisfiesAssertion) {
|
|
13
13
|
this.node = node;
|
|
14
14
|
this.string = string;
|
|
@@ -207,7 +207,7 @@ export default domAssigned(class Step {
|
|
|
207
207
|
const stepNode = stepOrSubproofNode.isStepNode();
|
|
208
208
|
|
|
209
209
|
if (stepNode) {
|
|
210
|
-
const { Statement, Reference, SatisfiesAssertion } =
|
|
210
|
+
const { Statement, Reference, SatisfiesAssertion } = ontology,
|
|
211
211
|
stepNode = stepOrSubproofNode, ///
|
|
212
212
|
node = stepNode, ///
|
|
213
213
|
string = context.nodeAsString(node),
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
import { arrayUtilities } from "necessary";
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import ontology from "../ontology";
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { define } from "../ontology";
|
|
8
8
|
import { assignAssignments } from "../utilities/assignments";
|
|
9
9
|
|
|
10
10
|
const { last } = arrayUtilities;
|
|
11
11
|
|
|
12
|
-
export default
|
|
12
|
+
export default define(class SubDerivation {
|
|
13
13
|
constructor(stepsOrSubproofs) {
|
|
14
14
|
this.stepsOrSubproofs = stepsOrSubproofs;
|
|
15
15
|
}
|
|
@@ -61,7 +61,7 @@ export default domAssigned(class SubDerivation {
|
|
|
61
61
|
});
|
|
62
62
|
|
|
63
63
|
function stepOrSubproofFromSubDerivationNode(subDerivationNode, context) {
|
|
64
|
-
const { Step, Subproof } =
|
|
64
|
+
const { Step, Subproof } = ontology,
|
|
65
65
|
stepOrSubproofNodes = subDerivationNode.getStepOrSubproofNodes(),
|
|
66
66
|
stepsOrSubproofs = stepOrSubproofNodes.map((stepOrSubproofNode) => {
|
|
67
67
|
const subproof = Subproof.fromStepOrSubproofNode(stepOrSubproofNode, context),
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import ontology from "../ontology";
|
|
4
4
|
import LocalContext from "../context/local";
|
|
5
5
|
import Substitutions from "../substitutions";
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { define } from "../ontology";
|
|
8
8
|
import { subproofStringFromSubproofNode } from "../utilities/subproof";
|
|
9
9
|
|
|
10
|
-
export default
|
|
10
|
+
export default define(class Subproof {
|
|
11
11
|
constructor(node, string, suppositions, subDerivation) {
|
|
12
12
|
this.node = node;
|
|
13
13
|
this.string = string;
|
|
@@ -154,7 +154,7 @@ export default domAssigned(class Subproof {
|
|
|
154
154
|
});
|
|
155
155
|
|
|
156
156
|
function suppositionsFromSubproofNode(subproofNode, context) {
|
|
157
|
-
const { Supposition } =
|
|
157
|
+
const { Supposition } = ontology,
|
|
158
158
|
suppositionNodes = subproofNode.getSuppositionNodes(),
|
|
159
159
|
suppositions = suppositionNodes.map((suppositionNode) => {
|
|
160
160
|
const supposition = Supposition.fromSuppositionNode(suppositionNode, context);
|
|
@@ -166,7 +166,7 @@ function suppositionsFromSubproofNode(subproofNode, context) {
|
|
|
166
166
|
}
|
|
167
167
|
|
|
168
168
|
function subDerivationFromSubproofNode(subproofNode, context) {
|
|
169
|
-
const { SubDerivation } =
|
|
169
|
+
const { SubDerivation } = ontology,
|
|
170
170
|
subDerivationNode = subproofNode.getSubDerivationNode(),
|
|
171
171
|
subDerivation = SubDerivation.fromSubDerivationNode(subDerivationNode, context);
|
|
172
172
|
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import ontology from "../../ontology";
|
|
4
4
|
import Substitution from "../substitution";
|
|
5
5
|
import FrameSubstitutionPartialContext from "../../context/partial/substitution/frame";
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { define } from "../../ontology";
|
|
8
8
|
|
|
9
|
-
export default
|
|
9
|
+
export default define(class FrameSubstitution extends Substitution {
|
|
10
10
|
constructor(string, node, tokens, frame, metavariable) {
|
|
11
11
|
super(string, node, tokens);
|
|
12
12
|
|
|
@@ -46,7 +46,7 @@ export default domAssigned(class FrameSubstitution extends Substitution {
|
|
|
46
46
|
singularMetavariableNode = lastFrameNode.getSingularMetavariableNode();
|
|
47
47
|
|
|
48
48
|
if (singularMetavariableNode !== null) {
|
|
49
|
-
const { Frame, Metavariable } =
|
|
49
|
+
const { Frame, Metavariable } = ontology,
|
|
50
50
|
frameNode = firstFrameNode, ///
|
|
51
51
|
metavariableNode = singularMetavariableNode, ///
|
|
52
52
|
frame = Frame.fromFrameNode(frameNode, context),
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
import Substitution from "../substitution";
|
|
4
4
|
import ReferenceSubstitutionPartialContext from "../../context/partial/substitution/reference";
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { define } from "../../ontology";
|
|
7
7
|
|
|
8
|
-
export default
|
|
8
|
+
export default define(class ReferenceSubstitution extends Substitution {
|
|
9
9
|
constructor(string, node, tokens, reference, metavariable) {
|
|
10
10
|
super(string, node, tokens);
|
|
11
11
|
|
|
@@ -4,12 +4,12 @@ import Substitution from "../substitution";
|
|
|
4
4
|
import Substitutions from "../../substitutions";
|
|
5
5
|
import StatementSubstitutionPartialContext from "../../context/partial/substitution/statement";
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { define } from "../../ontology";
|
|
8
8
|
import { unifySubstitution } from "../../utilities/unification";
|
|
9
9
|
import { stripBracketsFromStatement } from "../../utilities/brackets";
|
|
10
10
|
import { statementFromJSON, statementToStatementJSON, metavariableFromJSON, metavariableToMetavariableJSON } from "../../utilities/json";
|
|
11
11
|
|
|
12
|
-
export default
|
|
12
|
+
export default define(class StatementSubstitution extends Substitution {
|
|
13
13
|
constructor(string, node, tokens, resolved, statement, metavariable, substitution) {
|
|
14
14
|
super(string, node, tokens);
|
|
15
15
|
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import ontology from "../../ontology";
|
|
4
4
|
import Substitution from "../substitution";
|
|
5
5
|
import TermSubstitutionPartialContext from "../../context/partial/substitution/term";
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { define } from "../../ontology";
|
|
8
8
|
import { stripBracketsFromTerm } from "../../utilities/brackets";
|
|
9
9
|
import { stripBracketsFromTermNode } from "../../utilities/brackets";
|
|
10
10
|
|
|
11
|
-
export default
|
|
11
|
+
export default define(class TermSubstitution extends Substitution {
|
|
12
12
|
constructor(string, node, tokens, term, variable) {
|
|
13
13
|
super(string, node, tokens);
|
|
14
14
|
|
|
@@ -62,7 +62,7 @@ export default domAssigned(class TermSubstitution extends Substitution {
|
|
|
62
62
|
singularVariableNode = lastTermNode.getSingularVariableNode(lastTermNode);
|
|
63
63
|
|
|
64
64
|
if (singularVariableNode !== null) {
|
|
65
|
-
const { Term, Variable } =
|
|
65
|
+
const { Term, Variable } = ontology,
|
|
66
66
|
termNode = firstTermNode, ///
|
|
67
67
|
variableNode = singularVariableNode, ///
|
|
68
68
|
term = Term.fromTermNode(termNode, context),
|
|
@@ -83,7 +83,7 @@ export default domAssigned(class TermSubstitution extends Substitution {
|
|
|
83
83
|
|
|
84
84
|
termNode = stripBracketsFromTermNode(termNode); ///
|
|
85
85
|
|
|
86
|
-
const { Term } =
|
|
86
|
+
const { Term } = ontology;
|
|
87
87
|
|
|
88
88
|
term = Term.fromTermNode(termNode, context);
|
|
89
89
|
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import ontology from "../ontology";
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { define } from "../ontology";
|
|
6
6
|
import { assignAssignments } from "../utilities/assignments";
|
|
7
7
|
import { subproofAssertionFromStatement } from "../utilities/context";
|
|
8
8
|
import { statementFromJSON, procedureCallFromJSON, statementToStatementJSON, procedureCallToProcedureCallJSON } from "../utilities/json";
|
|
9
9
|
|
|
10
|
-
export default
|
|
10
|
+
export default define(class Supposition {
|
|
11
11
|
constructor(node, string, statement, procedureCall) {
|
|
12
12
|
this.node = node;
|
|
13
13
|
this.string = string;
|
|
@@ -49,7 +49,7 @@ export default domAssigned(class Supposition {
|
|
|
49
49
|
const assignmentsAssigned = assignAssignments(assignments, context);
|
|
50
50
|
|
|
51
51
|
if (assignmentsAssigned) {
|
|
52
|
-
const { Step } =
|
|
52
|
+
const { Step } = ontology,
|
|
53
53
|
step = Step.fromStatement(this.statement, context),
|
|
54
54
|
stepOrSubproof = step; ///
|
|
55
55
|
|
|
@@ -246,7 +246,7 @@ export default domAssigned(class Supposition {
|
|
|
246
246
|
}
|
|
247
247
|
|
|
248
248
|
static fromSuppositionNode(suppositionNode, context) {
|
|
249
|
-
const { Statement, ProcedureCall } =
|
|
249
|
+
const { Statement, ProcedureCall } = ontology,
|
|
250
250
|
node = suppositionNode, ///
|
|
251
251
|
string = context.nodeAsString(node),
|
|
252
252
|
statement = Statement.fromSuppositionNode(suppositionNode, context),
|
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
|
|
3
3
|
import { arrayUtilities } from "necessary";
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import ontology from "../ontology";
|
|
6
6
|
import verifyMixins from "../mixins/term/verify";
|
|
7
7
|
|
|
8
|
-
import {
|
|
8
|
+
import { define } from "../ontology";
|
|
9
9
|
import { termFromTermNode } from "../utilities/node";
|
|
10
10
|
import { termNodeFromTermString } from "../context/partial/term";
|
|
11
11
|
import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
|
|
12
12
|
|
|
13
13
|
const { filter, compress } = arrayUtilities;
|
|
14
14
|
|
|
15
|
-
export default
|
|
15
|
+
export default define(class Term {
|
|
16
16
|
constructor(string, node, type) {
|
|
17
17
|
this.string = string;
|
|
18
18
|
this.node = node;
|
|
@@ -36,7 +36,7 @@ export default domAssigned(class Term {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
getVariable(context) {
|
|
39
|
-
const { Variable } =
|
|
39
|
+
const { Variable } = ontology,
|
|
40
40
|
termNode = this.node, ///
|
|
41
41
|
variable = Variable.fromTermNode(termNode, context);
|
|
42
42
|
|
|
@@ -47,7 +47,7 @@ export default domAssigned(class Term {
|
|
|
47
47
|
const termNode = this.node,
|
|
48
48
|
variableNodes = termNode.getVariableNodes(),
|
|
49
49
|
variables = variableNodes.map((variableNode) => {
|
|
50
|
-
const { Variable } =
|
|
50
|
+
const { Variable } = ontology,
|
|
51
51
|
variable = Variable.fromVariableNode(variableNode, context);
|
|
52
52
|
|
|
53
53
|
return variable;
|
|
@@ -263,7 +263,7 @@ export default domAssigned(class Term {
|
|
|
263
263
|
}
|
|
264
264
|
|
|
265
265
|
static fromConstructorDeclarationNode(constructorDeclarationNode, context) {
|
|
266
|
-
const { Type } =
|
|
266
|
+
const { Type } = ontology,
|
|
267
267
|
termNode = constructorDeclarationNode.getTermNode(),
|
|
268
268
|
term = termFromTermNode(termNode, context),
|
|
269
269
|
type = Type.fromConstructorDeclarationNode(constructorDeclarationNode, context);
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
import TopLevelAssertion from "./topLevelAssertion";
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { define } from "../ontology";
|
|
6
6
|
|
|
7
|
-
export default
|
|
7
|
+
export default define(class Theorem extends TopLevelAssertion {
|
|
8
8
|
verify() {
|
|
9
9
|
let verifies;
|
|
10
10
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { arrayUtilities } from "necessary";
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import ontology from "../ontology";
|
|
6
6
|
import LocalContext from "../context/local";
|
|
7
7
|
import Substitutions from "../substitutions";
|
|
8
8
|
|
|
@@ -346,14 +346,14 @@ export default class TopLevelAssertion {
|
|
|
346
346
|
}
|
|
347
347
|
|
|
348
348
|
export function proofFromProofNode(proofNode, context) {
|
|
349
|
-
const { Proof } =
|
|
349
|
+
const { Proof } = ontology,
|
|
350
350
|
proof = Proof.fromProofNode(proofNode, context);
|
|
351
351
|
|
|
352
352
|
return proof;
|
|
353
353
|
}
|
|
354
354
|
|
|
355
355
|
export function labelsFromLabelNodes(labelNodes, context) {
|
|
356
|
-
const { Label } =
|
|
356
|
+
const { Label } = ontology,
|
|
357
357
|
labels = labelNodes.map((labelNode) => {
|
|
358
358
|
const label = Label.fromLabelNode(labelNode, context);
|
|
359
359
|
|
|
@@ -367,7 +367,7 @@ export function signatureFromSignatureNode(signatureNode, context) {
|
|
|
367
367
|
let signature = null;
|
|
368
368
|
|
|
369
369
|
if (signatureNode !== null) {
|
|
370
|
-
const { Signature } =
|
|
370
|
+
const { Signature } = ontology;
|
|
371
371
|
|
|
372
372
|
signature = Signature.fromSignatureNode(signatureNode, context);
|
|
373
373
|
}
|
|
@@ -376,14 +376,14 @@ export function signatureFromSignatureNode(signatureNode, context) {
|
|
|
376
376
|
}
|
|
377
377
|
|
|
378
378
|
export function deductionFromDeductionNode(deductionNode, context) {
|
|
379
|
-
const { Deduction } =
|
|
379
|
+
const { Deduction } = ontology,
|
|
380
380
|
deduction = Deduction.fromDeductionNode(deductionNode, context);
|
|
381
381
|
|
|
382
382
|
return deduction;
|
|
383
383
|
}
|
|
384
384
|
|
|
385
385
|
export function suppositionsFromSuppositionNodes(suppositionNodes, context) {
|
|
386
|
-
const { Supposition } =
|
|
386
|
+
const { Supposition } = ontology,
|
|
387
387
|
suppositions = suppositionNodes.map((suppositionNode) => {
|
|
388
388
|
const supposition = Supposition.fromSuppositionNode(suppositionNode, context);
|
|
389
389
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import ontology from "../ontology";
|
|
4
4
|
import LocalContext from "../context/local";
|
|
5
5
|
import Substitutions from "../substitutions";
|
|
6
6
|
|
|
@@ -189,7 +189,7 @@ export default class TopLevelMetaAssertion {
|
|
|
189
189
|
function labelFromLabelNode(labelNode, context) {
|
|
190
190
|
let label = null;
|
|
191
191
|
|
|
192
|
-
const { Label } =
|
|
192
|
+
const { Label } = ontology;
|
|
193
193
|
|
|
194
194
|
if (labelNode !== null) {
|
|
195
195
|
label = Label.fromLabelNode(labelNode, context);
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
import { arrayUtilities } from "necessary";
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import ontology from "../ontology";
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { define } from "../ontology";
|
|
8
8
|
import { BASE_TYPE_SYMBOL } from "../constants";
|
|
9
9
|
import { typeFromTypeNode } from "../utilities/node";
|
|
10
10
|
import { stringFromTypeNameTypePrefixNameAndSuperTypes } from "../utilities/type";
|
|
@@ -405,7 +405,7 @@ class Type {
|
|
|
405
405
|
}
|
|
406
406
|
}
|
|
407
407
|
|
|
408
|
-
export default
|
|
408
|
+
export default define(Type);
|
|
409
409
|
|
|
410
410
|
function superTypesFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context) {
|
|
411
411
|
const superTypeNodes = simpleTypeDeclarationNode.getSuperTypeNodes(),
|
|
@@ -444,7 +444,7 @@ function superTypesFromComplexTypeDeclarationNode(complexTypeDeclarationNode, co
|
|
|
444
444
|
}
|
|
445
445
|
|
|
446
446
|
function propertiesFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context) {
|
|
447
|
-
const { Property } =
|
|
447
|
+
const { Property } = ontology,
|
|
448
448
|
propertyDeclarationNodes = complexTypeDeclarationNode.getPropertyDeclarationNodes(),
|
|
449
449
|
properties = propertyDeclarationNodes.map((propertyDeclarationNode) => {
|
|
450
450
|
const property = Property.fromPropertyDeclarationNode(propertyDeclarationNode, context);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { define } from "../ontology";
|
|
4
4
|
|
|
5
|
-
class TypePrefix {
|
|
5
|
+
export default define (class TypePrefix {
|
|
6
6
|
constructor(string, name) {
|
|
7
7
|
this.string = string;
|
|
8
8
|
this.name = name;
|
|
@@ -49,6 +49,4 @@ class TypePrefix {
|
|
|
49
49
|
|
|
50
50
|
return type;
|
|
51
51
|
}
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
export default domAssigned(TypePrefix);
|
|
52
|
+
});
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import ontology from "../ontology";
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { define } from "../ontology";
|
|
6
6
|
import { EMPTY_STRING } from "../constants";
|
|
7
7
|
import { typeFromTypeNode } from "../utilities/node";
|
|
8
8
|
import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
|
|
9
9
|
import { variableNodeFromVariableString } from "../context/partial/variable";
|
|
10
10
|
|
|
11
|
-
export default
|
|
11
|
+
export default define(class Variable {
|
|
12
12
|
constructor(string, node, type, identifier, propertyRelations) {
|
|
13
13
|
this.string = string;
|
|
14
14
|
this.node = node;
|
|
@@ -134,7 +134,7 @@ export default domAssigned(class Variable {
|
|
|
134
134
|
termUnifies = true;
|
|
135
135
|
}
|
|
136
136
|
} else {
|
|
137
|
-
const { TermSubstitution } =
|
|
137
|
+
const { TermSubstitution } = ontology,
|
|
138
138
|
context = specificContext, ///
|
|
139
139
|
variable = this, ///
|
|
140
140
|
termSubstitution = TermSubstitution.fromTernAndVariable(term, variable, context),
|
|
@@ -214,7 +214,7 @@ export default domAssigned(class Variable {
|
|
|
214
214
|
}
|
|
215
215
|
|
|
216
216
|
static fromVariableDeclarationNode(variableDeclarationNode, context) {
|
|
217
|
-
const { Variable } =
|
|
217
|
+
const { Variable } = ontology,
|
|
218
218
|
provisional = variableDeclarationNode.isProvisional(),
|
|
219
219
|
typeNode = variableDeclarationNode.getTypeNode(),
|
|
220
220
|
type = typeFromTypeNode(typeNode, context);
|
|
@@ -255,7 +255,7 @@ export default domAssigned(class Variable {
|
|
|
255
255
|
});
|
|
256
256
|
|
|
257
257
|
function variableFromVariableNodeAndType(variableNode, type) {
|
|
258
|
-
const { Variable } =
|
|
258
|
+
const { Variable } = ontology,
|
|
259
259
|
node = variableNode, ///
|
|
260
260
|
variableIdentifier = variableNode.getVariableIdentifier(),
|
|
261
261
|
string = variableIdentifier, ///,
|
package/src/ontology.js
ADDED
package/src/preamble.js
CHANGED
|
@@ -1,61 +1,61 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import Type from "./
|
|
4
|
-
import Term from "./
|
|
5
|
-
import Rule from "./
|
|
6
|
-
import Step from "./
|
|
7
|
-
import Label from "./
|
|
8
|
-
import Axiom from "./
|
|
9
|
-
import Lemma from "./
|
|
10
|
-
import Frame from "./
|
|
11
|
-
import Proof from "./
|
|
12
|
-
import Error from "./
|
|
13
|
-
import Premise from "./
|
|
14
|
-
import Theorem from "./
|
|
15
|
-
import Section from "./
|
|
16
|
-
import Equality from "./
|
|
17
|
-
import MetaType from "./
|
|
18
|
-
import Subproof from "./
|
|
19
|
-
import Variable from "./
|
|
20
|
-
import Property from "./
|
|
21
|
-
import Parameter from "./
|
|
22
|
-
import Reference from "./
|
|
23
|
-
import Statement from "./
|
|
24
|
-
import Judgement from "./
|
|
25
|
-
import MetaLemma from "./
|
|
26
|
-
import Deduction from "./
|
|
27
|
-
import Signature from "./
|
|
28
|
-
import TypePrefix from "./
|
|
29
|
-
import Conjecture from "./
|
|
30
|
-
import Conclusion from "./
|
|
31
|
-
import Derivation from "./
|
|
32
|
-
import Combinator from "./
|
|
33
|
-
import Hypothesis from "./
|
|
34
|
-
import Constructor from "./
|
|
35
|
-
import Declaration from "./
|
|
36
|
-
import Supposition from "./
|
|
37
|
-
import Metatheorem from "./
|
|
38
|
-
import Metavariable from "./
|
|
39
|
-
import ProcedureCall from "./
|
|
40
|
-
import SubDerivation from "./
|
|
41
|
-
import TypeAssertion from "./
|
|
42
|
-
import DefinedAssertion from "./
|
|
43
|
-
import PropertyRelation from "./
|
|
44
|
-
import TermSubstitution from "./
|
|
45
|
-
import FrameSubstitution from "./
|
|
46
|
-
import SubproofAssertion from "./
|
|
47
|
-
import PropertyAssertion from "./
|
|
48
|
-
import ContainedAssertion from "./
|
|
49
|
-
import SatisfiesAssertion from "./
|
|
50
|
-
import ProcedureReference from "./
|
|
51
|
-
import VariableDeclaration from "./
|
|
52
|
-
import BracketedCombinator from "./
|
|
53
|
-
import BracketedConstructor from "./
|
|
54
|
-
import SimpleTypeDeclaration from "./
|
|
55
|
-
import StatementSubstitution from "./
|
|
56
|
-
import ReferenceSubstitution from "./
|
|
57
|
-
import CombinatorDeclaration from "./
|
|
58
|
-
import TypePrefixDeclaration from "./
|
|
59
|
-
import ConstructorDeclaration from "./
|
|
60
|
-
import ComplexTypeDeclaration from "./
|
|
61
|
-
import MetavariableDeclaration from "./
|
|
3
|
+
import Type from "./ontology/type";
|
|
4
|
+
import Term from "./ontology/term";
|
|
5
|
+
import Rule from "./ontology/rule";
|
|
6
|
+
import Step from "./ontology/step";
|
|
7
|
+
import Label from "./ontology/label";
|
|
8
|
+
import Axiom from "./ontology/axiom";
|
|
9
|
+
import Lemma from "./ontology/lemma";
|
|
10
|
+
import Frame from "./ontology/frame";
|
|
11
|
+
import Proof from "./ontology/proof";
|
|
12
|
+
import Error from "./ontology/error";
|
|
13
|
+
import Premise from "./ontology/premise";
|
|
14
|
+
import Theorem from "./ontology/theorem";
|
|
15
|
+
import Section from "./ontology/section";
|
|
16
|
+
import Equality from "./ontology/equality";
|
|
17
|
+
import MetaType from "./ontology/metaType";
|
|
18
|
+
import Subproof from "./ontology/subproof";
|
|
19
|
+
import Variable from "./ontology/variable";
|
|
20
|
+
import Property from "./ontology/property";
|
|
21
|
+
import Parameter from "./ontology/parameter";
|
|
22
|
+
import Reference from "./ontology/reference";
|
|
23
|
+
import Statement from "./ontology/statement";
|
|
24
|
+
import Judgement from "./ontology/judgement";
|
|
25
|
+
import MetaLemma from "./ontology/metaLemma";
|
|
26
|
+
import Deduction from "./ontology/deduction";
|
|
27
|
+
import Signature from "./ontology/signature";
|
|
28
|
+
import TypePrefix from "./ontology/typePrefix";
|
|
29
|
+
import Conjecture from "./ontology/conjecture";
|
|
30
|
+
import Conclusion from "./ontology/conclusion";
|
|
31
|
+
import Derivation from "./ontology/derivation";
|
|
32
|
+
import Combinator from "./ontology/combinator";
|
|
33
|
+
import Hypothesis from "./ontology/hypothesis";
|
|
34
|
+
import Constructor from "./ontology/constructor";
|
|
35
|
+
import Declaration from "./ontology/declaration";
|
|
36
|
+
import Supposition from "./ontology/supposition";
|
|
37
|
+
import Metatheorem from "./ontology/metatheorem";
|
|
38
|
+
import Metavariable from "./ontology/metavariable";
|
|
39
|
+
import ProcedureCall from "./ontology/procedureCall";
|
|
40
|
+
import SubDerivation from "./ontology/subDerivation";
|
|
41
|
+
import TypeAssertion from "./ontology/assertion/type";
|
|
42
|
+
import DefinedAssertion from "./ontology/assertion/defined";
|
|
43
|
+
import PropertyRelation from "./ontology/propertyRelation";
|
|
44
|
+
import TermSubstitution from "./ontology/substitution/term";
|
|
45
|
+
import FrameSubstitution from "./ontology/substitution/frame";
|
|
46
|
+
import SubproofAssertion from "./ontology/assertion/subproof";
|
|
47
|
+
import PropertyAssertion from "./ontology/assertion/property";
|
|
48
|
+
import ContainedAssertion from "./ontology/assertion/contained";
|
|
49
|
+
import SatisfiesAssertion from "./ontology/assertion/satisfies";
|
|
50
|
+
import ProcedureReference from "./ontology/procedureReference";
|
|
51
|
+
import VariableDeclaration from "./ontology/declaration/variable";
|
|
52
|
+
import BracketedCombinator from "./ontology/combinator/bracketed";
|
|
53
|
+
import BracketedConstructor from "./ontology/constructor/bracketed";
|
|
54
|
+
import SimpleTypeDeclaration from "./ontology/declaration/simpleType";
|
|
55
|
+
import StatementSubstitution from "./ontology/substitution/statement";
|
|
56
|
+
import ReferenceSubstitution from "./ontology/substitution/reference";
|
|
57
|
+
import CombinatorDeclaration from "./ontology/declaration/combinator";
|
|
58
|
+
import TypePrefixDeclaration from "./ontology/declaration/typePrefix";
|
|
59
|
+
import ConstructorDeclaration from "./ontology/declaration/constructor";
|
|
60
|
+
import ComplexTypeDeclaration from "./ontology/declaration/complexType";
|
|
61
|
+
import MetavariableDeclaration from "./ontology/declaration/metavariable";
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { DEFAULT_HELP, DEFAULT_VERSION } from "./defaults";
|
|
4
4
|
import { HELP_COMMAND, VERSION_COMMAND } from "./commands";
|
|
5
5
|
|
|
6
|
-
export default function
|
|
6
|
+
export default function prepare(command, argument, options, main) {
|
|
7
7
|
const { help = DEFAULT_HELP, version = DEFAULT_VERSION } = options;
|
|
8
8
|
|
|
9
9
|
if (false) {
|