occam-verify-cli 0.0.1009 → 0.0.1011

package/src/utilities/releaseContext.js

@@ -86,8 +86,6 @@ export function createReleaseContext(dependency, dependentNames, context, callba
 }
 
 export function initialiseReleaseContext(dependency, context) {
-  let releaseContextInitialised = false;
-
   const { releaseContextMap } = context,
         dependencyName = dependency.getName(),
         releaseName = dependencyName, ///
@@ -98,7 +96,7 @@ export function initialiseReleaseContext(dependency, context) {
 
     log.warning(`Unable to initialise the '${dependencyName}' context because it has not been created.`);
   } else {
-    releaseContextInitialised = releaseContext.isInitialised();
+    const releaseContextInitialised = releaseContext.isInitialised();
 
     if (!releaseContextInitialised) {
       initialiseDependencyReleaseContexts(dependency, releaseContext, context);
@@ -113,8 +111,6 @@ export function initialiseReleaseContext(dependency, context) {
       log.info(`...initialised the '${dependencyName}' context.`);
     }
   }
-
-  return releaseContextInitialised;
 }
 
 export default {
@@ -277,14 +273,9 @@ function createDependencyReleaseContexts(dependency, releaseContext, dependentNa
 }
 
 function initialiseDependencyReleaseContexts(dependency, releaseContext, context) {
-  const dependencies = releaseContext.getDependencies(),
-        dependencyReleaseContextsInitialised = dependencies.everyDependency((dependency) => {  ///
-          const releaseContextInitialised = initialiseReleaseContext(dependency, context);
-
-          if (releaseContextInitialised) {
-            return true;
-          }
-        });
+  const dependencies = releaseContext.getDependencies();
 
-  return dependencyReleaseContextsInitialised;
+  dependencies.forEachDependency((dependency) => {  ///
+    initialiseReleaseContext(dependency, context);
+  });
 }

package/src/verifier/topLevel.js

@@ -1,6 +1,9 @@
 "use strict";
 
 import Rule from "../rule";
+import CombinatorDeclaration from "../declaration/combinator";
+import MetavariableDeclaration from "../declaration/metavariable";
+
 import Verifier from "../verifier";
 import verifyError from "../verify/error";
 import verifyAxiom from "../verify/axiom";
@@ -9,11 +12,9 @@ import verifyTheorem from "../verify/theorem";
 import verifyMetaLemma from "../verify/metaLemma";
 import verifyConjecture from "../verify/conjecture";
 import verifyMetatheorem from "../verify/metatheorem";
-import CombinatorDeclaration from "../declaration/combinator";
 import verifyTypeDeclaration from "../verify/declaration/type";
 import verifyVariableDeclaration from "../verify/declaration/variable";
 import verifyConstructorDeclaration from "../verify/declaration/constructor";
-import verifyMetavariableDeclaration from "../verify/declaration/metavariable";
 
 import { nodeQuery } from "../utilities/query";
 
@@ -145,7 +146,8 @@ class TopLevelVerifier extends Verifier {
     {
       nodeQuery: metavariableDeclarationNodeQuery,
       verify: (metavariableDeclarationNode, fileContext) => {
-        const metavariableDeclarationVerified = verifyMetavariableDeclaration(metavariableDeclarationNode, fileContext);
+        const metavariableDeclaration = MetavariableDeclaration.fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext),
+              metavariableDeclarationVerified = metavariableDeclaration.verify(fileContext);
 
         return metavariableDeclarationVerified;
       }

package/lib/verify/declaration/metavariable.js

@@ -1,89 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifyMetavariableDeclaration;
-    }
-});
-var _metavariable = /*#__PURE__*/ _interop_require_default(require("../../metavariable"));
-var _metavariable1 = /*#__PURE__*/ _interop_require_default(require("../../assignment/metavariable"));
-var _array = require("../../utilities/array");
-var _query = require("../../utilities/query");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var termNodeQuery = (0, _query.nodeQuery)("/argument/term"), typeNodeQuery = (0, _query.nodeQuery)("/argument/type"), argumentNodeQuery = (0, _query.nodeQuery)("/metavariable/argument!"), metaTypeNodeQuery = (0, _query.nodeQuery)("/metavariableDeclaration/metaType"), metavariableNodeQuery = (0, _query.nodeQuery)("/metavariableDeclaration/metavariable");
-function verifyMetavariableDeclaration(metavariableDeclarationNode, fileContext) {
-    var metavariableDeclarationVerified;
-    var metaTypeNode = metaTypeNodeQuery(metavariableDeclarationNode), metavariableNode = metavariableNodeQuery(metavariableDeclarationNode), metaTypeString = fileContext.nodeAsString(metaTypeNode), metavariableString = fileContext.nodeAsString(metavariableNode);
-    fileContext.trace("Verifying the '".concat(metavariableString, ":").concat(metaTypeString, "' metavariable declaration..."));
-    var metavariableVVerified = verifyMetavariable(metavariableNode, metaTypeNode, fileContext);
-    metavariableDeclarationVerified = metavariableVVerified; ///
-    if (metavariableDeclarationVerified) {
-        fileContext.debug("...verified the '".concat(metavariableString, ":").concat(metaTypeString, "' metavariable declaration."));
-    }
-    return metavariableDeclarationVerified;
-}
-function verifyMetavariable(metavariableNode, metaTypeNode, fileContext) {
-    var metavariableVerified = false;
-    var metavariableString = fileContext.nodeAsString(metavariableNode);
-    fileContext.trace("Verifying the '".concat(metavariableString, "' metavariable..."));
-    var metavariablePresent = fileContext.isMetavariablePresentByMetavariableNode(metavariableNode);
-    if (metavariablePresent) {
-        fileContext.debug("The metavariable '".concat(metavariableString, "' is already present."));
-    } else {
-        var termTypes = [], metaTypes = [], argumentNode = argumentNodeQuery(metavariableNode), argumentVerified = verifyArgument(argumentNode, termTypes, fileContext), metaTypeVerified = verifyMetaType(metaTypeNode, metaTypes, fileContext);
-        if (argumentVerified && metaTypeVerified) {
-            var metaType;
-            var firstMetaType = (0, _array.first)(metaTypes);
-            metaType = firstMetaType; ///
-            var metavariable = _metavariable.default.fromMetavariableNodeAndMetaType(metavariableNode, metaType, fileContext), metavariableAssignment = _metavariable1.default.fromMetavariable(metavariable), metavariableAssigned = metavariableAssignment.assign(fileContext);
-            if (metavariableAssigned) {
-                metavariableVerified = true;
-            }
-        }
-    }
-    if (metavariableVerified) {
-        fileContext.debug("...verified the '".concat(metavariableString, "' metavariable."));
-    }
-    return metavariableVerified;
-}
-function verifyArgument(argumentNode, termTypes, fileContext) {
-    var argumentVerified = false;
-    if (argumentNode === null) {
-        argumentVerified = true;
-    } else {
-        var termNode = termNodeQuery(argumentNode);
-        if (termNode === null) {} else {
-            var termString = fileContext.nodeAsString(termNode);
-            fileContext.debug("The '".concat(termString, "' term was found when a type should have been present."));
-        }
-        var typeNode = typeNodeQuery(argumentNode);
-        if (typeNode !== null) {
-            var type = fileContext.findTypeByTypeNode(typeNode);
-            if (type !== null) {
-                var termType = type; ///
-                termTypes.push(termType);
-                argumentVerified = true;
-            } else {
-                var typeString = fileContext.nodeAsString(typeNode);
-                fileContext.debug("The '".concat(typeString, "' type is not present."));
-            }
-        }
-    }
-    return argumentVerified;
-}
-function verifyMetaType(metaTypeNode, metaTypes, fileContext) {
-    var metaTypeVerified;
-    var metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode);
-    metaTypes.push(metaType);
-    metaTypeVerified = true;
-    return metaTypeVerified;
-}
-
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verify/declaration/metavariable.js"],"sourcesContent":["\"use strict\";\n\nimport Metavariable from \"../../metavariable\";\nimport MetavariableAssignment from \"../../assignment/metavariable\";\n\nimport { first } from \"../../utilities/array\";\nimport { nodeQuery } from \"../../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/argument/term\"),\n      typeNodeQuery = nodeQuery(\"/argument/type\"),\n      argumentNodeQuery = nodeQuery(\"/metavariable/argument!\"),\n      metaTypeNodeQuery = nodeQuery(\"/metavariableDeclaration/metaType\"),\n      metavariableNodeQuery = nodeQuery(\"/metavariableDeclaration/metavariable\");\n\nexport default function verifyMetavariableDeclaration(metavariableDeclarationNode, fileContext) {\n  let metavariableDeclarationVerified;\n\n  const metaTypeNode = metaTypeNodeQuery(metavariableDeclarationNode),\n        metavariableNode = metavariableNodeQuery(metavariableDeclarationNode),\n        metaTypeString = fileContext.nodeAsString(metaTypeNode),\n        metavariableString = fileContext.nodeAsString(metavariableNode);\n\n  fileContext.trace(`Verifying the '${metavariableString}:${metaTypeString}' metavariable declaration...`);\n\n  const metavariableVVerified = verifyMetavariable(metavariableNode, metaTypeNode, fileContext);\n\n  metavariableDeclarationVerified = metavariableVVerified;  ///\n\n  if (metavariableDeclarationVerified) {\n    fileContext.debug(`...verified the '${metavariableString}:${metaTypeString}' metavariable declaration.`);\n  }\n\n  return metavariableDeclarationVerified;\n}\n\nfunction verifyMetavariable(metavariableNode, metaTypeNode, fileContext) {\n  let metavariableVerified = false;\n\n  const metavariableString = fileContext.nodeAsString(metavariableNode);\n\n  fileContext.trace(`Verifying the '${metavariableString}' metavariable...`);\n\n  const metavariablePresent = fileContext.isMetavariablePresentByMetavariableNode(metavariableNode);\n\n  if (metavariablePresent) {\n    fileContext.debug(`The metavariable '${metavariableString}' is already present.`);\n  } else {\n    const termTypes = [],\n          metaTypes = [],\n          argumentNode = argumentNodeQuery(metavariableNode),\n          argumentVerified = verifyArgument(argumentNode, termTypes, fileContext),\n          metaTypeVerified = verifyMetaType(metaTypeNode, metaTypes, fileContext);\n\n    if (argumentVerified && metaTypeVerified) {\n      let metaType;\n\n      const firstMetaType = first(metaTypes);\n\n      metaType = firstMetaType; ///\n\n      const metavariable = Metavariable.fromMetavariableNodeAndMetaType(metavariableNode, metaType, fileContext),\n            metavariableAssignment = MetavariableAssignment.fromMetavariable(metavariable),\n            metavariableAssigned = metavariableAssignment.assign(fileContext);\n\n      if (metavariableAssigned) {\n        metavariableVerified = true;\n      }\n    }\n  }\n\n  if (metavariableVerified) {\n    fileContext.debug(`...verified the '${metavariableString}' metavariable.`);\n  }\n\n  return metavariableVerified;\n}\n\nfunction verifyArgument(argumentNode, termTypes, fileContext) {\n  let argumentVerified = false;\n\n  if (argumentNode === null) {\n    argumentVerified = true;\n  } else {\n    const termNode = termNodeQuery(argumentNode);\n\n    if (termNode === null) {\n\n    } else {\n      const termString = fileContext.nodeAsString(termNode);\n\n      fileContext.debug(`The '${termString}' term was found when a type should have been present.`);\n    }\n    const typeNode = typeNodeQuery(argumentNode);\n\n    if (typeNode !== null) {\n      const type = fileContext.findTypeByTypeNode(typeNode);\n\n      if (type !== null) {\n        const termType = type;  ///\n\n        termTypes.push(termType);\n\n        argumentVerified = true;\n      } else {\n        const typeString = fileContext.nodeAsString(typeNode);\n\n        fileContext.debug(`The '${typeString}' type is not present.`);\n      }\n    }\n  }\n\n  return argumentVerified;\n}\n\nfunction verifyMetaType(metaTypeNode, metaTypes, fileContext) {\n  let metaTypeVerified;\n\n  const metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode);\n\n  metaTypes.push(metaType);\n\n  metaTypeVerified = true;\n\n  return metaTypeVerified;\n}"],"names":["verifyMetavariableDeclaration","termNodeQuery","nodeQuery","typeNodeQuery","argumentNodeQuery","metaTypeNodeQuery","metavariableNodeQuery","metavariableDeclarationNode","fileContext","metavariableDeclarationVerified","metaTypeNode","metavariableNode","metaTypeString","nodeAsString","metavariableString","trace","metavariableVVerified","verifyMetavariable","debug","metavariableVerified","metavariablePresent","isMetavariablePresentByMetavariableNode","termTypes","metaTypes","argumentNode","argumentVerified","verifyArgument","metaTypeVerified","verifyMetaType","metaType","firstMetaType","first","metavariable","Metavariable","fromMetavariableNodeAndMetaType","metavariableAssignment","MetavariableAssignment","fromMetavariable","metavariableAssigned","assign","termNode","termString","typeNode","type","findTypeByTypeNode","termType","push","typeString","findMetaTypeByMetaTypeNode"],"mappings":"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"}

