occam-verify-cli 1.0.842 → 1.0.847

package/src/element/substitution/frame.js

@@ -5,8 +5,8 @@ import Substitution from "../substitution";
 import { define } from "../../elements";
 import { instantiateFrameSubstitution } from "../../process/instantiate";
 import { frameSubstitutionFromFrameSubstitutionNode } from "../../utilities/element";
-import { join, ablate, descend, attempt, instantiate } from "../../utilities/context";
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
+import { join, ablate, descend, attempt, serialise, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class FrameSubstitution extends Substitution {
   constructor(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame) {
@@ -184,22 +184,42 @@ export default define(class FrameSubstitution extends Substitution {
 
   static name = "FrameSubstitution";
 
+  toJSON() {
+    const context = this.getContext();
+
+    return serialise((context) => {
+      const { name } = this.constructor,
+            string = this.getString(),
+            lineIndex = this.getLineIndex(),
+            json = {
+              name,
+              context,
+              string,
+              lineIndex
+            };
+
+      return json;
+    }, context);
+  }
+
   static fromJSON(json, context) {
     let frameSubstitutionn = null;
 
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {
-        const { string, lineIndex } = json,
-              frameSubstitutionNode = instantiateFrameSubstitution(string, context),
-              node = frameSubstitutionNode, ///
-              generalContext = generalContextFromFrameSubstitutionNode(frameSubstitutionNode, context),
-              targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
-              replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
-
-        frameSubstitutionn = new FrameSubstitution(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame);
-      }, context);
+      unserialise((json, context) => {
+        instantiate((context) => {
+          const { string, lineIndex } = json,
+                frameSubstitutionNode = instantiateFrameSubstitution(string, context),
+                node = frameSubstitutionNode, ///
+                generalContext = generalContextFromFrameSubstitutionNode(frameSubstitutionNode, context),
+                targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
+                replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
+
+          frameSubstitutionn = new FrameSubstitution(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame);
+        }, context);
+      }, json, context);
     }
 
     return frameSubstitutionn;

package/src/element/substitution/reference.js

@@ -4,9 +4,9 @@ import Substitution from "../substitution";
 
 import { define } from "../../elements";
 import { instantiateReferenceSubstitution } from "../../process/instantiate";
-import { join, descend, ablate, attempt, instantiate } from "../../utilities/context";
 import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilities/element";
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
+import { join, ablate, descend, attempt, serialise, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class ReferenceSubstitution extends Substitution {
   constructor(context, string, node, lineIndex, generalContext, targetReference, replacementReference) {
@@ -191,22 +191,42 @@ export default define(class ReferenceSubstitution extends Substitution {
 
   static name = "ReferenceSubstitution";
 
+  toJSON() {
+    const context = this.getContext();
+
+    return serialise((context) => {
+      const { name } = this.constructor,
+            string = this.getString(),
+            lineIndex = this.getLineIndex(),
+            json = {
+              name,
+              context,
+              string,
+              lineIndex
+            };
+
+      return json;
+    }, context);
+  }
+
   static fromJSON(json, context) {
     let referenceSubstitutionn = null;
 
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {
-        const { string, lineIndex } = json,
-              referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),
-              node = referenceSubstitutionNode, ///
-              generalContext = generalContextFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
-              targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
-              replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
-
-        referenceSubstitutionn = new ReferenceSubstitution(context, string, node, lineIndex, generalContext, targetReference, replacementReference);
-      }, context);
+      unserialise((json, context) => {
+        instantiate((context) => {
+          const { string, lineIndex } = json,
+                referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),
+                node = referenceSubstitutionNode, ///
+                generalContext = generalContextFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
+                targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
+                replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
+
+          referenceSubstitutionn = new ReferenceSubstitution(context, string, node, lineIndex, generalContext, targetReference, replacementReference);
+        }, context);
+      }, json, context);
     }
 
     return referenceSubstitutionn;

package/src/element/substitution/statement.js

@@ -7,7 +7,7 @@ import { unifySubstitution } from "../../process/unify";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
 import { instantiateStatementSubstitution } from "../../process/instantiate";
 import { statementSubstitutionFromStatementSubstitutionNode } from "../../utilities/element";
-import { join, ablate, attempt, descend, reconcile, instantiate } from "../../utilities/context";
+import { join, ablate, descend, reconcile, attempt, serialise, unserialise, instantiate } from "../../utilities/context";
 import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
 
 export default define(class StatementSubstitution extends Substitution {
@@ -377,24 +377,44 @@ export default define(class StatementSubstitution extends Substitution {
 
   static name = "StatementSubstitution";
 
+  toJSON() {
+    const context = this.getContext();
+
+    return serialise((context) => {
+      const { name } = this.constructor,
+            string = this.getString(),
+            lineIndex = this.getLineIndex(),
+            json = {
+              name,
+              context,
+              string,
+              lineIndex
+            };
+
+      return json;
+    }, context);
+  }
+
   static fromJSON(json, context) {
     let statementSubstitutionn = null;
 
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {
-        const { string, lineIndex } = json,
-              statementSubstitutionNode = instantiateStatementSubstitution(string, context),
-              node = statementSubstitutionNode, ///
-              generalContext = generalContextFromStatementSubstitutionNode(statementSubstitutionNode, context),
-              resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
-              substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
-              targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
-              replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context);
-
-        statementSubstitutionn = new StatementSubstitution(context, string, node, lineIndex, generalContext, resolved, substitution, targetStatement, replacementStatement);
-      }, context);
+      unserialise((json, context) => {
+        instantiate((context) => {
+          const { string, lineIndex } = json,
+                statementSubstitutionNode = instantiateStatementSubstitution(string, context),
+                node = statementSubstitutionNode, ///
+                generalContext = generalContextFromStatementSubstitutionNode(statementSubstitutionNode, context),
+                resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
+                substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
+                targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
+                replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context);
+
+          statementSubstitutionn = new StatementSubstitution(context, string, node, lineIndex, generalContext, resolved, substitution, targetStatement, replacementStatement);
+        }, context);
+      }, json, context);
     }
 
     return statementSubstitutionn;

package/src/element/substitution/term.js

@@ -7,7 +7,7 @@ import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionFromTermSubstitutionNode } from "../../utilities/element";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
-import { join, ablate, descend, attempt, instantiate } from "../../utilities/context";
+import { join, ablate, descend, attempt, serialise, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class TermSubstitution extends Substitution {
   constructor(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm) {
@@ -195,22 +195,42 @@ export default define(class TermSubstitution extends Substitution {
 
   static name = "TermSubstitution";
 
+  toJSON() {
+    const context = this.getContext();
+
+    return serialise((context) => {
+      const { name } = this.constructor,
+            string = this.getString(),
+            lineIndex = this.getLineIndex(),
+            json = {
+              name,
+              context,
+              string,
+              lineIndex
+            };
+
+      return json;
+    }, context);
+  }
+
   static fromJSON(json, context) {
     let termSubstitutionn = null;
 
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {
-        const { string, lineIndex } = json,
-              termSubstitutionNode = instantiateTermSubstitution(string, context),
-              node = termSubstitutionNode,  ///
-              generalContext = generalContextFromTermSubstitutionNode(termSubstitutionNode, context),
-              targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
-              replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);
-
-        termSubstitutionn = new TermSubstitution(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm);
-      }, context);
+      unserialise((json, context) => {
+        instantiate((context) => {
+          const { string, lineIndex } = json,
+                termSubstitutionNode = instantiateTermSubstitution(string, context),
+                node = termSubstitutionNode,  ///
+                generalContext = generalContextFromTermSubstitutionNode(termSubstitutionNode, context),
+                targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
+                replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);
+
+          termSubstitutionn = new TermSubstitution(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm);
+        }, context);
+      }, json, context);
     }
 
     return termSubstitutionn;

package/src/element/substitution.js

@@ -2,6 +2,7 @@
 
 import { Element } from "occam-languages";
 import { primitiveUtilities } from "occam-furtle";
+import {serialise} from "../utilities/context";
 
 const { primitiveFromNode } =primitiveUtilities;
 
@@ -120,7 +121,6 @@ export default class Substitution extends Element {
     return substitutionNodeMatches;
   }
 
-
   findValidSubstitution(context) {
     const substitutionNode = this.getSubstitutionNode(),
           substitution = context.findSubstitutionBySubstitutionNode(substitutionNode),
@@ -136,15 +136,20 @@ export default class Substitution extends Element {
   }
 
   toJSON() {
-    const { name } = this.constructor,
-          string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            name,
-            string,
-            lineIndex
-          };
-
-    return json;
+    const context = this.getContext();
+
+    return serialise((context) => {
+      const { name } = this.constructor,
+            string = this.getString(),
+            lineIndex = this.getLineIndex(),
+            json = {
+              name,
+              context,
+              string,
+              lineIndex
+            };
+
+      return json;
+    }, context);
   }
 }

package/src/element/typePrefix.js

@@ -31,6 +31,8 @@ export default define(class TypePrefix extends Element {
     return comparesToTypePrefixName;
   }
 
+  static name = "TypePrefix";
+
   toJSON() {
     const string = this.getString(),
           lineIndex = this.getLineIndex(),
@@ -42,8 +44,6 @@ export default define(class TypePrefix extends Element {
     return json;
   }
 
-  static name = "TypePrefix";
-
   static fromJSON(json, context) {
     return instantiate((context) => {
       const { string, lineIndex } = json,

package/src/process/unify.js

@@ -353,12 +353,19 @@ class MetavariablePass extends ZipPass {
       run: (generalTypeNode, specificTermNode, generalContext, specificContext) => {
         let success = false;
 
+        let context;
+
         const typeNode = generalTypeNode, ///
               termNode = specificTermNode, ///
-              nominalTypeName = typeNode.getNominalTypeName(),
-              type = generalContext.findTypeByNominalTypeName(nominalTypeName),
-              context = specificContext, ///
-              term = context.findTermByTermNode(termNode),
+              nominalTypeName = typeNode.getNominalTypeName();
+
+        context = generalContext; ///
+
+        const type = context.findTypeByNominalTypeName(nominalTypeName);
+
+        context = specificContext; ///
+
+        const term = context.findTermByTermNode(termNode),
               termType = term.getType(),
               termTypeEqualToOrSubTypeOfGivenTypeType = termType.isEqualToOrSubTypeOf(type);
 

package/src/utilities/element.js

@@ -504,11 +504,8 @@ export function assumptionFromAssumptionNode(assumptionNode, context) {
         string = context.nodeAsString(node),
         lineIndex = null,
         reference = referenceFromAssumptionNode(assumptionNode, context),
-        statement = statementFromAssumptionNode(assumptionNode, context);
-
-  context = null;
-
-  const assumption = new Assumption(context, string, node, lineIndex, reference, statement);
+        statement = statementFromAssumptionNode(assumptionNode, context),
+        assumption = new Assumption(context, string, node, lineIndex, reference, statement);
 
   return assumption;
 }
@@ -1182,7 +1179,7 @@ export function termFromMetavariableNode(metavariableNode, context) {
   const termNode = metavariableNode.getTermNode();
 
   if (termNode !== null) {
-    term = context.findTermByTermNode(termNode);
+    term = termFromTermNode(termNode, context);
   }
 
   return term;

package/src/utilities/json.js

@@ -73,12 +73,6 @@ export function frameFromJSON(json, context) {
   return frame;
 }
 
-export function lemmasFromJSON(json, context) {
-  const lemmas = [];
-
-  return lemmas;
-}
-
 export function negatedFromJSON(json, context) {
   const { negated } = json;
 
@@ -179,12 +173,6 @@ export function conclusionFromJSON(json, context) {
   return conclusion;
 }
 
-export function metaLemmasFromJSON(json, context) {
-  const metaLemmas = [];
-
-  return metaLemmas;
-}
-
 export function provisionalFromJSON(json, context) {
   const { provisional } = json;
 

package/src/utilities/synoptic.js

@@ -0,0 +1,105 @@
+"use strict";
+
+import { arrayUtilities } from "necessary";
+
+const { compress } = arrayUtilities;
+
+export function compressTerms(terms) {
+  compress(terms, (termA, termB) => {
+    const termAComparesToTermB = termA.compareTerm(termB);
+
+    if (!termAComparesToTermB) {
+      return true;
+    }
+  });
+}
+
+export function compressFrames(frames) {
+  compress(frames, (frameA, frameB) => {
+    const frameAEqualToFrameB = frameA.isEqualTo(frameB);
+
+    if (!frameAEqualToFrameB) {
+      return true;
+    }
+  });
+}
+
+export function compressEqualities(equalities) {
+  compress(equalities, (equalityA, equalityB) => {
+    const equalityAEqualToEqualityB = equalityA.isEqualTo(equalityB);
+
+    if (!equalityAEqualToEqualityB) {
+      return true;
+    }
+  });
+}
+
+export function compressJudgements(judgements) {
+  compress(judgements, (judgementA, judgementB) => {
+    const judgementAEqualToJudgementB = judgementA.isEqualTo(judgementB);
+
+    if (!judgementAEqualToJudgementB) {
+      return true;
+    }
+  });
+}
+
+export function compressAssertions(assertions) {
+  compress(assertions, (assertionA, assertionB) => {
+    const assertionAEqualToAssertionB = assertionA.isEqualTo(assertionB);
+
+    if (!assertionAEqualToAssertionB) {
+      return true;
+    }
+  });
+}
+
+export function compressStatements(statements) {
+  compress(statements, (statementA, statementB) => {
+    const statementAEqualToStatementB = statementA.isEqualTo(statementB);
+
+    if (!statementAEqualToStatementB) {
+      return true;
+    }
+  });
+}
+
+export function compressReferences(references) {
+  compress(references, (referenceA, referenceB) => {
+    const referenceAEqualToReferenceB = referenceA.isEqualTo(referenceB);
+
+    if (!referenceAEqualToReferenceB) {
+      return true;
+    }
+  });
+}
+
+export function compressAssumptions(assumptions) {
+  compress(assumptions, (assumptionA, assumptionB) => {
+    const assumptionAEqualToAssumptionB = assumptionA.isEqualTo(assumptionB);
+
+    if (!assumptionAEqualToAssumptionB) {
+      return true;
+    }
+  });
+}
+
+export function compressMetavariables(metavariables) {
+  compress(metavariables, (metavariableA, metavariableB) => {
+    const metavariableAEqualToMetavariableB = metavariableA.isEqualTo(metavariableB);
+
+    if (!metavariableAEqualToMetavariableB) {
+      return true;
+    }
+  });
+}
+
+export function compressSubstitutions(substitutions) {
+  compress(substitutions, (substitutionA, substitutionB) => {
+    const substitutionAEqualToSubstitutionB = substitutionA.isEqualTo(substitutionB);
+
+    if (!substitutionAEqualToSubstitutionB) {
+      return true;
+    }
+  });
+}