occam-verify-cli 0.0.467 → 0.0.469

package/lib/verify/antecedent.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return verifyAntecedent;
+    }
+});
+var _assertion = /*#__PURE__*/ _interopRequireDefault(require("../assertion"));
+var _antecedent = /*#__PURE__*/ _interopRequireDefault(require("../antecedent"));
+var _unqualified = /*#__PURE__*/ _interopRequireDefault(require("../verify/statement/unqualified"));
+var _query = require("../utilities/query");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+var statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement"), unqualifiedStatementNodeQuery = (0, _query.nodeQuery)("/antecedent/unqualifiedStatement");
+function verifyAntecedent(antecedentNode, antecedents, proofContext) {
+    var antecedentOrAntecedentsVerified;
+    proofContext.begin(antecedentNode);
+    var unqualifiedStatementNode = unqualifiedStatementNodeQuery(antecedentNode), unqualifiedStatementVerified = (0, _unqualified.default)(unqualifiedStatementNode, proofContext);
+    if (unqualifiedStatementVerified) {
+        var statementNode = statementNodeQuery(unqualifiedStatementNode), assertion = _assertion.default.fromUnqualifiedStatementNode(unqualifiedStatementNode), antecedent = _antecedent.default.fromStatementNode(statementNode);
+        antecedents.push(antecedent);
+        proofContext.addAssertion(assertion);
+        antecedentOrAntecedentsVerified = true;
+    }
+    antecedentOrAntecedentsVerified ? proofContext.complete(antecedentNode) : proofContext.halt(antecedentNode);
+    return antecedentOrAntecedentsVerified;
+}
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvYW50ZWNlZGVudC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IEFzc2VydGlvbiBmcm9tIFwiLi4vYXNzZXJ0aW9uXCI7XG5pbXBvcnQgQW50ZWNlZGVudCBmcm9tIFwiLi4vYW50ZWNlZGVudFwiO1xuaW1wb3J0IHZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50IGZyb20gXCIuLi92ZXJpZnkvc3RhdGVtZW50L3VucXVhbGlmaWVkXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3Qgc3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3VucXVhbGlmaWVkU3RhdGVtZW50L3N0YXRlbWVudFwiKSxcbiAgICAgIHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2FudGVjZWRlbnQvdW5xdWFsaWZpZWRTdGF0ZW1lbnRcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeUFudGVjZWRlbnQoYW50ZWNlZGVudE5vZGUsIGFudGVjZWRlbnRzLCBwcm9vZkNvbnRleHQpIHtcbiAgbGV0IGFudGVjZWRlbnRPckFudGVjZWRlbnRzVmVyaWZpZWQ7XG5cbiAgcHJvb2ZDb250ZXh0LmJlZ2luKGFudGVjZWRlbnROb2RlKTtcblxuICBjb25zdCB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUgPSB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVRdWVyeShhbnRlY2VkZW50Tm9kZSksXG4gICAgICAgIHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgaWYgKHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZVF1ZXJ5KHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSksXG4gICAgICAgICAgYXNzZXJ0aW9uID0gQXNzZXJ0aW9uLmZyb21VbnF1YWxpZmllZFN0YXRlbWVudE5vZGUodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKSxcbiAgICAgICAgICBhbnRlY2VkZW50ID0gQW50ZWNlZGVudC5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKTtcblxuICAgIGFudGVjZWRlbnRzLnB1c2goYW50ZWNlZGVudCk7XG5cbiAgICBwcm9vZkNvbnRleHQuYWRkQXNzZXJ0aW9uKGFzc2VydGlvbik7XG5cbiAgICBhbnRlY2VkZW50T3JBbnRlY2VkZW50c1ZlcmlmaWVkID0gdHJ1ZTtcbiAgfVxuXG4gIGFudGVjZWRlbnRPckFudGVjZWRlbnRzVmVyaWZpZWQgP1xuICAgIHByb29mQ29udGV4dC5jb21wbGV0ZShhbnRlY2VkZW50Tm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQoYW50ZWNlZGVudE5vZGUpO1xuXG4gIHJldHVybiBhbnRlY2VkZW50T3JBbnRlY2VkZW50c1ZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeUFudGVjZWRlbnQiLCJzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVRdWVyeSIsImFudGVjZWRlbnROb2RlIiwiYW50ZWNlZGVudHMiLCJwcm9vZkNvbnRleHQiLCJhbnRlY2VkZW50T3JBbnRlY2VkZW50c1ZlcmlmaWVkIiwiYmVnaW4iLCJ1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUiLCJ1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkIiwidmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQiLCJzdGF0ZW1lbnROb2RlIiwiYXNzZXJ0aW9uIiwiQXNzZXJ0aW9uIiwiZnJvbVVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsImFudGVjZWRlbnQiLCJBbnRlY2VkZW50IiwiZnJvbVN0YXRlbWVudE5vZGUiLCJwdXNoIiwiYWRkQXNzZXJ0aW9uIiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFXQTs7O2VBQXdCQTs7OzhEQVRGOytEQUNDO2dFQUNnQjtxQkFFYjs7Ozs7O0FBRTFCLElBQU1DLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQyxvQ0FDL0JDLGdDQUFnQ0QsSUFBQUEsZ0JBQVMsRUFBQztBQUVqQyxTQUFTRixpQkFBaUJJLGNBQWMsRUFBRUMsV0FBVyxFQUFFQyxZQUFZLEVBQUU7SUFDbEYsSUFBSUM7SUFFSkQsYUFBYUUsS0FBSyxDQUFDSjtJQUVuQixJQUFNSywyQkFBMkJOLDhCQUE4QkMsaUJBQ3pETSwrQkFBK0JDLElBQUFBLG9CQUEwQixFQUFDRiwwQkFBMEJIO0lBRTFGLElBQUlJLDhCQUE4QjtRQUNoQyxJQUFNRSxnQkFBZ0JYLG1CQUFtQlEsMkJBQ25DSSxZQUFZQyxrQkFBUyxDQUFDQyw0QkFBNEIsQ0FBQ04sMkJBQ25ETyxhQUFhQyxtQkFBVSxDQUFDQyxpQkFBaUIsQ0FBQ047UUFFaERQLFlBQVljLElBQUksQ0FBQ0g7UUFFakJWLGFBQWFjLFlBQVksQ0FBQ1A7UUFFMUJOLGtDQUFrQyxJQUFJO0lBQ3hDLENBQUM7SUFFREEsa0NBQ0VELGFBQWFlLFFBQVEsQ0FBQ2pCLGtCQUNwQkUsYUFBYWdCLElBQUksQ0FBQ2xCLGVBQWU7SUFFckMsT0FBT0c7QUFDVCJ9