package/src/verify/declaration/metavariable.js

@@ -1,125 +0,0 @@
-"use strict";
-
-import Metavariable from "../../metavariable";
-import MetavariableAssignment from "../../assignment/metavariable";
-
-import { first } from "../../utilities/array";
-import { nodeQuery } from "../../utilities/query";
-
-const termNodeQuery = nodeQuery("/argument/term"),
-      typeNodeQuery = nodeQuery("/argument/type"),
-      argumentNodeQuery = nodeQuery("/metavariable/argument!"),
-      metaTypeNodeQuery = nodeQuery("/metavariableDeclaration/metaType"),
-      metavariableNodeQuery = nodeQuery("/metavariableDeclaration/metavariable");
-
-export default function verifyMetavariableDeclaration(metavariableDeclarationNode, fileContext) {
-  let metavariableDeclarationVerified;
-
-  const metaTypeNode = metaTypeNodeQuery(metavariableDeclarationNode),
-        metavariableNode = metavariableNodeQuery(metavariableDeclarationNode),
-        metaTypeString = fileContext.nodeAsString(metaTypeNode),
-        metavariableString = fileContext.nodeAsString(metavariableNode);
-
-  fileContext.trace(`Verifying the '${metavariableString}:${metaTypeString}' metavariable declaration...`);
-
-  const metavariableVVerified = verifyMetavariable(metavariableNode, metaTypeNode, fileContext);
-
-  metavariableDeclarationVerified = metavariableVVerified;  ///
-
-  if (metavariableDeclarationVerified) {
-    fileContext.debug(`...verified the '${metavariableString}:${metaTypeString}' metavariable declaration.`);
-  }
-
-  return metavariableDeclarationVerified;
-}
-
-function verifyMetavariable(metavariableNode, metaTypeNode, fileContext) {
-  let metavariableVerified = false;
-
-  const metavariableString = fileContext.nodeAsString(metavariableNode);
-
-  fileContext.trace(`Verifying the '${metavariableString}' metavariable...`);
-
-  const metavariablePresent = fileContext.isMetavariablePresentByMetavariableNode(metavariableNode);
-
-  if (metavariablePresent) {
-    fileContext.debug(`The metavariable '${metavariableString}' is already present.`);
-  } else {
-    const termTypes = [],
-          metaTypes = [],
-          argumentNode = argumentNodeQuery(metavariableNode),
-          argumentVerified = verifyArgument(argumentNode, termTypes, fileContext),
-          metaTypeVerified = verifyMetaType(metaTypeNode, metaTypes, fileContext);
-
-    if (argumentVerified && metaTypeVerified) {
-      let metaType;
-
-      const firstMetaType = first(metaTypes);
-
-      metaType = firstMetaType; ///
-
-      const metavariable = Metavariable.fromMetavariableNodeAndMetaType(metavariableNode, metaType, fileContext),
-            metavariableAssignment = MetavariableAssignment.fromMetavariable(metavariable),
-            metavariableAssigned = metavariableAssignment.assign(fileContext);
-
-      if (metavariableAssigned) {
-        metavariableVerified = true;
-      }
-    }
-  }
-
-  if (metavariableVerified) {
-    fileContext.debug(`...verified the '${metavariableString}' metavariable.`);
-  }
-
-  return metavariableVerified;
-}
-
-function verifyArgument(argumentNode, termTypes, fileContext) {
-  let argumentVerified = false;
-
-  if (argumentNode === null) {
-    argumentVerified = true;
-  } else {
-    const termNode = termNodeQuery(argumentNode);
-
-    if (termNode === null) {
-
-    } else {
-      const termString = fileContext.nodeAsString(termNode);
-
-      fileContext.debug(`The '${termString}' term was found when a type should have been present.`);
-    }
-    const typeNode = typeNodeQuery(argumentNode);
-
-    if (typeNode !== null) {
-      const type = fileContext.findTypeByTypeNode(typeNode);
-
-      if (type !== null) {
-        const termType = type;  ///
-
-        termTypes.push(termType);
-
-        argumentVerified = true;
-      } else {
-        const typeString = fileContext.nodeAsString(typeNode);
-
-        fileContext.debug(`The '${typeString}' type is not present.`);
-      }
-    }
-  }
-
-  return argumentVerified;
-}
-
-function verifyMetaType(metaTypeNode, metaTypes, fileContext) {
-  let metaTypeVerified;
-
-  const metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode);
-
-  metaTypes.push(metaType);
-
-  metaTypeVerified = true;
-
-  return metaTypeVerified;
-}