occam-verify-cli 1.0.823 → 1.0.825

package/src/element/rule.js

@@ -6,7 +6,6 @@ import { Element, asynchronousUtilities } from "occam-languages";
 import { define } from "../elements";
 import { enclose } from "../utilities/context";
 import { labelsFromJSON, premisesFromJSON, conclusionFromJSON, labelsToLabelsJSON, premisesToPremisesJSON, conclusionToConclusionJSON } from "../utilities/json";
-import {rulsStringFromLabelsPremisesAndConclusion} from "../utilities/string";
 
 const { reverse } = arrayUtilities,
       { asyncExtract, asyncForwardsEvery, asyncBackwardsEvery } = asynchronousUtilities;
@@ -344,7 +343,6 @@ export default define(class Rule extends Element {
           labels = labelsFromJSON(json, context),
           premises = premisesFromJSON(json, context),
           conclusion = conclusionFromJSON(json, context),
-          ruleString = rulsStringFromLabelsPremisesAndConclusion(labels, premises, conclusion),
           rule = new Rule(context, string, node, proof, labels, premises, conclusion);
 
     return rule;

package/src/utilities/element.js

@@ -273,11 +273,8 @@ export function deductionFromDeductionNode(deductionNode, context) {
   const { Deduction } = elements,
         node = deductionNode, ///
         string = context.nodeAsString(node),
-        statement = statementFromDeductionNode(deductionNode, context);
-
-  context = null;
-
-  const deduction = new Deduction(context, string, node, statement);
+        statement = statementFromDeductionNode(deductionNode, context),
+        deduction = new Deduction(context, string, node, statement);
 
   return deduction;
 }
@@ -419,11 +416,8 @@ export function conclusionFromConclusionNode(conclusionNode, context) {
   const { Conclusion } = elements,
         node = conclusionNode, ///
         string = context.nodeAsString(node),
-        statement = statementFromConclusionNode(conclusionNode, context);
-
-  context = null;
-
-  const conclusion = new Conclusion(context, string, node, statement);
+        statement = statementFromConclusionNode(conclusionNode, context),
+        conclusion = new Conclusion(context, string, node, statement);
 
   return conclusion;
 }

package/src/utilities/json.js

@@ -267,6 +267,22 @@ export function termsFromJSON(json, context) {
   return terms;
 }
 
+export function rulesFromJSON(json, context) {
+  let { rules } = json;
+
+  const { Rule } = elements,
+        rulesJSON = rules; ///
+
+  rules = rulesJSON.map((ruleJSON) => {
+    const json = ruleJSON,  ///
+          rule = Rule.fromJSON(json, context);
+
+    return rule;
+  });
+
+  return rules;
+}
+
 export function framesFromJSON(json, context) {
   let { frames } = json;
 
@@ -299,6 +315,22 @@ export function labelsFromJSON(json, context) {
   return labels;
 }
 
+export function axiomsFromJSON(json, context) {
+  let { axioms } = json;
+
+  const { Axiom } = elements,
+        axiomsJSON = axioms; ///
+
+  axioms = axiomsJSON.map((axiomJSON) => {
+    const json = axiomJSON,  ///
+          axiom = Axiom.fromJSON(json, context);
+
+    return axiom;
+  });
+
+  return axioms;
+}
+
 export function premisesFromJSON(json, context) {
   let { premises } = json;
 
@@ -315,6 +347,22 @@ export function premisesFromJSON(json, context) {
   return premises;
 }
 
+export function theoremsFromJSON(json, context) {
+  let { theorems } = json;
+
+  const { Theorem } = elements,
+        theoremsJSON = theorems; ///
+
+  theorems = theoremsJSON.map((theoremJSON) => {
+    const json = theoremJSON,  ///
+          theorem = Theorem.fromJSON(json, context);
+
+    return theorem;
+  });
+
+  return theorems;
+}
+
 export function variablesFromJSON(json, context) {
   let { variables } = json;
 
@@ -480,6 +528,22 @@ export function referencesFromJSON(json, context) {
   return references;
 }
 
+export function conjecturesFromJSON(json, context) {
+  let { conjectures } = json;
+
+  const { Conjecture } = elements,
+        conjecturesJSON = conjectures; ///
+
+  conjectures = conjecturesJSON.map((conjectureJSON) => {
+    const json = conjectureJSON,  ///
+          conjecture = Conjecture.fromJSON(json, context);
+
+    return conjecture;
+  });
+
+  return conjectures;
+}
+
 export function combinatorsFromJSON(json, context) {
   let { combinators } = json;
 
@@ -857,6 +921,16 @@ export function typesToTypesJSON(types) {
   return typesJSON;
 }
 
+export function rulesToRulesJSON(rules) {
+  const rulesJSON = rules.map((rule) => {
+    const ruleJSON = rule.toJSON();
+
+    return ruleJSON;
+  });
+
+  return rulesJSON;
+}
+
 export function labelsToLabelsJSON(labels) {
   const labelsJSON = labels.map((label) => {
     const labelJSON = label.toJSON();
@@ -877,6 +951,16 @@ export function framesToFramesJSON(frames) {
   return framesJSON;
 }
 
+export function axiomsToAxiomsJSON(axioms) {
+  const axiomsJSON = axioms.map((axiom) => {
+    const axiomJSON = axiom.toJSON();
+
+    return axiomJSON;
+  });
+
+  return axiomsJSON;
+}
+
 export function premisesToPremisesJSON(premises) {
   const premisesJSON = premises.map((premise) => {
     const premiseJSON = premise.toJSON();
@@ -887,6 +971,16 @@ export function premisesToPremisesJSON(premises) {
   return premisesJSON;
 }
 
+export function theoremsToTheoremsJSON(theorems) {
+  const theoremsJSON = theorems.map((theorem) => {
+    const theoremJSON = theorem.toJSON();
+
+    return theoremJSON;
+  });
+
+  return theoremsJSON;
+}
+
 export function variablesToVariablesJSON(variables) {
   const variablesJSON = variables.map((variable) => {
     const variableJSON = variable.toJSON();
@@ -987,6 +1081,16 @@ export function referencesToReferencesJSON(references) {
   return referencesJSON;
 }
 
+export function conjecturesToConjecturesJSON(conjectures) {
+  const conjecturesJSON = conjectures.map((conjecture) => {
+    const conjectureJSON = conjecture.toJSON();
+
+    return conjectureJSON;
+  });
+
+  return conjecturesJSON;
+}
+
 export function combinatorsToCombinatorsJSON(combinators) {
   const combinatorsJSON = combinators.map((combinator) => {
     const combinatorJSON = combinator.toJSON();

package/lib/process/initialise.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "initialiseFile", {
-    enumerable: true,
-    get: function() {
-        return initialiseFile;
-    }
-});
-const _occamlanguages = require("occam-languages");
-const _element = require("../utilities/element");
-const { nodeQuery } = _occamlanguages.queryUtilities;
-const ruleNodeQuery = nodeQuery("/rule"), axiomNodeQuery = nodeQuery("/axiom"), theoremNodeQuery = nodeQuery("/theorem"), conjectureNodeQuery = nodeQuery("/conjecture");
-class TopLevelPass extends _occamlanguages.SimplePass {
-    static maps = [
-        {
-            nodeQuery: ruleNodeQuery,
-            run: (ruleNode, context)=>{
-                const success = true, rule = (0, _element.ruleFromRuleNode)(ruleNode, context);
-                context.addRule(rule);
-                return success;
-            }
-        },
-        {
-            nodeQuery: axiomNodeQuery,
-            run: (axiomNode, context)=>{
-                const success = true, axiom = (0, _element.axiomFromAxiomNode)(axiomNode, context);
-                context.addAxiom(axiom);
-                return success;
-            }
-        },
-        {
-            nodeQuery: theoremNodeQuery,
-            run: (theoremNode, context)=>{
-                const success = true, theorem = (0, _element.theoremFromTheoremNode)(theoremNode, context);
-                context.addTheorem(theorem);
-                return success;
-            }
-        },
-        {
-            nodeQuery: conjectureNodeQuery,
-            run: (conjectureNode, context)=>{
-                const success = true, conjecture = (0, _element.conjectureFromConjectureNode)(conjectureNode, context);
-                context.addConjecture(conjecture);
-                return success;
-            }
-        }
-    ];
-}
-const topLevelPass = new TopLevelPass();
-function initialiseFile(fileNode, context) {
-    const node = fileNode; ///
-    topLevelPass.run(node, context);
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcm9jZXNzL2luaXRpYWxpc2UuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFNpbXBsZVBhc3MsIHF1ZXJ5VXRpbGl0aWVzIH0gZnJvbSBcIm9jY2FtLWxhbmd1YWdlc1wiXG5cbmltcG9ydCB7IHJ1bGVGcm9tUnVsZU5vZGUsXG4gICAgICAgICBheGlvbUZyb21BeGlvbU5vZGUsXG4gICAgICAgICB0aGVvcmVtRnJvbVRoZW9yZW1Ob2RlLFxuICAgICAgICAgY29uamVjdHVyZUZyb21Db25qZWN0dXJlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvZWxlbWVudFwiO1xuXG5jb25zdCB7IG5vZGVRdWVyeSB9ID0gcXVlcnlVdGlsaXRpZXM7XG5cbmNvbnN0IHJ1bGVOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcnVsZVwiKSxcbiAgICAgIGF4aW9tTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2F4aW9tXCIpLFxuICAgICAgdGhlb3JlbU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90aGVvcmVtXCIpLFxuICAgICAgY29uamVjdHVyZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9jb25qZWN0dXJlXCIpO1xuXG5jbGFzcyBUb3BMZXZlbFBhc3MgZXh0ZW5kcyBTaW1wbGVQYXNzIHtcbiAgc3RhdGljIG1hcHMgPSBbXG4gICAge1xuICAgICAgbm9kZVF1ZXJ5OiBydWxlTm9kZVF1ZXJ5LFxuICAgICAgcnVuOiAocnVsZU5vZGUsIGNvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3Qgc3VjY2VzcyA9IHRydWUsXG4gICAgICAgICAgICAgIHJ1bGUgPSBydWxlRnJvbVJ1bGVOb2RlKHJ1bGVOb2RlLCBjb250ZXh0KTtcblxuICAgICAgICBjb250ZXh0LmFkZFJ1bGUocnVsZSk7XG5cbiAgICAgICAgcmV0dXJuIHN1Y2Nlc3M7XG4gICAgICB9XG4gICAgfSxcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IGF4aW9tTm9kZVF1ZXJ5LFxuICAgICAgcnVuOiAoYXhpb21Ob2RlLCBjb250ZXh0KSA9PiB7XG4gICAgICAgIGNvbnN0IHN1Y2Nlc3MgPSB0cnVlLFxuICAgICAgICAgICAgICBheGlvbSA9IGF4aW9tRnJvbUF4aW9tTm9kZShheGlvbU5vZGUsIGNvbnRleHQpO1xuXG4gICAgICAgIGNvbnRleHQuYWRkQXhpb20oYXhpb20pO1xuXG4gICAgICAgIHJldHVybiBzdWNjZXNzO1xuICAgICAgfVxuICAgIH0sXG4gICAge1xuICAgICAgbm9kZVF1ZXJ5OiB0aGVvcmVtTm9kZVF1ZXJ5LFxuICAgICAgcnVuOiAodGhlb3JlbU5vZGUsIGNvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3Qgc3VjY2VzcyA9IHRydWUsXG4gICAgICAgICAgICAgIHRoZW9yZW0gPSB0aGVvcmVtRnJvbVRoZW9yZW1Ob2RlKHRoZW9yZW1Ob2RlLCBjb250ZXh0KTtcblxuICAgICAgICBjb250ZXh0LmFkZFRoZW9yZW0odGhlb3JlbSk7XG5cbiAgICAgICAgcmV0dXJuIHN1Y2Nlc3M7XG4gICAgICB9XG4gICAgfSxcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IGNvbmplY3R1cmVOb2RlUXVlcnksXG4gICAgICBydW46IChjb25qZWN0dXJlTm9kZSwgY29udGV4dCkgPT4ge1xuICAgICAgICBjb25zdCBzdWNjZXNzID0gdHJ1ZSxcbiAgICAgICAgICAgICAgY29uamVjdHVyZSA9IGNvbmplY3R1cmVGcm9tQ29uamVjdHVyZU5vZGUoY29uamVjdHVyZU5vZGUsIGNvbnRleHQpO1xuXG4gICAgICAgIGNvbnRleHQuYWRkQ29uamVjdHVyZShjb25qZWN0dXJlKTtcblxuICAgICAgICByZXR1cm4gc3VjY2VzcztcbiAgICAgIH1cbiAgICB9XG4gIF07XG59XG5cbmNvbnN0IHRvcExldmVsUGFzcyA9IG5ldyBUb3BMZXZlbFBhc3MoKTtcblxuZXhwb3J0IGZ1bmN0aW9uIGluaXRpYWxpc2VGaWxlKGZpbGVOb2RlLCBjb250ZXh0KSB7XG4gIGNvbnN0IG5vZGUgPSBmaWxlTm9kZTsgLy8vXG5cbiAgdG9wTGV2ZWxQYXNzLnJ1bihub2RlLCBjb250ZXh0KTtcbn1cbiJdLCJuYW1lcyI6WyJpbml0aWFsaXNlRmlsZSIsIm5vZGVRdWVyeSIsInF1ZXJ5VXRpbGl0aWVzIiwicnVsZU5vZGVRdWVyeSIsImF4aW9tTm9kZVF1ZXJ5IiwidGhlb3JlbU5vZGVRdWVyeSIsImNvbmplY3R1cmVOb2RlUXVlcnkiLCJUb3BMZXZlbFBhc3MiLCJTaW1wbGVQYXNzIiwibWFwcyIsInJ1biIsInJ1bGVOb2RlIiwiY29udGV4dCIsInN1Y2Nlc3MiLCJydWxlIiwicnVsZUZyb21SdWxlTm9kZSIsImFkZFJ1bGUiLCJheGlvbU5vZGUiLCJheGlvbSIsImF4aW9tRnJvbUF4aW9tTm9kZSIsImFkZEF4aW9tIiwidGhlb3JlbU5vZGUiLCJ0aGVvcmVtIiwidGhlb3JlbUZyb21UaGVvcmVtTm9kZSIsImFkZFRoZW9yZW0iLCJjb25qZWN0dXJlTm9kZSIsImNvbmplY3R1cmUiLCJjb25qZWN0dXJlRnJvbUNvbmplY3R1cmVOb2RlIiwiYWRkQ29uamVjdHVyZSIsInRvcExldmVsUGFzcyIsImZpbGVOb2RlIiwibm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBbUVnQkE7OztlQUFBQTs7O2dDQWpFMkI7eUJBS0U7QUFFN0MsTUFBTSxFQUFFQyxTQUFTLEVBQUUsR0FBR0MsOEJBQWM7QUFFcEMsTUFBTUMsZ0JBQWdCRixVQUFVLFVBQzFCRyxpQkFBaUJILFVBQVUsV0FDM0JJLG1CQUFtQkosVUFBVSxhQUM3Qkssc0JBQXNCTCxVQUFVO0FBRXRDLE1BQU1NLHFCQUFxQkMsMEJBQVU7SUFDbkMsT0FBT0MsT0FBTztRQUNaO1lBQ0VSLFdBQVdFO1lBQ1hPLEtBQUssQ0FBQ0MsVUFBVUM7Z0JBQ2QsTUFBTUMsVUFBVSxNQUNWQyxPQUFPQyxJQUFBQSx5QkFBZ0IsRUFBQ0osVUFBVUM7Z0JBRXhDQSxRQUFRSSxPQUFPLENBQUNGO2dCQUVoQixPQUFPRDtZQUNUO1FBQ0Y7UUFDQTtZQUNFWixXQUFXRztZQUNYTSxLQUFLLENBQUNPLFdBQVdMO2dCQUNmLE1BQU1DLFVBQVUsTUFDVkssUUFBUUMsSUFBQUEsMkJBQWtCLEVBQUNGLFdBQVdMO2dCQUU1Q0EsUUFBUVEsUUFBUSxDQUFDRjtnQkFFakIsT0FBT0w7WUFDVDtRQUNGO1FBQ0E7WUFDRVosV0FBV0k7WUFDWEssS0FBSyxDQUFDVyxhQUFhVDtnQkFDakIsTUFBTUMsVUFBVSxNQUNWUyxVQUFVQyxJQUFBQSwrQkFBc0IsRUFBQ0YsYUFBYVQ7Z0JBRXBEQSxRQUFRWSxVQUFVLENBQUNGO2dCQUVuQixPQUFPVDtZQUNUO1FBQ0Y7UUFDQTtZQUNFWixXQUFXSztZQUNYSSxLQUFLLENBQUNlLGdCQUFnQmI7Z0JBQ3BCLE1BQU1DLFVBQVUsTUFDVmEsYUFBYUMsSUFBQUEscUNBQTRCLEVBQUNGLGdCQUFnQmI7Z0JBRWhFQSxRQUFRZ0IsYUFBYSxDQUFDRjtnQkFFdEIsT0FBT2I7WUFDVDtRQUNGO0tBQ0QsQ0FBQztBQUNKO0FBRUEsTUFBTWdCLGVBQWUsSUFBSXRCO0FBRWxCLFNBQVNQLGVBQWU4QixRQUFRLEVBQUVsQixPQUFPO0lBQzlDLE1BQU1tQixPQUFPRCxVQUFVLEdBQUc7SUFFMUJELGFBQWFuQixHQUFHLENBQUNxQixNQUFNbkI7QUFDekIifQ==

package/src/process/initialise.js

@@ -1,72 +0,0 @@
-"use strict";
-
-import { SimplePass, queryUtilities } from "occam-languages"
-
-import { ruleFromRuleNode,
-         axiomFromAxiomNode,
-         theoremFromTheoremNode,
-         conjectureFromConjectureNode } from "../utilities/element";
-
-const { nodeQuery } = queryUtilities;
-
-const ruleNodeQuery = nodeQuery("/rule"),
-      axiomNodeQuery = nodeQuery("/axiom"),
-      theoremNodeQuery = nodeQuery("/theorem"),
-      conjectureNodeQuery = nodeQuery("/conjecture");
-
-class TopLevelPass extends SimplePass {
-  static maps = [
-    {
-      nodeQuery: ruleNodeQuery,
-      run: (ruleNode, context) => {
-        const success = true,
-              rule = ruleFromRuleNode(ruleNode, context);
-
-        context.addRule(rule);
-
-        return success;
-      }
-    },
-    {
-      nodeQuery: axiomNodeQuery,
-      run: (axiomNode, context) => {
-        const success = true,
-              axiom = axiomFromAxiomNode(axiomNode, context);
-
-        context.addAxiom(axiom);
-
-        return success;
-      }
-    },
-    {
-      nodeQuery: theoremNodeQuery,
-      run: (theoremNode, context) => {
-        const success = true,
-              theorem = theoremFromTheoremNode(theoremNode, context);
-
-        context.addTheorem(theorem);
-
-        return success;
-      }
-    },
-    {
-      nodeQuery: conjectureNodeQuery,
-      run: (conjectureNode, context) => {
-        const success = true,
-              conjecture = conjectureFromConjectureNode(conjectureNode, context);
-
-        context.addConjecture(conjecture);
-
-        return success;
-      }
-    }
-  ];
-}
-
-const topLevelPass = new TopLevelPass();
-
-export function initialiseFile(fileNode, context) {
-  const node = fileNode; ///
-
-  topLevelPass.run(node, context);
-}