occam-verify-cli 1.0.31 → 1.0.33

package/src/mixins/statement/verify.js

@@ -8,8 +8,9 @@ import { equalityFromStatement,
          typeAssertionFromStatement,
          definedAssertionFromStatement,
          propertyAssertionFromStatement,
+         subproofAssertionFromStatement,
          containedAssertionFromStatement,
-         subproofAssertionFromStatement } from "../../utilities/context";
+         satisfyingAssertionFromStatement } from "../../utilities/context";
 
 function unifyWithBracketedCombinator(statement, assignments, stated, context) {
   stated = true;  ///
@@ -172,6 +173,28 @@ function verifyAsPropertyAssertion(statement, assignments, stated, context) {
   return verifiedAsPropertyAssertion;
 }
 
+function verifyAsSubproofAssertion(statement, assignments, stated, context) {
+  let verifiedAsSubproofAssertion = false;
+
+  const subproofAssertion = subproofAssertionFromStatement(statement, context);
+
+  if (subproofAssertion !== null) {
+    const statementString = statement.getString();
+
+    context.trace(`Verifying the '${statementString}' statement as a subproof assertion...`);
+
+    const subproofAssertionVerified = subproofAssertion.verify(assignments, stated, context);
+
+    verifiedAsSubproofAssertion = subproofAssertionVerified; ///
+
+    if (verifiedAsSubproofAssertion) {
+      context.debug(`...verified the '${statementString}' statement as a subproof assertion.`);
+    }
+  }
+
+  return verifiedAsSubproofAssertion;
+}
+
 function verifyAsContainedAssertion(statement, assignments, stated, context) {
   let verifiedAsContainedAssertion = false;
 
@@ -187,33 +210,33 @@ function verifyAsContainedAssertion(statement, assignments, stated, context) {
     verifiedAsContainedAssertion = containedAssertionVerified; ///
 
     if (verifiedAsContainedAssertion) {
-      context.debug(`...verified the '${statementString}' statement as a defined assertion.`);
+      context.debug(`...verified the '${statementString}' statement as a contained assertion.`);
     }
   }
 
   return verifiedAsContainedAssertion;
 }
 
-function verifyAsSubproofAssertion(statement, assignments, stated, context) {
-  let verifiedAsSubproofAssertion = false;
+function verifyAsSatisfyingAssertion(statement, assignments, stated, context) {
+  let verifiedAsSatisfyingAssertion = false;
 
-  const subproofAssertion = subproofAssertionFromStatement(statement, context);
+  const satisfyingAssertion = satisfyingAssertionFromStatement(statement, context);
 
-  if (subproofAssertion !== null) {
+  if (satisfyingAssertion !== null) {
     const statementString = statement.getString();
 
-    context.trace(`Verifying the '${statementString}' statement as a subproof assertion...`);
+    context.trace(`Verifying the '${statementString}' statement as a satisfying assertion...`);
 
-    const subproofAssertionVerified = subproofAssertion.verify(assignments, stated, context);
+    const satisfyingAssertionVerified = satisfyingAssertion.verify(assignments, stated, context);
 
-    verifiedAsSubproofAssertion = subproofAssertionVerified; ///
+    verifiedAsSatisfyingAssertion = satisfyingAssertionVerified; ///
 
-    if (verifiedAsSubproofAssertion) {
-      context.debug(`...verified the '${statementString}' statement as a subproof assertion.`);
+    if (verifiedAsSatisfyingAssertion) {
+      context.debug(`...verified the '${statementString}' statement as a defined assertion.`);
     }
   }
 
-  return verifiedAsSubproofAssertion;
+  return verifiedAsSatisfyingAssertion;
 }
 
 const verifyMixins = [
@@ -224,9 +247,10 @@ const verifyMixins = [
   verifyAsJudgement,
   verifyAsTypeAssertion,
   verifyAsDefinedAssertion,
-  verifyAsContainedAssertion,
   verifyAsPropertyAssertion,
-  verifyAsSubproofAssertion
+  verifyAsSubproofAssertion,
+  verifyAsContainedAssertion,
+  verifyAsSatisfyingAssertion
 ];
 
 export default verifyMixins;

package/src/utilities/context.js

@@ -73,6 +73,16 @@ export function propertyAssertionFromStatement(statement, context) {
   return propertyAssertion;
 }
 
+export function subproofAssertionFromStatement(statement, context) {
+  context = contextFromStatement(statement, context); ///
+
+  const { SubproofAssertion } = dom,
+    statementNode = statement.getNode(),
+    subproofAssertion = SubproofAssertion.fromStatementNode(statementNode, context);
+
+  return subproofAssertion;
+}
+
 export function containedAssertionFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
@@ -83,14 +93,14 @@ export function containedAssertionFromStatement(statement, context) {
   return containedAssertion;
 }
 
-export function subproofAssertionFromStatement(statement, context) {
+export function satisfyingAssertionFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { SubproofAssertion } = dom,
+  const { SatisfyingAssertion } = dom,
         statementNode = statement.getNode(),
-        subproofAssertion = SubproofAssertion.fromStatementNode(statementNode, context);
+        satisfyingAssertion = SatisfyingAssertion.fromStatementNode(statementNode, context);
 
-  return subproofAssertion;
+  return satisfyingAssertion;
 }
 
 function contextFromFrame(frame, context) {