occam-verify-cli 0.0.401 → 0.0.403

package/lib/verify/unconditionalInference.js

@@ -8,26 +8,21 @@ Object.defineProperty(exports, "default", {
         return verifyUnconditionalInference;
     }
 });
-var _conclusion = /*#__PURE__*/ _interopRequireDefault(require("../conclusion"));
-var _unqualified = /*#__PURE__*/ _interopRequireDefault(require("../verify/metastatement/unqualified"));
+var _conclusion = /*#__PURE__*/ _interopRequireDefault(require("../verify/conclusion"));
 var _query = require("../utilities/query");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-var metastatementNodeQuery = (0, _query.nodeQuery)("/unconditionalInference/unqualifiedMetastatement!/metastatement!"), unqualifiedMetastatementNodeQuery = (0, _query.nodeQuery)("/unconditionalInference/unqualifiedMetastatement!");
-function verifyUnconditionalInference(unconditionalInferenceNode, premises, conclusions, metaproofContext) {
-    var unconditionalInferenceVerified = false;
-    metaproofContext.begin(unconditionalInferenceNode);
-    var metastatementNode = metastatementNodeQuery(unconditionalInferenceNode), unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(unconditionalInferenceNode), unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, metaproofContext);
-    if (unqualifiedMetastatementVerified) {
-        var conclusion = _conclusion.default.fromMetastatementNode(metastatementNode);
-        conclusions.push(conclusion);
-        unconditionalInferenceVerified = true;
-    }
-    unconditionalInferenceVerified ? metaproofContext.complete(unconditionalInferenceNode) : metaproofContext.halt(unconditionalInferenceNode);
+var conclusionNodeQuery = (0, _query.nodeQuery)("/unconditionalInference/conclusion!");
+function verifyUnconditionalInference(conditionalInferenceNode, conclusions, metaproofContext) {
+    var unconditionalInferenceVerified;
+    metaproofContext.begin(conditionalInferenceNode);
+    var conclusionNode = conclusionNodeQuery(conditionalInferenceNode), conclusionVerified = (0, _conclusion.default)(conclusionNode, conclusions, metaproofContext);
+    unconditionalInferenceVerified = conclusionVerified; ///
+    unconditionalInferenceVerified ? metaproofContext.complete(conditionalInferenceNode) : metaproofContext.halt(conditionalInferenceNode);
     return unconditionalInferenceVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdW5jb25kaXRpb25hbEluZmVyZW5jZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IENvbmNsdXNpb24gZnJvbSBcIi4uL2NvbmNsdXNpb25cIjtcbmltcG9ydCB2ZXJpZnlVbnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQgZnJvbSBcIi4uL3ZlcmlmeS9tZXRhc3RhdGVtZW50L3VucXVhbGlmaWVkXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgbWV0YXN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bmNvbmRpdGlvbmFsSW5mZXJlbmNlL3VucXVhbGlmaWVkTWV0YXN0YXRlbWVudCEvbWV0YXN0YXRlbWVudCFcIiksXG4gICAgICB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5jb25kaXRpb25hbEluZmVyZW5jZS91bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlVbmNvbmRpdGlvbmFsSW5mZXJlbmNlKHVuY29uZGl0aW9uYWxJbmZlcmVuY2VOb2RlLCBwcmVtaXNlcywgY29uY2x1c2lvbnMsIG1ldGFwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHVuY29uZGl0aW9uYWxJbmZlcmVuY2VWZXJpZmllZCA9IGZhbHNlO1xuXG4gIG1ldGFwcm9vZkNvbnRleHQuYmVnaW4odW5jb25kaXRpb25hbEluZmVyZW5jZU5vZGUpO1xuXG4gIGNvbnN0IG1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXN0YXRlbWVudE5vZGVRdWVyeSh1bmNvbmRpdGlvbmFsSW5mZXJlbmNlTm9kZSksXG4gICAgICAgIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUgPSB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlUXVlcnkodW5jb25kaXRpb25hbEluZmVyZW5jZU5vZGUpLFxuICAgICAgICB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnRWZXJpZmllZCA9IHZlcmlmeVVucXVhbGlmaWVkTWV0YXN0YXRlbWVudCh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlLCBtZXRhcHJvb2ZDb250ZXh0KTtcblxuICBpZiAodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBjb25zdCBjb25jbHVzaW9uID0gQ29uY2x1c2lvbi5mcm9tTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgY29uY2x1c2lvbnMucHVzaChjb25jbHVzaW9uKTtcblxuICAgIHVuY29uZGl0aW9uYWxJbmZlcmVuY2VWZXJpZmllZCA9IHRydWU7XG4gIH1cblxuICB1bmNvbmRpdGlvbmFsSW5mZXJlbmNlVmVyaWZpZWQgP1xuICAgIG1ldGFwcm9vZkNvbnRleHQuY29tcGxldGUodW5jb25kaXRpb25hbEluZmVyZW5jZU5vZGUpIDpcbiAgICAgIG1ldGFwcm9vZkNvbnRleHQuaGFsdCh1bmNvbmRpdGlvbmFsSW5mZXJlbmNlTm9kZSk7XG5cbiAgcmV0dXJuIHVuY29uZGl0aW9uYWxJbmZlcmVuY2VWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlVbmNvbmRpdGlvbmFsSW5mZXJlbmNlIiwibWV0YXN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGVRdWVyeSIsInVuY29uZGl0aW9uYWxJbmZlcmVuY2VOb2RlIiwicHJlbWlzZXMiLCJjb25jbHVzaW9ucyIsIm1ldGFwcm9vZkNvbnRleHQiLCJ1bmNvbmRpdGlvbmFsSW5mZXJlbmNlVmVyaWZpZWQiLCJiZWdpbiIsIm1ldGFzdGF0ZW1lbnROb2RlIiwidW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSIsInVucXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkIiwidmVyaWZ5VW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50IiwiY29uY2x1c2lvbiIsIkNvbmNsdXNpb24iLCJmcm9tTWV0YXN0YXRlbWVudE5vZGUiLCJwdXNoIiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFVQTs7O2VBQXdCQTs7OytEQVJEO2dFQUNvQjtxQkFFakI7Ozs7OztBQUUxQixJQUFNQyx5QkFBeUJDLElBQUFBLGdCQUFTLEVBQUMscUVBQ25DQyxvQ0FBb0NELElBQUFBLGdCQUFTLEVBQUM7QUFFckMsU0FBU0YsNkJBQTZCSSwwQkFBMEIsRUFBRUMsUUFBUSxFQUFFQyxXQUFXLEVBQUVDLGdCQUFnQixFQUFFO0lBQ3hILElBQUlDLGlDQUFpQyxLQUFLO0lBRTFDRCxpQkFBaUJFLEtBQUssQ0FBQ0w7SUFFdkIsSUFBTU0sb0JBQW9CVCx1QkFBdUJHLDZCQUMzQ08sK0JBQStCUixrQ0FBa0NDLDZCQUNqRVEsbUNBQW1DQyxJQUFBQSxvQkFBOEIsRUFBQ0YsOEJBQThCSjtJQUV0RyxJQUFJSyxrQ0FBa0M7UUFDcEMsSUFBTUUsYUFBYUMsbUJBQVUsQ0FBQ0MscUJBQXFCLENBQUNOO1FBRXBESixZQUFZVyxJQUFJLENBQUNIO1FBRWpCTixpQ0FBaUMsSUFBSTtJQUN2QyxDQUFDO0lBRURBLGlDQUNFRCxpQkFBaUJXLFFBQVEsQ0FBQ2QsOEJBQ3hCRyxpQkFBaUJZLElBQUksQ0FBQ2YsMkJBQTJCO0lBRXJELE9BQU9JO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdW5jb25kaXRpb25hbEluZmVyZW5jZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHZlcmlmeUNvbmNsdXNpb24gZnJvbSBcIi4uL3ZlcmlmeS9jb25jbHVzaW9uXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgY29uY2x1c2lvbk5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bmNvbmRpdGlvbmFsSW5mZXJlbmNlL2NvbmNsdXNpb24hXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlVbmNvbmRpdGlvbmFsSW5mZXJlbmNlKGNvbmRpdGlvbmFsSW5mZXJlbmNlTm9kZSwgY29uY2x1c2lvbnMsIG1ldGFwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHVuY29uZGl0aW9uYWxJbmZlcmVuY2VWZXJpZmllZDtcblxuICBtZXRhcHJvb2ZDb250ZXh0LmJlZ2luKGNvbmRpdGlvbmFsSW5mZXJlbmNlTm9kZSk7XG5cbiAgY29uc3QgY29uY2x1c2lvbk5vZGUgPSBjb25jbHVzaW9uTm9kZVF1ZXJ5KGNvbmRpdGlvbmFsSW5mZXJlbmNlTm9kZSksXG4gICAgICAgIGNvbmNsdXNpb25WZXJpZmllZCA9IHZlcmlmeUNvbmNsdXNpb24oY29uY2x1c2lvbk5vZGUsIGNvbmNsdXNpb25zLCBtZXRhcHJvb2ZDb250ZXh0KTtcblxuICB1bmNvbmRpdGlvbmFsSW5mZXJlbmNlVmVyaWZpZWQgPSBjb25jbHVzaW9uVmVyaWZpZWQ7ICAvLy9cblxuICB1bmNvbmRpdGlvbmFsSW5mZXJlbmNlVmVyaWZpZWQgP1xuICAgIG1ldGFwcm9vZkNvbnRleHQuY29tcGxldGUoY29uZGl0aW9uYWxJbmZlcmVuY2VOb2RlKSA6XG4gICAgICBtZXRhcHJvb2ZDb250ZXh0LmhhbHQoY29uZGl0aW9uYWxJbmZlcmVuY2VOb2RlKTtcblxuICByZXR1cm4gdW5jb25kaXRpb25hbEluZmVyZW5jZVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVVuY29uZGl0aW9uYWxJbmZlcmVuY2UiLCJjb25jbHVzaW9uTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiY29uZGl0aW9uYWxJbmZlcmVuY2VOb2RlIiwiY29uY2x1c2lvbnMiLCJtZXRhcHJvb2ZDb250ZXh0IiwidW5jb25kaXRpb25hbEluZmVyZW5jZVZlcmlmaWVkIiwiYmVnaW4iLCJjb25jbHVzaW9uTm9kZSIsImNvbmNsdXNpb25WZXJpZmllZCIsInZlcmlmeUNvbmNsdXNpb24iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFBOzs7ZUFBd0JBOzs7K0RBTks7cUJBRUg7Ozs7OztBQUUxQixJQUFNQyxzQkFBc0JDLElBQUFBLGdCQUFTLEVBQUM7QUFFdkIsU0FBU0YsNkJBQTZCRyx3QkFBd0IsRUFBRUMsV0FBVyxFQUFFQyxnQkFBZ0IsRUFBRTtJQUM1RyxJQUFJQztJQUVKRCxpQkFBaUJFLEtBQUssQ0FBQ0o7SUFFdkIsSUFBTUssaUJBQWlCUCxvQkFBb0JFLDJCQUNyQ00scUJBQXFCQyxJQUFBQSxtQkFBZ0IsRUFBQ0YsZ0JBQWdCSixhQUFhQztJQUV6RUMsaUNBQWlDRyxvQkFBcUIsR0FBRztJQUV6REgsaUNBQ0VELGlCQUFpQk0sUUFBUSxDQUFDUiw0QkFDeEJFLGlCQUFpQk8sSUFBSSxDQUFDVCx5QkFBeUI7SUFFbkQsT0FBT0c7QUFDVCJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.401",
+  "version": "0.0.403",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -14,7 +14,7 @@
     "necessary": "^11.1.11",
     "occam-custom-grammars": "^5.0.360",
     "occam-dom": "^3.0.171",
-    "occam-file-system": "^5.0.84",
+    "occam-file-system": "^5.0.85",
     "occam-grammar-utilities": "^7.0.66"
   },
   "devDependencies": {

package/src/verify/unconditionalInference.js

@@ -1,33 +1,24 @@
 "use strict";
 
-import Conclusion from "../conclusion";
-import verifyUnqualifiedMetastatement from "../verify/metastatement/unqualified";
+import verifyConclusion from "../verify/conclusion";
 
 import { nodeQuery } from "../utilities/query";
 
-const metastatementNodeQuery = nodeQuery("/unconditionalInference/unqualifiedMetastatement!/metastatement!"),
-      unqualifiedMetastatementNodeQuery = nodeQuery("/unconditionalInference/unqualifiedMetastatement!");
+const conclusionNodeQuery = nodeQuery("/unconditionalInference/conclusion!");
 
-export default function verifyUnconditionalInference(unconditionalInferenceNode, premises, conclusions, metaproofContext) {
-  let unconditionalInferenceVerified = false;
+export default function verifyUnconditionalInference(conditionalInferenceNode, conclusions, metaproofContext) {
+  let unconditionalInferenceVerified;
 
-  metaproofContext.begin(unconditionalInferenceNode);
+  metaproofContext.begin(conditionalInferenceNode);
 
-  const metastatementNode = metastatementNodeQuery(unconditionalInferenceNode),
-        unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(unconditionalInferenceNode),
-        unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, metaproofContext);
+  const conclusionNode = conclusionNodeQuery(conditionalInferenceNode),
+        conclusionVerified = verifyConclusion(conclusionNode, conclusions, metaproofContext);
 
-  if (unqualifiedMetastatementVerified) {
-    const conclusion = Conclusion.fromMetastatementNode(metastatementNode);
-
-    conclusions.push(conclusion);
-
-    unconditionalInferenceVerified = true;
-  }
+  unconditionalInferenceVerified = conclusionVerified;  ///
 
   unconditionalInferenceVerified ?
-    metaproofContext.complete(unconditionalInferenceNode) :
-      metaproofContext.halt(unconditionalInferenceNode);
+    metaproofContext.complete(conditionalInferenceNode) :
+      metaproofContext.halt(conditionalInferenceNode);
 
   return unconditionalInferenceVerified;
 }