occam-verify-cli 0.0.1050 → 0.0.1052

package/src/mixins/term/unify.js

@@ -20,15 +20,14 @@ function unifyTermWithBracketedConstructor(term, localContext, verifyAhead) {
   termUnifiedWithBracketedConstructor = unifyTermWithConstructor(term, bracketedConstructor, localContext, () => {
     let verifiedAhead = false;
 
-    const bracketedTerm = term, ///
+    const { Term } = shim,
+          bracketedTerm = term, ///
           bracketedTermNode = bracketedTerm.getNode(),
           termNode = termNodeQuery(bracketedTermNode); ///
 
-    if (termNode !== null) {
-      const { Term } = shim;
-
-      term = Term.fromTermNode(termNode, localContext);
+    term = Term.fromTermNode(termNode, localContext);
 
+    if (term !== null) {
       const termVVerified = term.verify(localContext, () => {
         let verifiedAhead;
 

package/src/mixins/term/verify.js

@@ -10,15 +10,15 @@ function verifyTermAsVariable(term, localContext, verifyAhead) {
   let termVerifiedAsVariable = false;
 
   const termNode = term.getNode(),
-        variableNode = variableNodeQuery(termNode);
+        variableNode = variableNodeQuery(termNode),
+        variable = Variable.fromVariableNode(variableNode, localContext);
 
-  if (variableNode !== null) {
+  if (variable !== null) {
     const termString = localContext.nodeAsString(termNode);
 
     localContext.trace(`Verifying the '${termString}' term as a variable...`, termNode);
 
-    const variable = Variable.fromVariableNode(variableNode, localContext),
-          variableVerified = variable.verify(localContext);
+    const variableVerified = variable.verify(localContext);
 
     if (variableVerified) {
       let verifiedAhead;

package/src/premise.js

@@ -40,7 +40,8 @@ export default class Premise {
     localContext.trace(`Unifying the '${subproofString}' subproof with the premise's '${premiseStatementString}' statement...`);
 
     const statement = this.unqualifiedStatement.getStatement(),
-          subproofAssertion = SubproofAssertion.fromStatement(statement, this.fileContext);
+          statementNode = statement.getNode(),
+          subproofAssertion = SubproofAssertion.fromStatementNode(statementNode, this.fileContext);
 
     if (subproofAssertion !== null) {
       subproofUnified = subproofAssertion.unifySubproof(subproof, substitutions, this.fileContext, localContext);

package/src/proofStep.js

@@ -90,23 +90,11 @@ class ProofStep {
   static fromProofStepNode(proofStepNode, fileContext) {
     const subproofNode = subproofNodeQuery(proofStepNode),
           qualifiedStatementNode = qualifiedStatementNodeQuery(proofStepNode),
-          unqualifiedStatementNode = unqualifiedStatementNodeQuery(proofStepNode);
-
-    let subproof = null,
-        qualifiedStatement = null,
-        unqualifiedStatement = null;
-
-    if (false) {
-      ///
-    } else if (subproofNode !== null) {
-      subproof = Subproof.fromSubproofNode(subproofNode, fileContext);
-    } else if (qualifiedStatementNode !== null) {
-      qualifiedStatement = QualifiedStatement.fromQualifiedStatementNode(qualifiedStatementNode, fileContext);
-    } else if (unqualifiedStatementNode !== null) {
-      unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext);
-    }
-
-    const proofStep = new ProofStep(subproof, qualifiedStatement, unqualifiedStatement);
+          unqualifiedStatementNode = unqualifiedStatementNodeQuery(proofStepNode),
+          subproof = Subproof.fromSubproofNode(subproofNode, fileContext),
+          qualifiedStatement = QualifiedStatement.fromQualifiedStatementNode(qualifiedStatementNode, fileContext),
+          unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),
+          proofStep = new ProofStep(subproof, qualifiedStatement, unqualifiedStatement);
 
     return proofStep;
   }

package/src/statement/qualified.js

@@ -87,21 +87,25 @@ export default class QualifiedStatement {
   }
 
   static fromQualifiedStatementNode(qualifiedStatementNode, fileContext) {
-    let string;
+    let qualifiedStatement = null;
 
-    const { Statement } = shim,
-          statementNode = statementNodeQuery(qualifiedStatementNode),
-          referenceNode = referenceNodeQuery(qualifiedStatementNode),
-          localContext = LocalContext.fromFileContext(fileContext),
-          statement = Statement.fromStatementNode(statementNode, localContext),
-          reference = Reference.fromReferenceNode(referenceNode, fileContext),
-          node = qualifiedStatementNode;  ///
+    if (qualifiedStatementNode !== null) {
+      let string;
 
-    string = fileContext.nodeAsString(node);
+      const { Statement } = shim,
+            statementNode = statementNodeQuery(qualifiedStatementNode),
+            referenceNode = referenceNodeQuery(qualifiedStatementNode),
+            localContext = LocalContext.fromFileContext(fileContext),
+            statement = Statement.fromStatementNode(statementNode, localContext),
+            reference = Reference.fromReferenceNode(referenceNode, fileContext),
+            node = qualifiedStatementNode;  ///
 
-    string = trim(string);  ///
+      string = fileContext.nodeAsString(node);
 
-    const qualifiedStatement = new QualifiedStatement(string, statement, reference);
+      string = trim(string);  ///
+
+      qualifiedStatement = new QualifiedStatement(string, statement, reference);
+    }
 
     return qualifiedStatement;
   }

package/src/statement/unqualified.js

@@ -73,19 +73,23 @@ export default class UnqualifiedStatement {
   }
 
   static fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext) {
-    let string;
+    let unqualifiedStatement = null;
 
-    const { Statement } = shim,
-          statementNode = statementNodeQuery(unqualifiedStatementNode),
-          localContext = LocalContext.fromFileContext(fileContext),
-          statement = Statement.fromStatementNode(statementNode, localContext),
-          node = unqualifiedStatementNode;  ///
+    if (unqualifiedStatementNode !== null) {
+      let string;
 
-    string = fileContext.nodeAsString(node);
+      const { Statement } = shim,
+            statementNode = statementNodeQuery(unqualifiedStatementNode),
+            localContext = LocalContext.fromFileContext(fileContext),
+            statement = Statement.fromStatementNode(statementNode, localContext),
+            node = unqualifiedStatementNode;  ///
 
-    string = trim(string);  ///
+      string = fileContext.nodeAsString(node);
 
-    const unqualifiedStatement = new UnqualifiedStatement(string, statement);
+      string = trim(string);  ///
+
+      unqualifiedStatement = new UnqualifiedStatement(string, statement);
+    }
 
     return unqualifiedStatement;
   }

package/src/statement.js

@@ -153,9 +153,9 @@ class Statement {
 
     if (statementNode !== null) {
       const node = statementNode, ///
-          string = localContext.nodeAsString(node),
-          statementSubstitution = StatementSubstitution.fromStatementNode(statementNode, localContext),
-          substitution = statementSubstitution; ///
+            string = localContext.nodeAsString(node),
+            statementSubstitution = StatementSubstitution.fromStatementNode(statementNode, localContext),
+            substitution = statementSubstitution; ///
 
       statement = new Statement(string, node, substitution);
     }

package/src/subproof.js

@@ -77,17 +77,22 @@ export default class Subproof {
   }
 
   static fromSubproofNode(subproofNode, fileContext) {
-    const subproofString = subproofStringFromSubproofNode(subproofNode, fileContext),
-          suppositionNodes = suppositionNodesQuery(subproofNode),
-          subDerivationNode = subDerivationNodeQuery(subproofNode),
-          string = subproofString,  ///
-          suppositions = suppositionNodes.map((suppositionNode) => {
-            const supposition = Supposition.fromSuppositionNode(suppositionNode, fileContext);
-
-            return supposition;
-          }),
-          subDerivation = SubDerivation.fromSubDerivationNode(subDerivationNode, fileContext),
-          subproof = new Subproof(string, suppositions, subDerivation);
+    let subproof = null;
+
+    if (subproofNode !== null) {
+      const subproofString = subproofStringFromSubproofNode(subproofNode, fileContext),
+            suppositionNodes = suppositionNodesQuery(subproofNode),
+            subDerivationNode = subDerivationNodeQuery(subproofNode),
+            string = subproofString,  ///
+            suppositions = suppositionNodes.map((suppositionNode) => {
+              const supposition = Supposition.fromSuppositionNode(suppositionNode, fileContext);
+
+              return supposition;
+            }),
+            subDerivation = SubDerivation.fromSubDerivationNode(subDerivationNode, fileContext);
+
+      subproof = new Subproof(string, suppositions, subDerivation);
+    }
 
     return subproof;
   }

package/src/supposition.js

@@ -71,7 +71,8 @@ export default class Supposition {
     localContext.trace(`Unifying the '${subproofString}' subproof with the supposition's '${suppositionStatementString}' statement...`);
 
     const statement = this.unqualifiedStatement.getStatement(),
-          subproofAssertion = SubproofAssertion.fromStatement(statement, this.fileContext);
+          statementNode = statement.getNode(),
+          subproofAssertion = SubproofAssertion.fromStatementNode(statementNode, this.fileContext);
 
     if (subproofAssertion !== null) {
       subproofUnified = subproofAssertion.unifySubproof(subproof, substitutions, this.fileContext, localContext);

package/src/term.js

@@ -240,10 +240,15 @@ class Term {
   }
 
   static fromTermNode(termNode, localContext) {
-    const node = termNode,  ///
-          string = localContext.nodeAsString(node),
-          type = null,
-          term = new Term(string, node, type);
+    let term = null;
+
+    if (termNode !== null) {
+      const node = termNode,  ///
+            string = localContext.nodeAsString(node),
+            type = null;
+
+      term = new Term(string, node, type);
+    }
 
     return term;
   }

package/src/verifier/topLevel.js

@@ -5,6 +5,7 @@ import Error from "../error";
 import Axiom from "../axiom";
 import Lemma from "../lemma";
 import Theorem from "../theorem";
+import Conjecture from "../conjecture";
 import TypeDeclaration from "../declaration/type";
 import VariableDeclaration from "../declaration/variable";
 import CombinatorDeclaration from "../declaration/combinator";
@@ -13,7 +14,6 @@ import MetavariableDeclaration from "../declaration/metavariable";
 
 import Verifier from "../verifier";
 import verifyMetaLemma from "../verify/metaLemma";
-import verifyConjecture from "../verify/conjecture";
 import verifyMetatheorem from "../verify/metatheorem";
 
 import { nodeQuery } from "../utilities/query";
@@ -101,7 +101,8 @@ class TopLevelVerifier extends Verifier {
     {
       nodeQuery: conjectureNodeQuery,
       verify: (conjectureNode, fileContext) => {
-        const conjectureVerified = verifyConjecture(conjectureNode, fileContext);
+        const conjecture = Conjecture.fromConjectureNode(conjectureNode, fileContext),
+              conjectureVerified = conjecture.verify();
 
         return conjectureVerified;
       }

package/lib/verify/conjecture.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifyConjecture;
-    }
-});
-var _conjecture = /*#__PURE__*/ _interop_require_default(require("../conjecture"));
-var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
-var _substitutions = /*#__PURE__*/ _interop_require_default(require("../substitutions"));
-var _array = require("../utilities/array");
-var _query = require("../utilities/query");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var proofNodeQuery = (0, _query.nodeQuery)("/conjecture/proof!"), labelNodesQuery = (0, _query.nodesQuery)("/conjecture/label!"), consequentNodeQuery = (0, _query.nodeQuery)("/conjecture/consequent!"), suppositionsNodeQuery = (0, _query.nodesQuery)("/conjecture/supposition");
-function verifyConjecture(conjectureNode, fileContext) {
-    var conjectureVerified = false;
-    var labelNodes = labelNodesQuery(conjectureNode), labelsString = fileContext.nodesAsString(labelNodes);
-    fileContext.trace("Verifying the '".concat(labelsString, "' conjecture..."), conjectureNode);
-    var labels = [], labelsVerified = verifyLabels(labelNodes, labels, fileContext);
-    if (labelsVerified) {
-        var localContext = _local.default.fromFileContext(fileContext), suppositions = [], suppositionNodes = suppositionsNodeQuery(conjectureNode), suppositionsVerified = verifySuppositions(suppositionNodes, suppositions, localContext);
-        if (suppositionsVerified) {
-            var consequents = [], consequentNode = consequentNodeQuery(conjectureNode), consequentVerified = verifyConsequent(consequentNode, consequents, localContext);
-            if (consequentVerified) {
-                var proofNode = proofNodeQuery(conjectureNode), firstConsequent = (0, _array.first)(consequents), consequent = firstConsequent; ///
-                if (proofNode !== null) {
-                    var substitutions = _substitutions.default.fromNothing();
-                    verifyProof(proofNode, consequent, substitutions, localContext);
-                }
-                var substitutions1 = _substitutions.default.fromNothing(), conjecture = _conjecture.default.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions1, fileContext);
-                fileContext.addConjecture(conjecture);
-                conjectureVerified = true;
-            }
-        }
-    }
-    if (conjectureVerified) {
-        fileContext.debug("...verified the '".concat(labelsString, "' conjecture."), conjectureNode);
-    }
-    return conjectureVerified;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvY29uamVjdHVyZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IENvbmplY3R1cmUgZnJvbSBcIi4uL2NvbmplY3R1cmVcIjtcbi8vIGltcG9ydCB2ZXJpZnlQcm9vZiBmcm9tIFwiLi4vdmVyaWZ5L3Byb29mXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsXCI7XG5pbXBvcnQgU3Vic3RpdHV0aW9ucyBmcm9tIFwiLi4vc3Vic3RpdHV0aW9uc1wiO1xuLy8gaW1wb3J0IHZlcmlmeUNvbnNlcXVlbnQgZnJvbSBcIi4uL3ZlcmlmeS9jb25zZXF1ZW50XCI7XG4vLyBpbXBvcnQgdmVyaWZ5U3VwcG9zaXRpb25zIGZyb20gXCIuLi92ZXJpZnkvc3VwcG9zaXRpb25zXCI7XG5cbmltcG9ydCB7IGZpcnN0IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hcnJheVwiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBwcm9vZk5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9jb25qZWN0dXJlL3Byb29mIVwiKSxcbiAgICAgIGxhYmVsTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvY29uamVjdHVyZS9sYWJlbCFcIiksXG4gICAgICBjb25zZXF1ZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2NvbmplY3R1cmUvY29uc2VxdWVudCFcIiksXG4gICAgICBzdXBwb3NpdGlvbnNOb2RlUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL2NvbmplY3R1cmUvc3VwcG9zaXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeUNvbmplY3R1cmUoY29uamVjdHVyZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCBjb25qZWN0dXJlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBsYWJlbE5vZGVzID0gbGFiZWxOb2Rlc1F1ZXJ5KGNvbmplY3R1cmVOb2RlKSxcbiAgICAgICAgbGFiZWxzU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZXNBc1N0cmluZyhsYWJlbE5vZGVzKTtcblxuICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHtsYWJlbHNTdHJpbmd9JyBjb25qZWN0dXJlLi4uYCwgY29uamVjdHVyZU5vZGUpO1xuXG4gIGNvbnN0IGxhYmVscyA9IFtdLFxuICAgICAgICBsYWJlbHNWZXJpZmllZCA9IHZlcmlmeUxhYmVscyhsYWJlbE5vZGVzLCBsYWJlbHMsIGZpbGVDb250ZXh0KTtcblxuICBpZiAobGFiZWxzVmVyaWZpZWQpIHtcbiAgICBjb25zdCBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgICBzdXBwb3NpdGlvbnMgPSBbXSxcbiAgICAgICAgICBzdXBwb3NpdGlvbk5vZGVzID0gc3VwcG9zaXRpb25zTm9kZVF1ZXJ5KGNvbmplY3R1cmVOb2RlKSxcbiAgICAgICAgICBzdXBwb3NpdGlvbnNWZXJpZmllZCA9IHZlcmlmeVN1cHBvc2l0aW9ucyhzdXBwb3NpdGlvbk5vZGVzLCBzdXBwb3NpdGlvbnMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICBpZiAoc3VwcG9zaXRpb25zVmVyaWZpZWQpIHtcbiAgICAgIGNvbnN0IGNvbnNlcXVlbnRzID0gW10sXG4gICAgICAgICAgICBjb25zZXF1ZW50Tm9kZSA9IGNvbnNlcXVlbnROb2RlUXVlcnkoY29uamVjdHVyZU5vZGUpLFxuICAgICAgICAgICAgY29uc2VxdWVudFZlcmlmaWVkID0gdmVyaWZ5Q29uc2VxdWVudChjb25zZXF1ZW50Tm9kZSwgY29uc2VxdWVudHMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICAgIGlmIChjb25zZXF1ZW50VmVyaWZpZWQpIHtcbiAgICAgICAgY29uc3QgcHJvb2ZOb2RlID0gcHJvb2ZOb2RlUXVlcnkoY29uamVjdHVyZU5vZGUpLFxuICAgICAgICAgICAgICBmaXJzdENvbnNlcXVlbnQgPSBmaXJzdChjb25zZXF1ZW50cyksXG4gICAgICAgICAgICAgIGNvbnNlcXVlbnQgPSBmaXJzdENvbnNlcXVlbnQ7IC8vL1xuXG4gICAgICAgIGlmIChwcm9vZk5vZGUgIT09IG51bGwpIHtcbiAgICAgICAgICBjb25zdCBzdWJzdGl0dXRpb25zID0gU3Vic3RpdHV0aW9ucy5mcm9tTm90aGluZygpO1xuXG4gICAgICAgICAgdmVyaWZ5UHJvb2YocHJvb2ZOb2RlLCBjb25zZXF1ZW50LCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHQpO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3Qgc3Vic3RpdHV0aW9ucyA9IFN1YnN0aXR1dGlvbnMuZnJvbU5vdGhpbmcoKSxcbiAgICAgICAgICAgICAgY29uamVjdHVyZSA9IENvbmplY3R1cmUuZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbnRTdWJzdGl0dXRpb25zQW5kRmlsZUNvbnRleHQobGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbnQsIHN1YnN0aXR1dGlvbnMsIGZpbGVDb250ZXh0KTtcblxuICAgICAgICBmaWxlQ29udGV4dC5hZGRDb25qZWN0dXJlKGNvbmplY3R1cmUpO1xuXG4gICAgICAgIGNvbmplY3R1cmVWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKGNvbmplY3R1cmVWZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7bGFiZWxzU3RyaW5nfScgY29uamVjdHVyZS5gLCBjb25qZWN0dXJlTm9kZSk7XG4gIH1cblxuICByZXR1cm4gY29uamVjdHVyZVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeUNvbmplY3R1cmUiLCJwcm9vZk5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsImxhYmVsTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJjb25zZXF1ZW50Tm9kZVF1ZXJ5Iiwic3VwcG9zaXRpb25zTm9kZVF1ZXJ5IiwiY29uamVjdHVyZU5vZGUiLCJmaWxlQ29udGV4dCIsImNvbmplY3R1cmVWZXJpZmllZCIsImxhYmVsTm9kZXMiLCJsYWJlbHNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwidHJhY2UiLCJsYWJlbHMiLCJsYWJlbHNWZXJpZmllZCIsInZlcmlmeUxhYmVscyIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInN1cHBvc2l0aW9ucyIsInN1cHBvc2l0aW9uTm9kZXMiLCJzdXBwb3NpdGlvbnNWZXJpZmllZCIsInZlcmlmeVN1cHBvc2l0aW9ucyIsImNvbnNlcXVlbnRzIiwiY29uc2VxdWVudE5vZGUiLCJjb25zZXF1ZW50VmVyaWZpZWQiLCJ2ZXJpZnlDb25zZXF1ZW50IiwicHJvb2ZOb2RlIiwiZmlyc3RDb25zZXF1ZW50IiwiZmlyc3QiLCJjb25zZXF1ZW50Iiwic3Vic3RpdHV0aW9ucyIsIlN1YnN0aXR1dGlvbnMiLCJmcm9tTm90aGluZyIsInZlcmlmeVByb29mIiwiY29uamVjdHVyZSIsIkNvbmplY3R1cmUiLCJmcm9tTGFiZWxzU3VwcG9zaXRpb25zQ29uc2VxdWVudFN1YnN0aXR1dGlvbnNBbmRGaWxlQ29udGV4dCIsImFkZENvbmplY3R1cmUiLCJkZWJ1ZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBaUJBOzs7ZUFBd0JBOzs7aUVBZkQ7NERBRUU7b0VBQ0M7cUJBSUo7cUJBQ2dCOzs7Ozs7QUFFdEMsSUFBTUMsaUJBQWlCQyxJQUFBQSxnQkFBUyxFQUFDLHVCQUMzQkMsa0JBQWtCQyxJQUFBQSxpQkFBVSxFQUFDLHVCQUM3QkMsc0JBQXNCSCxJQUFBQSxnQkFBUyxFQUFDLDRCQUNoQ0ksd0JBQXdCRixJQUFBQSxpQkFBVSxFQUFDO0FBRTFCLFNBQVNKLGlCQUFpQk8sY0FBYyxFQUFFQyxXQUFXO0lBQ2xFLElBQUlDLHFCQUFxQjtJQUV6QixJQUFNQyxhQUFhUCxnQkFBZ0JJLGlCQUM3QkksZUFBZUgsWUFBWUksYUFBYSxDQUFDRjtJQUUvQ0YsWUFBWUssS0FBSyxDQUFDLEFBQUMsa0JBQThCLE9BQWJGLGNBQWEsb0JBQWtCSjtJQUVuRSxJQUFNTyxTQUFTLEVBQUUsRUFDWEMsaUJBQWlCQyxhQUFhTixZQUFZSSxRQUFRTjtJQUV4RCxJQUFJTyxnQkFBZ0I7UUFDbEIsSUFBTUUsZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNYLGNBQzVDWSxlQUFlLEVBQUUsRUFDakJDLG1CQUFtQmYsc0JBQXNCQyxpQkFDekNlLHVCQUF1QkMsbUJBQW1CRixrQkFBa0JELGNBQWNIO1FBRWhGLElBQUlLLHNCQUFzQjtZQUN4QixJQUFNRSxjQUFjLEVBQUUsRUFDaEJDLGlCQUFpQnBCLG9CQUFvQkUsaUJBQ3JDbUIscUJBQXFCQyxpQkFBaUJGLGdCQUFnQkQsYUFBYVA7WUFFekUsSUFBSVMsb0JBQW9CO2dCQUN0QixJQUFNRSxZQUFZM0IsZUFBZU0saUJBQzNCc0Isa0JBQWtCQyxJQUFBQSxZQUFLLEVBQUNOLGNBQ3hCTyxhQUFhRixpQkFBaUIsR0FBRztnQkFFdkMsSUFBSUQsY0FBYyxNQUFNO29CQUN0QixJQUFNSSxnQkFBZ0JDLHNCQUFhLENBQUNDLFdBQVc7b0JBRS9DQyxZQUFZUCxXQUFXRyxZQUFZQyxlQUFlZjtnQkFDcEQ7Z0JBRUEsSUFBTWUsaUJBQWdCQyxzQkFBYSxDQUFDQyxXQUFXLElBQ3pDRSxhQUFhQyxtQkFBVSxDQUFDQywyREFBMkQsQ0FBQ3hCLFFBQVFNLGNBQWNXLFlBQVlDLGdCQUFleEI7Z0JBRTNJQSxZQUFZK0IsYUFBYSxDQUFDSDtnQkFFMUIzQixxQkFBcUI7WUFDdkI7UUFDRjtJQUNGO0lBRUEsSUFBSUEsb0JBQW9CO1FBQ3RCRCxZQUFZZ0MsS0FBSyxDQUFDLEFBQUMsb0JBQWdDLE9BQWI3QixjQUFhLGtCQUFnQko7SUFDckU7SUFFQSxPQUFPRTtBQUNUIn0=

package/src/verify/conjecture.js

@@ -1,66 +0,0 @@
-"use strict";
-
-import Conjecture from "../conjecture";
-// import verifyProof from "../verify/proof";
-import LocalContext from "../context/local";
-import Substitutions from "../substitutions";
-// import verifyConsequent from "../verify/consequent";
-// import verifySuppositions from "../verify/suppositions";
-
-import { first } from "../utilities/array";
-import { nodeQuery, nodesQuery } from "../utilities/query";
-
-const proofNodeQuery = nodeQuery("/conjecture/proof!"),
-      labelNodesQuery = nodesQuery("/conjecture/label!"),
-      consequentNodeQuery = nodeQuery("/conjecture/consequent!"),
-      suppositionsNodeQuery = nodesQuery("/conjecture/supposition");
-
-export default function verifyConjecture(conjectureNode, fileContext) {
-  let conjectureVerified = false;
-
-  const labelNodes = labelNodesQuery(conjectureNode),
-        labelsString = fileContext.nodesAsString(labelNodes);
-
-  fileContext.trace(`Verifying the '${labelsString}' conjecture...`, conjectureNode);
-
-  const labels = [],
-        labelsVerified = verifyLabels(labelNodes, labels, fileContext);
-
-  if (labelsVerified) {
-    const localContext = LocalContext.fromFileContext(fileContext),
-          suppositions = [],
-          suppositionNodes = suppositionsNodeQuery(conjectureNode),
-          suppositionsVerified = verifySuppositions(suppositionNodes, suppositions, localContext);
-
-    if (suppositionsVerified) {
-      const consequents = [],
-            consequentNode = consequentNodeQuery(conjectureNode),
-            consequentVerified = verifyConsequent(consequentNode, consequents, localContext);
-
-      if (consequentVerified) {
-        const proofNode = proofNodeQuery(conjectureNode),
-              firstConsequent = first(consequents),
-              consequent = firstConsequent; ///
-
-        if (proofNode !== null) {
-          const substitutions = Substitutions.fromNothing();
-
-          verifyProof(proofNode, consequent, substitutions, localContext);
-        }
-
-        const substitutions = Substitutions.fromNothing(),
-              conjecture = Conjecture.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext);
-
-        fileContext.addConjecture(conjecture);
-
-        conjectureVerified = true;
-      }
-    }
-  }
-
-  if (conjectureVerified) {
-    fileContext.debug(`...verified the '${labelsString}' conjecture.`, conjectureNode);
-  }
-
-  return conjectureVerified;
-}