package/lib/verify/conditinalIndicative.js

@@ -9,19 +9,24 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _consequent = /*#__PURE__*/ _interopRequireDefault(require("../verify/consequent"));
-var _antecedentOrAntecedents = /*#__PURE__*/ _interopRequireDefault(require("../verify/antecedentOrAntecedents"));
+var _antecedent = /*#__PURE__*/ _interopRequireDefault(require("../verify/antecedent"));
 var _query = require("../utilities/query");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-var consequentNodeQuery = (0, _query.nodeQuery)("/conditionalIndicative/consequent!"), antecedentOrAntecedentsNodeQuery = (0, _query.nodeQuery)("/conditionalIndicative/antecedent|antecedents!");
+var consequentNodeQuery = (0, _query.nodeQuery)("/conditionalIndicative/consequent!"), antecedentsNodeQuery = (0, _query.nodesQuery)("/conditionalIndicative/antecedent");
 function verifyConditionalIndicative(conditionalIndicativeNode, antecedents, consequents, proofContext) {
     var conditionalIndicativeVerified = false;
     proofContext.begin(conditionalIndicativeNode);
-    var consequentNode = consequentNodeQuery(conditionalIndicativeNode), antecedentOrAntecedentsNode = antecedentOrAntecedentsNodeQuery(conditionalIndicativeNode), antecedentOrAntecedentsVerified = (0, _antecedentOrAntecedents.default)(antecedentOrAntecedentsNode, antecedents, proofContext);
-    if (antecedentOrAntecedentsVerified) {
+    var consequentNode = consequentNodeQuery(conditionalIndicativeNode), antecedentNodes = antecedentsNodeQuery(conditionalIndicativeNode), antecedentsVerified = antecedentNodes.every(function(antecedentNode) {
+        var antecedentVerified = (0, _antecedent.default)(antecedentNode, antecedents, proofContext);
+        if (antecedentVerified) {
+            return true;
+        }
+    });
+    if (antecedentsVerified) {
         var consequentVerified = (0, _consequent.default)(consequentNode, consequents, proofContext);
         conditionalIndicativeVerified = consequentVerified; ///
     }
@@ -29,4 +34,4 @@ function verifyConditionalIndicative(conditionalIndicativeNode, antecedents, con
     return conditionalIndicativeVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvY29uZGl0aW5hbEluZGljYXRpdmUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlDb25zZXF1ZW50IGZyb20gXCIuLi92ZXJpZnkvY29uc2VxdWVudFwiO1xuaW1wb3J0IHZlcmlmeUFudGVjZWRlbnRPckFudGVjZWRlbnRzIGZyb20gXCIuLi92ZXJpZnkvYW50ZWNlZGVudE9yQW50ZWNlZGVudHNcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBjb25zZXF1ZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2NvbmRpdGlvbmFsSW5kaWNhdGl2ZS9jb25zZXF1ZW50IVwiKSxcbiAgICAgIGFudGVjZWRlbnRPckFudGVjZWRlbnRzTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2NvbmRpdGlvbmFsSW5kaWNhdGl2ZS9hbnRlY2VkZW50fGFudGVjZWRlbnRzIVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5Q29uZGl0aW9uYWxJbmRpY2F0aXZlKGNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUsIGFudGVjZWRlbnRzLCBjb25zZXF1ZW50cywgcHJvb2ZDb250ZXh0KSB7XG4gIGxldCBjb25kaXRpb25hbEluZGljYXRpdmVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIHByb29mQ29udGV4dC5iZWdpbihjb25kaXRpb25hbEluZGljYXRpdmVOb2RlKTtcblxuICBjb25zdCBjb25zZXF1ZW50Tm9kZSA9IGNvbnNlcXVlbnROb2RlUXVlcnkoY29uZGl0aW9uYWxJbmRpY2F0aXZlTm9kZSksXG4gICAgICAgIGFudGVjZWRlbnRPckFudGVjZWRlbnRzTm9kZSA9IGFudGVjZWRlbnRPckFudGVjZWRlbnRzTm9kZVF1ZXJ5KGNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUpLFxuICAgICAgICBhbnRlY2VkZW50T3JBbnRlY2VkZW50c1ZlcmlmaWVkID0gdmVyaWZ5QW50ZWNlZGVudE9yQW50ZWNlZGVudHMoYW50ZWNlZGVudE9yQW50ZWNlZGVudHNOb2RlLCBhbnRlY2VkZW50cywgcHJvb2ZDb250ZXh0KTtcblxuICBpZiAoYW50ZWNlZGVudE9yQW50ZWNlZGVudHNWZXJpZmllZCkge1xuICAgIGNvbnN0IGNvbnNlcXVlbnRWZXJpZmllZCA9IHZlcmlmeUNvbnNlcXVlbnQoY29uc2VxdWVudE5vZGUsIGNvbnNlcXVlbnRzLCBwcm9vZkNvbnRleHQpO1xuXG4gICAgY29uZGl0aW9uYWxJbmRpY2F0aXZlVmVyaWZpZWQgPSBjb25zZXF1ZW50VmVyaWZpZWQ7ICAvLy9cbiAgfVxuXG4gIGNvbmRpdGlvbmFsSW5kaWNhdGl2ZVZlcmlmaWVkID9cbiAgICBwcm9vZkNvbnRleHQuY29tcGxldGUoY29uZGl0aW9uYWxJbmRpY2F0aXZlTm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQoY29uZGl0aW9uYWxJbmRpY2F0aXZlTm9kZSk7XG5cbiAgcmV0dXJuIGNvbmRpdGlvbmFsSW5kaWNhdGl2ZVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeUNvbmRpdGlvbmFsSW5kaWNhdGl2ZSIsImNvbnNlcXVlbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJhbnRlY2VkZW50T3JBbnRlY2VkZW50c05vZGVRdWVyeSIsImNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUiLCJhbnRlY2VkZW50cyIsImNvbnNlcXVlbnRzIiwicHJvb2ZDb250ZXh0IiwiY29uZGl0aW9uYWxJbmRpY2F0aXZlVmVyaWZpZWQiLCJiZWdpbiIsImNvbnNlcXVlbnROb2RlIiwiYW50ZWNlZGVudE9yQW50ZWNlZGVudHNOb2RlIiwiYW50ZWNlZGVudE9yQW50ZWNlZGVudHNWZXJpZmllZCIsInZlcmlmeUFudGVjZWRlbnRPckFudGVjZWRlbnRzIiwiY29uc2VxdWVudFZlcmlmaWVkIiwidmVyaWZ5Q29uc2VxdWVudCIsImNvbXBsZXRlIiwiaGFsdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBVUE7OztlQUF3QkE7OzsrREFSSzs0RUFDYTtxQkFFaEI7Ozs7OztBQUUxQixJQUFNQyxzQkFBc0JDLElBQUFBLGdCQUFTLEVBQUMsdUNBQ2hDQyxtQ0FBbUNELElBQUFBLGdCQUFTLEVBQUM7QUFFcEMsU0FBU0YsNEJBQTRCSSx5QkFBeUIsRUFBRUMsV0FBVyxFQUFFQyxXQUFXLEVBQUVDLFlBQVksRUFBRTtJQUNySCxJQUFJQyxnQ0FBZ0MsS0FBSztJQUV6Q0QsYUFBYUUsS0FBSyxDQUFDTDtJQUVuQixJQUFNTSxpQkFBaUJULG9CQUFvQkcsNEJBQ3JDTyw4QkFBOEJSLGlDQUFpQ0MsNEJBQy9EUSxrQ0FBa0NDLElBQUFBLGdDQUE2QixFQUFDRiw2QkFBNkJOLGFBQWFFO0lBRWhILElBQUlLLGlDQUFpQztRQUNuQyxJQUFNRSxxQkFBcUJDLElBQUFBLG1CQUFnQixFQUFDTCxnQkFBZ0JKLGFBQWFDO1FBRXpFQyxnQ0FBZ0NNLG9CQUFxQixHQUFHO0lBQzFELENBQUM7SUFFRE4sZ0NBQ0VELGFBQWFTLFFBQVEsQ0FBQ1osNkJBQ3BCRyxhQUFhVSxJQUFJLENBQUNiLDBCQUEwQjtJQUVoRCxPQUFPSTtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvY29uZGl0aW5hbEluZGljYXRpdmUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlDb25zZXF1ZW50IGZyb20gXCIuLi92ZXJpZnkvY29uc2VxdWVudFwiO1xuaW1wb3J0IHZlcmlmeUFudGVjZWRlbnQgZnJvbSBcIi4uL3ZlcmlmeS9hbnRlY2VkZW50XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgY29uc2VxdWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9jb25kaXRpb25hbEluZGljYXRpdmUvY29uc2VxdWVudCFcIiksXG4gICAgICBhbnRlY2VkZW50c05vZGVRdWVyeSA9IG5vZGVzUXVlcnkoXCIvY29uZGl0aW9uYWxJbmRpY2F0aXZlL2FudGVjZWRlbnRcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeUNvbmRpdGlvbmFsSW5kaWNhdGl2ZShjb25kaXRpb25hbEluZGljYXRpdmVOb2RlLCBhbnRlY2VkZW50cywgY29uc2VxdWVudHMsIHByb29mQ29udGV4dCkge1xuICBsZXQgY29uZGl0aW9uYWxJbmRpY2F0aXZlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBwcm9vZkNvbnRleHQuYmVnaW4oY29uZGl0aW9uYWxJbmRpY2F0aXZlTm9kZSk7XG5cbiAgY29uc3QgY29uc2VxdWVudE5vZGUgPSBjb25zZXF1ZW50Tm9kZVF1ZXJ5KGNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUpLFxuICAgICAgICBhbnRlY2VkZW50Tm9kZXMgPSBhbnRlY2VkZW50c05vZGVRdWVyeShjb25kaXRpb25hbEluZGljYXRpdmVOb2RlKSxcbiAgICAgICAgYW50ZWNlZGVudHNWZXJpZmllZCA9IGFudGVjZWRlbnROb2Rlcy5ldmVyeSgoYW50ZWNlZGVudE5vZGUpID0+IHtcbiAgICAgICAgICBjb25zdCBhbnRlY2VkZW50VmVyaWZpZWQgPSB2ZXJpZnlBbnRlY2VkZW50KGFudGVjZWRlbnROb2RlLCBhbnRlY2VkZW50cywgcHJvb2ZDb250ZXh0KTtcblxuICAgICAgICAgIGlmIChhbnRlY2VkZW50VmVyaWZpZWQpIHtcbiAgICAgICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgICAgIH1cbiAgICAgICAgfSk7XG5cbiAgaWYgKGFudGVjZWRlbnRzVmVyaWZpZWQpIHtcbiAgICBjb25zdCBjb25zZXF1ZW50VmVyaWZpZWQgPSB2ZXJpZnlDb25zZXF1ZW50KGNvbnNlcXVlbnROb2RlLCBjb25zZXF1ZW50cywgcHJvb2ZDb250ZXh0KTtcblxuICAgIGNvbmRpdGlvbmFsSW5kaWNhdGl2ZVZlcmlmaWVkID0gY29uc2VxdWVudFZlcmlmaWVkOyAgLy8vXG4gIH1cblxuICBjb25kaXRpb25hbEluZGljYXRpdmVWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKGNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUpIDpcbiAgICAgIHByb29mQ29udGV4dC5oYWx0KGNvbmRpdGlvbmFsSW5kaWNhdGl2ZU5vZGUpO1xuXG4gIHJldHVybiBjb25kaXRpb25hbEluZGljYXRpdmVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlDb25kaXRpb25hbEluZGljYXRpdmUiLCJjb25zZXF1ZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiYW50ZWNlZGVudHNOb2RlUXVlcnkiLCJub2Rlc1F1ZXJ5IiwiY29uZGl0aW9uYWxJbmRpY2F0aXZlTm9kZSIsImFudGVjZWRlbnRzIiwiY29uc2VxdWVudHMiLCJwcm9vZkNvbnRleHQiLCJjb25kaXRpb25hbEluZGljYXRpdmVWZXJpZmllZCIsImJlZ2luIiwiY29uc2VxdWVudE5vZGUiLCJhbnRlY2VkZW50Tm9kZXMiLCJhbnRlY2VkZW50c1ZlcmlmaWVkIiwiZXZlcnkiLCJhbnRlY2VkZW50Tm9kZSIsImFudGVjZWRlbnRWZXJpZmllZCIsInZlcmlmeUFudGVjZWRlbnQiLCJjb25zZXF1ZW50VmVyaWZpZWQiLCJ2ZXJpZnlDb25zZXF1ZW50IiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFVQTs7O2VBQXdCQTs7OytEQVJLOytEQUNBO3FCQUVTOzs7Ozs7QUFFdEMsSUFBTUMsc0JBQXNCQyxJQUFBQSxnQkFBUyxFQUFDLHVDQUNoQ0MsdUJBQXVCQyxJQUFBQSxpQkFBVSxFQUFDO0FBRXpCLFNBQVNKLDRCQUE0QksseUJBQXlCLEVBQUVDLFdBQVcsRUFBRUMsV0FBVyxFQUFFQyxZQUFZLEVBQUU7SUFDckgsSUFBSUMsZ0NBQWdDLEtBQUs7SUFFekNELGFBQWFFLEtBQUssQ0FBQ0w7SUFFbkIsSUFBTU0saUJBQWlCVixvQkFBb0JJLDRCQUNyQ08sa0JBQWtCVCxxQkFBcUJFLDRCQUN2Q1Esc0JBQXNCRCxnQkFBZ0JFLEtBQUssQ0FBQyxTQUFDQyxnQkFBbUI7UUFDOUQsSUFBTUMscUJBQXFCQyxJQUFBQSxtQkFBZ0IsRUFBQ0YsZ0JBQWdCVCxhQUFhRTtRQUV6RSxJQUFJUSxvQkFBb0I7WUFDdEIsT0FBTyxJQUFJO1FBQ2IsQ0FBQztJQUNIO0lBRU4sSUFBSUgscUJBQXFCO1FBQ3ZCLElBQU1LLHFCQUFxQkMsSUFBQUEsbUJBQWdCLEVBQUNSLGdCQUFnQkosYUFBYUM7UUFFekVDLGdDQUFnQ1Msb0JBQXFCLEdBQUc7SUFDMUQsQ0FBQztJQUVEVCxnQ0FDRUQsYUFBYVksUUFBUSxDQUFDZiw2QkFDcEJHLGFBQWFhLElBQUksQ0FBQ2hCLDBCQUEwQjtJQUVoRCxPQUFPSTtBQUNUIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.467",
+  "version": "0.0.469",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/verify/antecedent.js

@@ -0,0 +1,37 @@
+"use strict";
+
+import Assertion from "../assertion";
+import Antecedent from "../antecedent";
+import verifyUnqualifiedStatement from "../verify/statement/unqualified";
+
+import { nodeQuery } from "../utilities/query";
+
+const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement"),
+      unqualifiedStatementNodeQuery = nodeQuery("/antecedent/unqualifiedStatement");
+
+export default function verifyAntecedent(antecedentNode, antecedents, proofContext) {
+  let antecedentOrAntecedentsVerified;
+
+  proofContext.begin(antecedentNode);
+
+  const unqualifiedStatementNode = unqualifiedStatementNodeQuery(antecedentNode),
+        unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
+
+  if (unqualifiedStatementVerified) {
+    const statementNode = statementNodeQuery(unqualifiedStatementNode),
+          assertion = Assertion.fromUnqualifiedStatementNode(unqualifiedStatementNode),
+          antecedent = Antecedent.fromStatementNode(statementNode);
+
+    antecedents.push(antecedent);
+
+    proofContext.addAssertion(assertion);
+
+    antecedentOrAntecedentsVerified = true;
+  }
+
+  antecedentOrAntecedentsVerified ?
+    proofContext.complete(antecedentNode) :
+      proofContext.halt(antecedentNode);
+
+  return antecedentOrAntecedentsVerified;
+}

package/src/verify/conditinalIndicative.js

@@ -1,12 +1,12 @@
 "use strict";
 
 import verifyConsequent from "../verify/consequent";
-import verifyAntecedentOrAntecedents from "../verify/antecedentOrAntecedents";
+import verifyAntecedent from "../verify/antecedent";
 
-import { nodeQuery } from "../utilities/query";
+import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const consequentNodeQuery = nodeQuery("/conditionalIndicative/consequent!"),
-      antecedentOrAntecedentsNodeQuery = nodeQuery("/conditionalIndicative/antecedent|antecedents!");
+      antecedentsNodeQuery = nodesQuery("/conditionalIndicative/antecedent");
 
 export default function verifyConditionalIndicative(conditionalIndicativeNode, antecedents, consequents, proofContext) {
   let conditionalIndicativeVerified = false;
@@ -14,10 +14,16 @@ export default function verifyConditionalIndicative(conditionalIndicativeNode, a
   proofContext.begin(conditionalIndicativeNode);
 
   const consequentNode = consequentNodeQuery(conditionalIndicativeNode),
-        antecedentOrAntecedentsNode = antecedentOrAntecedentsNodeQuery(conditionalIndicativeNode),
-        antecedentOrAntecedentsVerified = verifyAntecedentOrAntecedents(antecedentOrAntecedentsNode, antecedents, proofContext);
+        antecedentNodes = antecedentsNodeQuery(conditionalIndicativeNode),
+        antecedentsVerified = antecedentNodes.every((antecedentNode) => {
+          const antecedentVerified = verifyAntecedent(antecedentNode, antecedents, proofContext);
 
-  if (antecedentOrAntecedentsVerified) {
+          if (antecedentVerified) {
+            return true;
+          }
+        });
+
+  if (antecedentsVerified) {
     const consequentVerified = verifyConsequent(consequentNode, consequents, proofContext);
 
     conditionalIndicativeVerified = consequentVerified;  ///

package/lib/verify/antecedentOrAntecedents.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifyAntecedentOrAntecedents;
-    }
-});
-var _assertion = /*#__PURE__*/ _interopRequireDefault(require("../assertion"));
-var _antecedent = /*#__PURE__*/ _interopRequireDefault(require("../antecedent"));
-var _unqualified = /*#__PURE__*/ _interopRequireDefault(require("../verify/statement/unqualified"));
-var _query = require("../utilities/query");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement"), unqualifiedStatementNodesQuery = (0, _query.nodesQuery)("/antecedent|antecedents/unqualifiedStatement");
-function verifyAntecedentOrAntecedents(antecedentOrAntecedentsNode, antecedents, proofContext) {
-    var antecedentOrAntecedentsVerified;
-    proofContext.begin(antecedentOrAntecedentsNode);
-    var unqualifiedStatementNodes = unqualifiedStatementNodesQuery(antecedentOrAntecedentsNode);
-    antecedentOrAntecedentsVerified = unqualifiedStatementNodes.every(function(unqualifiedStatementNode) {
-        var unqualifiedStatementVerified = (0, _unqualified.default)(unqualifiedStatementNode, proofContext);
-        if (unqualifiedStatementVerified) {
-            var statementNode = statementNodeQuery(unqualifiedStatementNode), assertion = _assertion.default.fromUnqualifiedStatementNode(unqualifiedStatementNode), antecedent = _antecedent.default.fromStatementNode(statementNode);
-            antecedents.push(antecedent);
-            proofContext.addAssertion(assertion);
-            return true;
-        }
-    });
-    antecedentOrAntecedentsVerified ? proofContext.complete(antecedentOrAntecedentsNode) : proofContext.halt(antecedentOrAntecedentsNode);
-    return antecedentOrAntecedentsVerified;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvYW50ZWNlZGVudE9yQW50ZWNlZGVudHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBBc3NlcnRpb24gZnJvbSBcIi4uL2Fzc2VydGlvblwiO1xuaW1wb3J0IEFudGVjZWRlbnQgZnJvbSBcIi4uL2FudGVjZWRlbnRcIjtcbmltcG9ydCB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudC91bnF1YWxpZmllZFwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnksIG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bnF1YWxpZmllZFN0YXRlbWVudC9zdGF0ZW1lbnRcIiksXG4gICAgICB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL2FudGVjZWRlbnR8YW50ZWNlZGVudHMvdW5xdWFsaWZpZWRTdGF0ZW1lbnRcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeUFudGVjZWRlbnRPckFudGVjZWRlbnRzKGFudGVjZWRlbnRPckFudGVjZWRlbnRzTm9kZSwgYW50ZWNlZGVudHMsIHByb29mQ29udGV4dCkge1xuICBsZXQgYW50ZWNlZGVudE9yQW50ZWNlZGVudHNWZXJpZmllZDtcblxuICBwcm9vZkNvbnRleHQuYmVnaW4oYW50ZWNlZGVudE9yQW50ZWNlZGVudHNOb2RlKTtcblxuICBjb25zdCB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVzID0gdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2Rlc1F1ZXJ5KGFudGVjZWRlbnRPckFudGVjZWRlbnRzTm9kZSk7XG5cbiAgYW50ZWNlZGVudE9yQW50ZWNlZGVudHNWZXJpZmllZCA9IHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZXMuZXZlcnkoKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSkgPT4ge1xuICAgIGNvbnN0IHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBpZiAodW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpLFxuICAgICAgICAgICAgYXNzZXJ0aW9uID0gQXNzZXJ0aW9uLmZyb21VbnF1YWxpZmllZFN0YXRlbWVudE5vZGUodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKSxcbiAgICAgICAgICAgIGFudGVjZWRlbnQgPSBBbnRlY2VkZW50LmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgICBhbnRlY2VkZW50cy5wdXNoKGFudGVjZWRlbnQpO1xuXG4gICAgICBwcm9vZkNvbnRleHQuYWRkQXNzZXJ0aW9uKGFzc2VydGlvbik7XG5cbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgYW50ZWNlZGVudE9yQW50ZWNlZGVudHNWZXJpZmllZCA/XG4gICAgcHJvb2ZDb250ZXh0LmNvbXBsZXRlKGFudGVjZWRlbnRPckFudGVjZWRlbnRzTm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQoYW50ZWNlZGVudE9yQW50ZWNlZGVudHNOb2RlKTtcblxuICByZXR1cm4gYW50ZWNlZGVudE9yQW50ZWNlZGVudHNWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlBbnRlY2VkZW50T3JBbnRlY2VkZW50cyIsInN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJhbnRlY2VkZW50T3JBbnRlY2VkZW50c05vZGUiLCJhbnRlY2VkZW50cyIsInByb29mQ29udGV4dCIsImFudGVjZWRlbnRPckFudGVjZWRlbnRzVmVyaWZpZWQiLCJiZWdpbiIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZXMiLCJldmVyeSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCIsInN0YXRlbWVudE5vZGUiLCJhc3NlcnRpb24iLCJBc3NlcnRpb24iLCJmcm9tVW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlIiwiYW50ZWNlZGVudCIsIkFudGVjZWRlbnQiLCJmcm9tU3RhdGVtZW50Tm9kZSIsInB1c2giLCJhZGRBc3NlcnRpb24iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVdBOzs7ZUFBd0JBOzs7OERBVEY7K0RBQ0M7Z0VBQ2dCO3FCQUVEOzs7Ozs7QUFFdEMsSUFBTUMscUJBQXFCQyxJQUFBQSxnQkFBUyxFQUFDLG9DQUMvQkMsaUNBQWlDQyxJQUFBQSxpQkFBVSxFQUFDO0FBRW5DLFNBQVNKLDhCQUE4QkssMkJBQTJCLEVBQUVDLFdBQVcsRUFBRUMsWUFBWSxFQUFFO0lBQzVHLElBQUlDO0lBRUpELGFBQWFFLEtBQUssQ0FBQ0o7SUFFbkIsSUFBTUssNEJBQTRCUCwrQkFBK0JFO0lBRWpFRyxrQ0FBa0NFLDBCQUEwQkMsS0FBSyxDQUFDLFNBQUNDLDBCQUE2QjtRQUM5RixJQUFNQywrQkFBK0JDLElBQUFBLG9CQUEwQixFQUFDRiwwQkFBMEJMO1FBRTFGLElBQUlNLDhCQUE4QjtZQUNoQyxJQUFNRSxnQkFBZ0JkLG1CQUFtQlcsMkJBQ25DSSxZQUFZQyxrQkFBUyxDQUFDQyw0QkFBNEIsQ0FBQ04sMkJBQ25ETyxhQUFhQyxtQkFBVSxDQUFDQyxpQkFBaUIsQ0FBQ047WUFFaERULFlBQVlnQixJQUFJLENBQUNIO1lBRWpCWixhQUFhZ0IsWUFBWSxDQUFDUDtZQUUxQixPQUFPLElBQUk7UUFDYixDQUFDO0lBQ0g7SUFFQVIsa0NBQ0VELGFBQWFpQixRQUFRLENBQUNuQiwrQkFDcEJFLGFBQWFrQixJQUFJLENBQUNwQiw0QkFBNEI7SUFFbEQsT0FBT0c7QUFDVCJ9

package/src/verify/antecedentOrAntecedents.js

@@ -1,40 +0,0 @@
-"use strict";
-
-import Assertion from "../assertion";
-import Antecedent from "../antecedent";
-import verifyUnqualifiedStatement from "../verify/statement/unqualified";
-
-import { nodeQuery, nodesQuery } from "../utilities/query";
-
-const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement"),
-      unqualifiedStatementNodesQuery = nodesQuery("/antecedent|antecedents/unqualifiedStatement");
-
-export default function verifyAntecedentOrAntecedents(antecedentOrAntecedentsNode, antecedents, proofContext) {
-  let antecedentOrAntecedentsVerified;
-
-  proofContext.begin(antecedentOrAntecedentsNode);
-
-  const unqualifiedStatementNodes = unqualifiedStatementNodesQuery(antecedentOrAntecedentsNode);
-
-  antecedentOrAntecedentsVerified = unqualifiedStatementNodes.every((unqualifiedStatementNode) => {
-    const unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
-
-    if (unqualifiedStatementVerified) {
-      const statementNode = statementNodeQuery(unqualifiedStatementNode),
-            assertion = Assertion.fromUnqualifiedStatementNode(unqualifiedStatementNode),
-            antecedent = Antecedent.fromStatementNode(statementNode);
-
-      antecedents.push(antecedent);
-
-      proofContext.addAssertion(assertion);
-
-      return true;
-    }
-  });
-
-  antecedentOrAntecedentsVerified ?
-    proofContext.complete(antecedentOrAntecedentsNode) :
-      proofContext.halt(antecedentOrAntecedentsNode);
-
-  return antecedentOrAntecedentsVerified;
-}