occam-verify-cli 0.0.1233 → 0.0.1235

package/src/mixins/statement/verify.js

@@ -7,8 +7,7 @@ import { equalityFromStatement,
          metavariableFromStatement,
          typeAssertionFromStatement,
          definedAssertionFromStatement,
-         subproofAssertionFromStatement,
-         containedAssertionFromStatement } from "../../utilities/verification";
+         subproofAssertionFromStatement } from "../../utilities/verification";
 
 function verifyAsMetavariable(statement, assignments, stated, context) {
   let verifiedAsMetavariable = false;
@@ -120,28 +119,6 @@ function verifyAsDefinedAssertion(statement, assignments, stated, context) {
   return verifiedAsDefinedAssertion;
 }
 
-function verifyAsContainedAssertion(statement, assignments, stated, context) {
-  let verifiedAsContainedAssertion = false;
-
-  const containedAssertion = containedAssertionFromStatement(statement, context);
-
-  if (containedAssertion !== null) {
-    const statementString = statement.getString();
-
-    context.trace(`Verifying the '${statementString}' statement as a contained assertion...`);
-
-    const containedAssertionVerified = containedAssertion.verify(assignments, stated, context);
-
-    verifiedAsContainedAssertion = containedAssertionVerified; ///
-
-    if (verifiedAsContainedAssertion) {
-      context.debug(`...verified the '${statementString}' statement as a contained assertion.`);
-    }
-  }
-
-  return verifiedAsContainedAssertion;
-}
-
 function verifyAsSubproofAssertion(statement, assignments, stated, context) {
   let verifiedAsSubproofAssertion = false;
 
@@ -199,7 +176,6 @@ const verifyMixins = [
   verifyAsTypeAssertion,
   verifyAsDefinedAssertion,
   verifyAsSubproofAssertion,
-  verifyAsContainedAssertion,
   unifyWithBracketedCombinator,
   unifyWithCombinators
 ];

package/src/utilities/assertion.js

@@ -3,12 +3,12 @@
 import { NOT } from "../constants";
 import { nodesQuery } from "../utilities/query";
 
-const operatorTerminalNodesQuery = nodesQuery("/*/@operator");
+const terminalNodesQuery = nodesQuery("/*/@*");
 
 export function isAssertionNegated(assertionNode) {
-  const operatorTerminalNodes = operatorTerminalNodesQuery(assertionNode),
-        assertionNegated = operatorTerminalNodes.some((operatorTerminalNode) => {
-          const content = operatorTerminalNode.getContent();
+  const terminalNodes = terminalNodesQuery(assertionNode),
+        assertionNegated = terminalNodes.some((terminalNode) => {
+          const content = terminalNode.getContent();
 
           if (content === NOT) {
             return true;

package/src/utilities/verification.js

@@ -73,16 +73,6 @@ export function subproofAssertionFromStatement(statement, context) {
   return subproofAssertion;
 }
 
-export function containedAssertionFromStatement(statement, context) {
-  context = contextFromStatement(statement, context); ///
-
-  const { ContainedAssertion } = dom,
-        statementNode = statement.getNode(),
-        containedAssertion = ContainedAssertion.fromStatementNode(statementNode, context);
-
-  return containedAssertion;
-}
-
 function contextFromFrame(frame, context) {
   const frameTokens = frame.getTokens(),
         tokens = frameTokens, ///

package/lib/dom/assertion/contained.js

@@ -1,287 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-var _dom = /*#__PURE__*/ _interop_require_wildcard(require("../../dom"));
-var _local = /*#__PURE__*/ _interop_require_default(require("../../context/local"));
-var _query = require("../../utilities/query");
-var _assertion = require("../../utilities/assertion");
-var _substitutions = require("../../utilities/substitutions");
-function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
-var _ContainedAssertion;
-var containedAssertionNodeQuery = (0, _query.nodeQuery)("/statement/containedAssertion");
-var _default = (0, _dom.domAssigned)((_ContainedAssertion = /*#__PURE__*/ function() {
-    function ContainedAssertion(string, node, tokens, term, frame, negated, statement) {
-        _class_call_check(this, ContainedAssertion);
-        this.string = string;
-        this.node = node;
-        this.tokens = tokens;
-        this.term = term;
-        this.frame = frame;
-        this.negated = negated;
-        this.statement = statement;
-    }
-    _create_class(ContainedAssertion, [
-        {
-            key: "getString",
-            value: function getString() {
-                return this.string;
-            }
-        },
-        {
-            key: "getNode",
-            value: function getNode() {
-                return this.node;
-            }
-        },
-        {
-            key: "getTokens",
-            value: function getTokens() {
-                return this.tokens;
-            }
-        },
-        {
-            key: "getTerm",
-            value: function getTerm() {
-                return this.term;
-            }
-        },
-        {
-            key: "getFrame",
-            value: function getFrame() {
-                return this.frame;
-            }
-        },
-        {
-            key: "isNegated",
-            value: function isNegated() {
-                return this.negated;
-            }
-        },
-        {
-            key: "getStatement",
-            value: function getStatement() {
-                return this.statement;
-            }
-        },
-        {
-            key: "verify",
-            value: function verify(assignments, stated, context) {
-                var verified = false;
-                var containedAssertionString = this.string; ///
-                context.trace("Verifying the '".concat(containedAssertionString, "' contained assertion..."));
-                var termVerified = false, frameVerified = false, statementVerified = false;
-                if (this.term !== null) {
-                    termVerified = this.term.verify(context, function() {
-                        var verifiedAhead = true;
-                        return verifiedAhead;
-                    });
-                }
-                if (this.frame !== null) {
-                    frameVerified = this.verifyFrame(this.frame, assignments, stated, context);
-                }
-                if (this.statement !== null) {
-                    statementVerified = this.verifyStatement(this.statement, assignments, stated, context);
-                }
-                if (termVerified || frameVerified || statementVerified) {
-                    var verifiedWhenStated = false, verifiedWhenDerived = false;
-                    if (stated) {
-                        verifiedWhenStated = this.verifyWhenStated(assignments, context);
-                    } else {
-                        verifiedWhenDerived = this.verifyWhenDerived(context);
-                    }
-                    if (verifiedWhenStated || verifiedWhenDerived) {
-                        verified = true;
-                    }
-                }
-                if (verified) {
-                    context.debug("...verified the '".concat(containedAssertionString, "' contained assertion."));
-                }
-                return verified;
-            }
-        },
-        {
-            key: "verifyFrame",
-            value: function verifyFrame(frame, assignments, stated, context) {
-                stated = true; ///
-                assignments = null; ///
-                var frameVerified = frame.verify(assignments, stated, context);
-                return frameVerified;
-            }
-        },
-        {
-            key: "verifyStatement",
-            value: function verifyStatement(statement, assignments, stated, context) {
-                stated = true; ///
-                assignments = null; ///
-                var statementVerified = statement.verify(assignments, stated, context);
-                return statementVerified;
-            }
-        },
-        {
-            key: "verifyWhenStated",
-            value: function verifyWhenStated(assignments, context) {
-                var verifiedWhenStated;
-                var containedAssertionString = this.string; ///
-                context.trace("Verifying the '".concat(containedAssertionString, "' stated contained assertion..."));
-                verifiedWhenStated = true;
-                if (verifiedWhenStated) {
-                    context.debug("...verified the '".concat(containedAssertionString, "' stated contained assertion."));
-                }
-                return verifiedWhenStated;
-            }
-        },
-        {
-            key: "verifyWhenDerived",
-            value: function verifyWhenDerived1(context) {
-                var verifiedWhenDerived;
-                var containedAssertionString = this.string; ///
-                context.trace("Verifying the '".concat(containedAssertionString, "' derived contained assertion..."));
-                verifiedWhenDerived = verifyWhenDerived(this.term, this.frame, this.statement, this.negated, context);
-                if (verifiedWhenDerived) {
-                    context.debug("...verified the '".concat(containedAssertionString, "' derived contained assertion."));
-                }
-                return verifiedWhenDerived;
-            }
-        },
-        {
-            key: "unifyIndependently",
-            value: function unifyIndependently(substitutions, context) {
-                var unifiedIndependently;
-                var containedAssertionString = this.string; ///
-                context.trace("Unifying the '".concat(containedAssertionString, "' contained assertion independently..."));
-                var localContext = _local.default.fromContextAndTokens(context, this.tokens);
-                context = localContext; ///
-                var term = (0, _substitutions.termFromTermAndSubstitutions)(this.term, substitutions, context), frame = (0, _substitutions.frameFromFrameAndSubstitutions)(this.frame, substitutions, context), statement = (0, _substitutions.statementFromStatementAndSubstitutions)(this.statement, substitutions, context), verifiedWhenDerived = verifyWhenDerived(term, frame, statement, this.negated, context);
-                unifiedIndependently = verifiedWhenDerived; ///
-                if (unifiedIndependently) {
-                    context.debug("...unified the '".concat(containedAssertionString, "' contained assertion independently."));
-                }
-                return unifiedIndependently;
-            }
-        }
-    ], [
-        {
-            key: "fromStatementNode",
-            value: function fromStatementNode(statementNode, context) {
-                var containedAssertion = null;
-                var containedAssertionNode = containedAssertionNodeQuery(statementNode);
-                if (containedAssertionNode !== null) {
-                    var Term = _dom.default.Term, Frame = _dom.default.Frame, Statement = _dom.default.Statement, node = containedAssertionNode, string = context.nodeAsString(node), tokens = context.nodeAsTokens(node), term = Term.fromContainedAssertionNode(containedAssertionNode, context), frame = Frame.fromContainedAssertionNode(containedAssertionNode, context), statement = Statement.fromContainedAssertionNode(containedAssertionNode, context), containedAssertionNegated = (0, _assertion.isAssertionNegated)(containedAssertionNode), negated = containedAssertionNegated; ///
-                    containedAssertion = new ContainedAssertion(string, node, tokens, term, frame, negated, statement);
-                }
-                return containedAssertion;
-            }
-        }
-    ]);
-    return ContainedAssertion;
-}(), _define_property(_ContainedAssertion, "name", "ContainedAssertion"), _ContainedAssertion));
-function verifyWhenDerived(term, frame, statement, negated, context) {
-    var verifiedWhenDerived = false;
-    if (statement !== null) {
-        if (term !== null) {
-            var termContained = statement.isTermContained(term, context);
-            if (!negated && termContained) {
-                verifiedWhenDerived = true;
-            }
-            if (negated && !termContained) {
-                verifiedWhenDerived = true;
-            }
-        }
-        if (frame !== null) {
-            var frameContained = statement.isFrameContained(frame, context);
-            if (!negated && frameContained) {
-                verifiedWhenDerived = true;
-            }
-            if (negated && !frameContained) {
-                verifiedWhenDerived = true;
-            }
-        }
-    }
-    return verifiedWhenDerived;
-}
-
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/assertion/contained.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../../dom\";\nimport LocalContext from \"../../context/local\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { domAssigned } from \"../../dom\";\nimport { isAssertionNegated } from \"../../utilities/assertion\";\nimport { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions, statementFromStatementAndSubstitutions } from \"../../utilities/substitutions\";\n\nconst containedAssertionNodeQuery = nodeQuery(\"/statement/containedAssertion\");\n\nexport default domAssigned(class ContainedAssertion {\n  constructor(string, node, tokens, term, frame, negated, statement) {\n    this.string = string;\n    this.node = node;\n    this.tokens = tokens;\n    this.term = term;\n    this.frame = frame;\n    this.negated = negated;\n    this.statement = statement;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getTokens() {\n    return this.tokens;\n  }\n\n  getTerm() {\n    return this.term;\n  }\n\n  getFrame() {\n    return this.frame;\n  }\n\n  isNegated() {\n    return this.negated;\n  }\n\n  getStatement() {\n    return this.statement;\n  }\n\n  verify(assignments, stated, context) {\n    let verified = false;\n\n    const containedAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${containedAssertionString}' contained assertion...`);\n\n    let termVerified = false,\n        frameVerified = false,\n        statementVerified = false;\n\n    if (this.term !== null) {\n      termVerified = this.term.verify(context, () => {\n        const verifiedAhead = true;\n\n        return verifiedAhead;\n      });\n    }\n\n    if (this.frame !== null) {\n      frameVerified = this.verifyFrame(this.frame, assignments, stated, context);\n    }\n\n    if (this.statement !== null) {\n      statementVerified = this.verifyStatement(this.statement, assignments, stated, context);\n    }\n\n    if (termVerified || frameVerified || statementVerified) {\n      let verifiedWhenStated = false,\n          verifiedWhenDerived = false;\n\n      if (stated) {\n        verifiedWhenStated = this.verifyWhenStated(assignments, context);\n      } else {\n        verifiedWhenDerived = this.verifyWhenDerived(context);\n      }\n\n      if (verifiedWhenStated || verifiedWhenDerived) {\n        verified = true;\n      }\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${containedAssertionString}' contained assertion.`);\n    }\n\n    return verified;\n  }\n\n  verifyFrame(frame, assignments, stated, context) {\n    stated = true;  ///\n\n    assignments = null; ///\n\n    const frameVerified = frame.verify(assignments, stated, context);\n\n    return frameVerified;\n  }\n\n  verifyStatement(statement, assignments, stated, context) {\n    stated = true;  ///\n\n    assignments = null; ///\n\n    const statementVerified = statement.verify(assignments, stated, context);\n\n    return statementVerified;\n  }\n\n  verifyWhenStated(assignments, context) {\n    let verifiedWhenStated;\n\n    const containedAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${containedAssertionString}' stated contained assertion...`);\n\n    verifiedWhenStated = true;\n\n    if (verifiedWhenStated) {\n      context.debug(`...verified the '${containedAssertionString}' stated contained assertion.`);\n    }\n\n    return verifiedWhenStated;\n  }\n\n  verifyWhenDerived(context) {\n    let verifiedWhenDerived;\n\n    const containedAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${containedAssertionString}' derived contained assertion...`);\n\n    verifiedWhenDerived = verifyWhenDerived(this.term, this.frame, this.statement, this.negated, context);\n\n    if (verifiedWhenDerived) {\n      context.debug(`...verified the '${containedAssertionString}' derived contained assertion.`);\n    }\n\n    return verifiedWhenDerived;\n  }\n\n  unifyIndependently(substitutions, context) {\n    let unifiedIndependently;\n\n    const containedAssertionString = this.string; ///\n\n    context.trace(`Unifying the '${containedAssertionString}' contained assertion independently...`);\n\n    const localContext = LocalContext.fromContextAndTokens(context, this.tokens);\n\n    context = localContext; ///\n\n    const term = termFromTermAndSubstitutions(this.term, substitutions, context),\n          frame = frameFromFrameAndSubstitutions(this.frame, substitutions, context),\n          statement = statementFromStatementAndSubstitutions(this.statement, substitutions, context),\n          verifiedWhenDerived = verifyWhenDerived(term, frame, statement, this.negated, context);\n\n    unifiedIndependently = verifiedWhenDerived; ///\n\n    if (unifiedIndependently) {\n      context.debug(`...unified the '${containedAssertionString}' contained assertion independently.`);\n    }\n\n    return unifiedIndependently;\n  }\n\n  static name = \"ContainedAssertion\";\n\n  static fromStatementNode(statementNode, context) {\n    let containedAssertion = null;\n\n    const containedAssertionNode = containedAssertionNodeQuery(statementNode);\n\n    if (containedAssertionNode !== null) {\n      const { Term, Frame, Statement } = dom,\n            node = containedAssertionNode,  ///\n            string = context.nodeAsString(node),\n            tokens = context.nodeAsTokens(node),\n            term = Term.fromContainedAssertionNode(containedAssertionNode, context),\n            frame = Frame.fromContainedAssertionNode(containedAssertionNode, context),\n            statement = Statement.fromContainedAssertionNode(containedAssertionNode, context),\n            containedAssertionNegated = isAssertionNegated(containedAssertionNode),\n            negated = containedAssertionNegated;  ///\n\n      containedAssertion = new ContainedAssertion(string, node, tokens, term, frame, negated, statement);\n    }\n\n    return containedAssertion;\n  }\n});\n\nfunction verifyWhenDerived(term, frame, statement, negated, context) {\n  let verifiedWhenDerived = false;\n\n  if (statement !== null) {\n    if (term !== null) {\n      const termContained = statement.isTermContained(term, context);\n\n      if (!negated && termContained) {\n        verifiedWhenDerived = true;\n      }\n\n      if (negated && !termContained) {\n        verifiedWhenDerived = true;\n      }\n    }\n\n    if (frame !== null) {\n      const frameContained = statement.isFrameContained(frame, context);\n\n      if (!negated && frameContained) {\n        verifiedWhenDerived = true;\n      }\n\n      if (negated && !frameContained) {\n        verifiedWhenDerived = true;\n      }\n    }\n  }\n\n  return verifiedWhenDerived;\n}\n"],"names":["containedAssertionNodeQuery","nodeQuery","domAssigned","ContainedAssertion","string","node","tokens","term","frame","negated","statement","getString","getNode","getTokens","getTerm","getFrame","isNegated","getStatement","verify","assignments","stated","context","verified","containedAssertionString","trace","termVerified","frameVerified","statementVerified","verifiedAhead","verifyFrame","verifyStatement","verifiedWhenStated","verifiedWhenDerived","verifyWhenStated","verifyWhenDerived","debug","unifyIndependently","substitutions","unifiedIndependently","localContext","LocalContext","fromContextAndTokens","termFromTermAndSubstitutions","frameFromFrameAndSubstitutions","statementFromStatementAndSubstitutions","fromStatementNode","statementNode","containedAssertion","containedAssertionNode","Term","dom","Frame","Statement","nodeAsString","nodeAsTokens","fromContainedAssertionNode","containedAssertionNegated","isAssertionNegated","name","termContained","isTermContained","frameContained","isFrameContained"],"mappings":"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"}

package/src/dom/assertion/contained.js

@@ -1,233 +0,0 @@
-"use strict";
-
-import dom from "../../dom";
-import LocalContext from "../../context/local";
-
-import { nodeQuery } from "../../utilities/query";
-import { domAssigned } from "../../dom";
-import { isAssertionNegated } from "../../utilities/assertion";
-import { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions, statementFromStatementAndSubstitutions } from "../../utilities/substitutions";
-
-const containedAssertionNodeQuery = nodeQuery("/statement/containedAssertion");
-
-export default domAssigned(class ContainedAssertion {
-  constructor(string, node, tokens, term, frame, negated, statement) {
-    this.string = string;
-    this.node = node;
-    this.tokens = tokens;
-    this.term = term;
-    this.frame = frame;
-    this.negated = negated;
-    this.statement = statement;
-  }
-
-  getString() {
-    return this.string;
-  }
-
-  getNode() {
-    return this.node;
-  }
-
-  getTokens() {
-    return this.tokens;
-  }
-
-  getTerm() {
-    return this.term;
-  }
-
-  getFrame() {
-    return this.frame;
-  }
-
-  isNegated() {
-    return this.negated;
-  }
-
-  getStatement() {
-    return this.statement;
-  }
-
-  verify(assignments, stated, context) {
-    let verified = false;
-
-    const containedAssertionString = this.string; ///
-
-    context.trace(`Verifying the '${containedAssertionString}' contained assertion...`);
-
-    let termVerified = false,
-        frameVerified = false,
-        statementVerified = false;
-
-    if (this.term !== null) {
-      termVerified = this.term.verify(context, () => {
-        const verifiedAhead = true;
-
-        return verifiedAhead;
-      });
-    }
-
-    if (this.frame !== null) {
-      frameVerified = this.verifyFrame(this.frame, assignments, stated, context);
-    }
-
-    if (this.statement !== null) {
-      statementVerified = this.verifyStatement(this.statement, assignments, stated, context);
-    }
-
-    if (termVerified || frameVerified || statementVerified) {
-      let verifiedWhenStated = false,
-          verifiedWhenDerived = false;
-
-      if (stated) {
-        verifiedWhenStated = this.verifyWhenStated(assignments, context);
-      } else {
-        verifiedWhenDerived = this.verifyWhenDerived(context);
-      }
-
-      if (verifiedWhenStated || verifiedWhenDerived) {
-        verified = true;
-      }
-    }
-
-    if (verified) {
-      context.debug(`...verified the '${containedAssertionString}' contained assertion.`);
-    }
-
-    return verified;
-  }
-
-  verifyFrame(frame, assignments, stated, context) {
-    stated = true;  ///
-
-    assignments = null; ///
-
-    const frameVerified = frame.verify(assignments, stated, context);
-
-    return frameVerified;
-  }
-
-  verifyStatement(statement, assignments, stated, context) {
-    stated = true;  ///
-
-    assignments = null; ///
-
-    const statementVerified = statement.verify(assignments, stated, context);
-
-    return statementVerified;
-  }
-
-  verifyWhenStated(assignments, context) {
-    let verifiedWhenStated;
-
-    const containedAssertionString = this.string; ///
-
-    context.trace(`Verifying the '${containedAssertionString}' stated contained assertion...`);
-
-    verifiedWhenStated = true;
-
-    if (verifiedWhenStated) {
-      context.debug(`...verified the '${containedAssertionString}' stated contained assertion.`);
-    }
-
-    return verifiedWhenStated;
-  }
-
-  verifyWhenDerived(context) {
-    let verifiedWhenDerived;
-
-    const containedAssertionString = this.string; ///
-
-    context.trace(`Verifying the '${containedAssertionString}' derived contained assertion...`);
-
-    verifiedWhenDerived = verifyWhenDerived(this.term, this.frame, this.statement, this.negated, context);
-
-    if (verifiedWhenDerived) {
-      context.debug(`...verified the '${containedAssertionString}' derived contained assertion.`);
-    }
-
-    return verifiedWhenDerived;
-  }
-
-  unifyIndependently(substitutions, context) {
-    let unifiedIndependently;
-
-    const containedAssertionString = this.string; ///
-
-    context.trace(`Unifying the '${containedAssertionString}' contained assertion independently...`);
-
-    const localContext = LocalContext.fromContextAndTokens(context, this.tokens);
-
-    context = localContext; ///
-
-    const term = termFromTermAndSubstitutions(this.term, substitutions, context),
-          frame = frameFromFrameAndSubstitutions(this.frame, substitutions, context),
-          statement = statementFromStatementAndSubstitutions(this.statement, substitutions, context),
-          verifiedWhenDerived = verifyWhenDerived(term, frame, statement, this.negated, context);
-
-    unifiedIndependently = verifiedWhenDerived; ///
-
-    if (unifiedIndependently) {
-      context.debug(`...unified the '${containedAssertionString}' contained assertion independently.`);
-    }
-
-    return unifiedIndependently;
-  }
-
-  static name = "ContainedAssertion";
-
-  static fromStatementNode(statementNode, context) {
-    let containedAssertion = null;
-
-    const containedAssertionNode = containedAssertionNodeQuery(statementNode);
-
-    if (containedAssertionNode !== null) {
-      const { Term, Frame, Statement } = dom,
-            node = containedAssertionNode,  ///
-            string = context.nodeAsString(node),
-            tokens = context.nodeAsTokens(node),
-            term = Term.fromContainedAssertionNode(containedAssertionNode, context),
-            frame = Frame.fromContainedAssertionNode(containedAssertionNode, context),
-            statement = Statement.fromContainedAssertionNode(containedAssertionNode, context),
-            containedAssertionNegated = isAssertionNegated(containedAssertionNode),
-            negated = containedAssertionNegated;  ///
-
-      containedAssertion = new ContainedAssertion(string, node, tokens, term, frame, negated, statement);
-    }
-
-    return containedAssertion;
-  }
-});
-
-function verifyWhenDerived(term, frame, statement, negated, context) {
-  let verifiedWhenDerived = false;
-
-  if (statement !== null) {
-    if (term !== null) {
-      const termContained = statement.isTermContained(term, context);
-
-      if (!negated && termContained) {
-        verifiedWhenDerived = true;
-      }
-
-      if (negated && !termContained) {
-        verifiedWhenDerived = true;
-      }
-    }
-
-    if (frame !== null) {
-      const frameContained = statement.isFrameContained(frame, context);
-
-      if (!negated && frameContained) {
-        verifiedWhenDerived = true;
-      }
-
-      if (negated && !frameContained) {
-        verifiedWhenDerived = true;
-      }
-    }
-  }
-
-  return verifiedWhenDerived;
-}