occam-verify-cli 0.0.317 → 0.0.319

package/src/verify/unconditionalInference.js

@@ -8,12 +8,14 @@ import { nodeQuery } from "../utilities/query";
 const metastatementNodeQuery = nodeQuery("/unconditionalInference/unqualifiedMetastatement!/metastatement!"),
       unqualifiedMetastatementNodeQuery = nodeQuery("/unconditionalInference/unqualifiedMetastatement!");
 
-export default function verifyUnconditionalInference(unconditionalInferenceNode, premises, conclusions, context) {
+export default function verifyUnconditionalInference(unconditionalInferenceNode, premises, conclusions, metaproofContext) {
   let unconditionalInferenceVerified = false;
 
+  metaproofContext.begin(unconditionalInferenceNode);
+
   const metastatementNode = metastatementNodeQuery(unconditionalInferenceNode),
         unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(unconditionalInferenceNode),
-        unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, context);
+        unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
 
   if (unqualifiedMetastatementVerified) {
     const conclusion = Conclusion.fromMetastatementNode(metastatementNode);
@@ -23,5 +25,9 @@ export default function verifyUnconditionalInference(unconditionalInferenceNode,
     unconditionalInferenceVerified = true;
   }
 
+  unconditionalInferenceVerified ?
+    metaproofContext.complete(unconditionalInferenceNode) :
+      metaproofContext.halt(unconditionalInferenceNode);
+
   return unconditionalInferenceVerified;
 }

package/src/verify/variable.js

@@ -2,19 +2,22 @@
 
 import Variable from "../variable";
 
+import { nodeAsString } from "../utilities/string";
 import { typeNameFromTypeNode, variableNameFromVariableNode } from "../utilities/query";
 
-export default function verifyVariable(variableNode, typeNode, context) {
+export default function verifyVariable(variableNode, typeNode, fileContext) {
   let variableVerified = false;
 
+  fileContext.begin(variableNode);
+
+  let variable = null;
+
   const variableName = variableNameFromVariableNode(variableNode),
-        variablePresent = context.isVariablePresentByVariableName(variableName);
+        variablePresent = fileContext.isVariablePresentByVariableName(variableName);
 
   if (variablePresent) {
-    context.error(`The variable '${variableName}' is already present.`, variableNode);
+    fileContext.error(`The variable '${variableName}' is already present.`);
   } else {
-    let variable = null;
-
     const typeName = typeNameFromTypeNode(typeNode);
     
     if (typeName === null) {
@@ -23,10 +26,10 @@ export default function verifyVariable(variableNode, typeNode, context) {
 
       variable = Variable.fromTypeAndName(type, name);
     } else {
-      const type = context.findTypeByTypeName(typeName);
+      const type = fileContext.findTypeByTypeName(typeName);
 
       if (type === null) {
-        context.error(`The '${variableName}' variable's '${typeName}' type is missing.`, variableNode);
+        fileContext.error(`The '${variableName}' variable's '${typeName}' type is missing.`);
       } else {
         const name = variableName;  ///
 
@@ -35,15 +38,19 @@ export default function verifyVariable(variableNode, typeNode, context) {
     }
 
     if (variable !== null) {
-      const variableString = variable.asString();
+      const variableString = nodeAsString(variableName);
 
-      context.addVariable(variable);
+      fileContext.info(`Verified the '${variableString}' variable.`);
 
-      variableVerified = true;
+      fileContext.addVariable(variable);
 
-      context.info(`Verified the '${variableString}' variable.`, variableNode);
+      variableVerified = true;
     }
   }
 
+  variableVerified ?
+    fileContext.complete(variableNode) :
+      fileContext.halt(variableNode);
+
   return variableVerified;
 }

package/lib/mixins/log.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-var _necessary = require("necessary");
-var TRACE_LEVEL = _necessary.levels.TRACE_LEVEL, DEBUG_LEVEL = _necessary.levels.DEBUG_LEVEL, INFO_LEVEL = _necessary.levels.INFO_LEVEL, WARNING_LEVEL = _necessary.levels.WARNING_LEVEL, ERROR_LEVEL = _necessary.levels.ERROR_LEVEL, FATAL_LEVEL = _necessary.levels.FATAL_LEVEL;
-function trace(message) {
-    this.log(TRACE_LEVEL, message);
-}
-function debug(message) {
-    this.log(DEBUG_LEVEL, message);
-}
-function info(message) {
-    this.log(INFO_LEVEL, message);
-}
-function warning(message) {
-    this.log(WARNING_LEVEL, message);
-}
-function error(message) {
-    this.log(ERROR_LEVEL, message);
-}
-function fatal(message) {
-    this.log(FATAL_LEVEL, message);
-}
-var logMixins = {
-    trace: trace,
-    debug: debug,
-    info: info,
-    warning: warning,
-    error: error,
-    fatal: fatal
-};
-var _default = logMixins;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9taXhpbnMvbG9nLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBsZXZlbHMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmNvbnN0IHsgVFJBQ0VfTEVWRUwsIERFQlVHX0xFVkVMLCBJTkZPX0xFVkVMLCBXQVJOSU5HX0xFVkVMLCBFUlJPUl9MRVZFTCwgRkFUQUxfTEVWRUwgfSA9IGxldmVscztcblxuZnVuY3Rpb24gdHJhY2UobWVzc2FnZSkgeyB0aGlzLmxvZyhUUkFDRV9MRVZFTCwgbWVzc2FnZSk7IH1cblxuZnVuY3Rpb24gZGVidWcobWVzc2FnZSkgeyB0aGlzLmxvZyhERUJVR19MRVZFTCwgbWVzc2FnZSk7IH1cblxuZnVuY3Rpb24gaW5mbyhtZXNzYWdlKSB7IHRoaXMubG9nKElORk9fTEVWRUwsIG1lc3NhZ2UpOyB9XG5cbmZ1bmN0aW9uIHdhcm5pbmcobWVzc2FnZSkgeyB0aGlzLmxvZyhXQVJOSU5HX0xFVkVMLCBtZXNzYWdlKTsgfVxuXG5mdW5jdGlvbiBlcnJvcihtZXNzYWdlKSB7IHRoaXMubG9nKEVSUk9SX0xFVkVMLCBtZXNzYWdlKTsgfVxuXG5mdW5jdGlvbiBmYXRhbChtZXNzYWdlKSB7IHRoaXMubG9nKEZBVEFMX0xFVkVMLCBtZXNzYWdlKTsgfVxuXG5jb25zdCBsb2dNaXhpbnMgPSB7XG4gIHRyYWNlLFxuICBkZWJ1ZyxcbiAgaW5mbyxcbiAgd2FybmluZyxcbiAgZXJyb3IsXG4gIGZhdGFsXG59O1xuXG5leHBvcnQgZGVmYXVsdCBsb2dNaXhpbnM7XG4iXSwibmFtZXMiOlsiVFJBQ0VfTEVWRUwiLCJsZXZlbHMiLCJERUJVR19MRVZFTCIsIklORk9fTEVWRUwiLCJXQVJOSU5HX0xFVkVMIiwiRVJST1JfTEVWRUwiLCJGQVRBTF9MRVZFTCIsInRyYWNlIiwibWVzc2FnZSIsImxvZyIsImRlYnVnIiwiaW5mbyIsIndhcm5pbmciLCJlcnJvciIsImZhdGFsIiwibG9nTWl4aW5zIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkEyQkE7OztlQUFBOzs7eUJBekJ1QjtBQUV2QixJQUFRQSxjQUFrRkMsaUJBQU0sQ0FBeEZELGFBQWFFLGNBQXFFRCxpQkFBTSxDQUEzRUMsYUFBYUMsYUFBd0RGLGlCQUFNLENBQTlERSxZQUFZQyxnQkFBNENILGlCQUFNLENBQWxERyxlQUFlQyxjQUE2QkosaUJBQU0sQ0FBbkNJLGFBQWFDLGNBQWdCTCxpQkFBTSxDQUF0Qks7QUFFMUUsU0FBU0MsTUFBTUMsT0FBTyxFQUFFO0lBQUUsSUFBSSxDQUFDQyxHQUFHLENBQUNULGFBQWFRO0FBQVU7QUFFMUQsU0FBU0UsTUFBTUYsT0FBTyxFQUFFO0lBQUUsSUFBSSxDQUFDQyxHQUFHLENBQUNQLGFBQWFNO0FBQVU7QUFFMUQsU0FBU0csS0FBS0gsT0FBTyxFQUFFO0lBQUUsSUFBSSxDQUFDQyxHQUFHLENBQUNOLFlBQVlLO0FBQVU7QUFFeEQsU0FBU0ksUUFBUUosT0FBTyxFQUFFO0lBQUUsSUFBSSxDQUFDQyxHQUFHLENBQUNMLGVBQWVJO0FBQVU7QUFFOUQsU0FBU0ssTUFBTUwsT0FBTyxFQUFFO0lBQUUsSUFBSSxDQUFDQyxHQUFHLENBQUNKLGFBQWFHO0FBQVU7QUFFMUQsU0FBU00sTUFBTU4sT0FBTyxFQUFFO0lBQUUsSUFBSSxDQUFDQyxHQUFHLENBQUNILGFBQWFFO0FBQVU7QUFFMUQsSUFBTU8sWUFBWTtJQUNoQlIsT0FBQUE7SUFDQUcsT0FBQUE7SUFDQUMsTUFBQUE7SUFDQUMsU0FBQUE7SUFDQUMsT0FBQUE7SUFDQUMsT0FBQUE7QUFDRjtJQUVBLFdBQWVDIn0=

package/lib/verify/supposition.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifySupposition;
-    }
-});
-var _assertion = /*#__PURE__*/ _interopRequireDefault(require("../assertion"));
-var _unqualified = /*#__PURE__*/ _interopRequireDefault(require("../verify/statement/unqualified"));
-var _query = require("../utilities/query");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var unqualifiedStatementNodeQuery = (0, _query.nodeQuery)("/supposition/unqualifiedStatement!");
-function verifySupposition(suppositionNode, suppositions, context) {
-    var unqualifiedStatementNode = unqualifiedStatementNodeQuery(suppositionNode), unqualifiedStatementVerified = (0, _unqualified.default)(unqualifiedStatementNode, context), suppositionVerified = unqualifiedStatementVerified;
-    if (suppositionVerified) {
-        var supposition = _assertion.default.fromUnqualifiedStatementNode(unqualifiedStatementNode);
-        suppositions.push(supposition);
-    }
-    return suppositionVerified;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3VwcG9zaXRpb24uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBBc3NlcnRpb24gZnJvbSBcIi4uL2Fzc2VydGlvblwiO1xuaW1wb3J0IHZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50IGZyb20gXCIuLi92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvc3VwcG9zaXRpb24vdW5xdWFsaWZpZWRTdGF0ZW1lbnQhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlTdXBwb3NpdGlvbihzdXBwb3NpdGlvbk5vZGUsIHN1cHBvc2l0aW9ucywgY29udGV4dCkge1xuICBjb25zdCB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUgPSB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVRdWVyeShzdXBwb3NpdGlvbk5vZGUpLFxuICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlLCBjb250ZXh0KSxcbiAgICAgICAgc3VwcG9zaXRpb25WZXJpZmllZCA9IHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQ7XG5cbiAgaWYgKHN1cHBvc2l0aW9uVmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdXBwb3NpdGlvbiA9IEFzc2VydGlvbi5mcm9tVW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSk7XG5cbiAgICBzdXBwb3NpdGlvbnMucHVzaChzdXBwb3NpdGlvbik7XG4gIH1cblxuICByZXR1cm4gc3VwcG9zaXRpb25WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdXBwb3NpdGlvbiIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3VwcG9zaXRpb25Ob2RlIiwic3VwcG9zaXRpb25zIiwiY29udGV4dCIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCIsInN1cHBvc2l0aW9uVmVyaWZpZWQiLCJzdXBwb3NpdGlvbiIsIkFzc2VydGlvbiIsImZyb21VbnF1YWxpZmllZFN0YXRlbWVudE5vZGUiLCJwdXNoIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFTQTs7O2VBQXdCQTs7OzhEQVBGO2dFQUNpQjtxQkFFYjs7Ozs7O0FBRTFCLElBQU1DLGdDQUFnQ0MsSUFBQUEsZ0JBQVMsRUFBQztBQUVqQyxTQUFTRixrQkFBa0JHLGVBQWUsRUFBRUMsWUFBWSxFQUFFQyxPQUFPLEVBQUU7SUFDaEYsSUFBTUMsMkJBQTJCTCw4QkFBOEJFLGtCQUN6REksK0JBQStCQyxJQUFBQSxvQkFBMEIsRUFBQ0YsMEJBQTBCRCxVQUNwRkksc0JBQXNCRjtJQUU1QixJQUFJRSxxQkFBcUI7UUFDdkIsSUFBTUMsY0FBY0Msa0JBQVMsQ0FBQ0MsNEJBQTRCLENBQUNOO1FBRTNERixhQUFhUyxJQUFJLENBQUNIO0lBQ3BCLENBQUM7SUFFRCxPQUFPRDtBQUNUIn0=

package/src/mixins/log.js

@@ -1,28 +0,0 @@
-"use strict";
-
-import { levels } from "necessary";
-
-const { TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL, FATAL_LEVEL } = levels;
-
-function trace(message) { this.log(TRACE_LEVEL, message); }
-
-function debug(message) { this.log(DEBUG_LEVEL, message); }
-
-function info(message) { this.log(INFO_LEVEL, message); }
-
-function warning(message) { this.log(WARNING_LEVEL, message); }
-
-function error(message) { this.log(ERROR_LEVEL, message); }
-
-function fatal(message) { this.log(FATAL_LEVEL, message); }
-
-const logMixins = {
-  trace,
-  debug,
-  info,
-  warning,
-  error,
-  fatal
-};
-
-export default logMixins;

package/src/verify/supposition.js

@@ -1,22 +0,0 @@
-"use strict";
-
-import Assertion from "../assertion";
-import verifyUnqualifiedStatement from "../verify/statement/unqualified";
-
-import { nodeQuery } from "../utilities/query";
-
-const unqualifiedStatementNodeQuery = nodeQuery("/supposition/unqualifiedStatement!");
-
-export default function verifySupposition(suppositionNode, suppositions, context) {
-  const unqualifiedStatementNode = unqualifiedStatementNodeQuery(suppositionNode),
-        unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, context),
-        suppositionVerified = unqualifiedStatementVerified;
-
-  if (suppositionVerified) {
-    const supposition = Assertion.fromUnqualifiedStatementNode(unqualifiedStatementNode);
-
-    suppositions.push(supposition);
-  }
-
-  return suppositionVerified;
-}