occam-verify-cli 1.0.862 → 1.0.866

package/src/element/substitution.js

@@ -1,20 +1,65 @@
 "use strict";
 
-import { Element } from "occam-languages";
-import { serialise } from "../utilities/context";
+import { arrayUtilities } from "necessary";
+
+import { serialises } from "../utilities/context";
 import { primitiveUtilities } from "occam-furtle";
 
-const { primitiveFromNode } =primitiveUtilities;
+const { first, second } = arrayUtilities,
+      { primitiveFromNode } =primitiveUtilities;
 
-export default class Substitution extends Element {
-  constructor(context, string, node, lineIndex, generalContext) {
-    super(context, string, node, lineIndex);
+class Element {
+  constructor(contexts, string, node, lineIndex) {
+    this.contexts = contexts;
+    this.string = string;
+    this.node = node;
+    this.lineIndex = lineIndex;
+  }
 
-    this.generalContext = generalContext;
+  getContexts() {
+    return this.contexts;
   }
 
-  getGeneralContext() {
-    return this.generalContext;
+  getString() {
+    return this.string;
+  }
+
+  getNode() {
+    return this.node;
+  }
+
+  getLineIndex() {
+    return this.lineIndex;
+  }
+
+  setContexts(contexts) {
+    this.contexts = contexts;
+  }
+
+  setString(string) {
+    this.string = string;
+  }
+
+  setNode(node) {
+    this.node = node;
+  }
+
+  setLineIndex(lineIndex) {
+    this.lineIndex = lineIndex;
+  }
+
+  async break(context) {
+    this.lineIndex = await context.break(this.node, this.lineIndex);
+  }
+
+  matchNode(node) { return this.node.match(node); }
+}
+
+export default class Substitution extends Element {
+  getName() {
+    const { name } = this.constructor;
+
+    return name;
   }
 
   getPrimitive(context) {
@@ -32,45 +77,40 @@ export default class Substitution extends Element {
     return substitutionNode;
   }
 
-  getSpecificContext() {
-    const context = this.getContext(),
-          specificContext = context;  ///
+  getGeneralContext() {
+    const contexts = this.getContexts(),
+          firstContext = first(contexts),
+          generalContext = firstContext;  ///
 
-    return specificContext;
+    return generalContext;
   }
 
-  getName() {
-    const { name } = this.constructor;
+  getSpecificContext() {
+    const contexts = this.getContexts(),
+          secondContext = second(contexts),
+          specificContext = secondContext;  ///
 
-    return name;
+    return specificContext;
   }
 
-  getContexts() {
-    const generalContext = this.getGeneralContext(),
-          specificContext = this.getSpecificContext(),
+  setGeneralContext(generalContext) {
+    const specificContext = this.getSpecificContext(),
           contexts = [
             generalContext,
             specificContext
           ];
 
-    return contexts;
-  }
-
-  setGeneralContext(generalContext) {
-    this.generalContext = generalContext;
+    this.setContexts(contexts);
   }
 
-  setSpecificContext(specifiContext) {
-    const context = specifiContext; ///
-
-    this.setContext(context);
-  }
-
-  setContexts(...contexts) {
-    const [ generalContext, specificContext ] = contexts;
+  setSpecificContext(specificContext) {
+    const generalContext = this.getGeneralContext(),
+          contexts = [
+            generalContext,
+            specificContext
+          ];
 
-    this.setGeneralContext(generalContext);
-    this.setSpecificContext(specificContext);
+    this.setContexts(contexts);
   }
 
   isEqualTo(substitution) {
@@ -165,10 +205,19 @@ export default class Substitution extends Element {
     return resolved;
   }
 
+  commit(generalContext, specificContext) {
+    const contexts = [
+      generalContext,
+      specificContext
+    ];
+
+    this.setContexts(contexts);
+  }
+
   toJSON() {
     const contexts = this.getContexts();
 
-    return serialise((...contexts) => {
+    return serialises((...contexts) => {
       const name = this.getName(),
             string = this.getString(),
             lineIndex = this.getLineIndex(),

package/src/element/variable.js

@@ -152,13 +152,13 @@ export default define(class Variable extends Element {
 
       if (termTypeEqualToOrSubTypeOfVariableType) {
         const { TermSubstitution } = elements,
-              termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, context);
+              termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, generalContext, specificContext);
 
-        termSubstitution.validate(generalContext, specificContext);
+        termSubstitution.validate(context);
 
         const derivedSubstitution = termSubstitution; ///
 
-        specificContext.addDerivedSubstitution(derivedSubstitution);
+        context.addDerivedSubstitution(derivedSubstitution);
 
         termUnifies = true;
       }

package/src/process/unify.js

@@ -14,14 +14,12 @@ const typeNodeQuery = nodeQuery("/type"),
       frameNodeQuery = nodeQuery("/frame"),
       metaTypeNodeQuery = nodeQuery("/metaType"),
       statementNodeQuery = nodeQuery("/statement"),
-      metavariableNodeQuery = nodeQuery("/metavariable"),
       termVariableNodeQuery = nodeQuery("/term/variable!"),
       frameMetavariableNodeQuery = nodeQuery("/frame/metavariable!"),
-      referenceMetavariableNodeQuery = nodeQuery("/reference/metavariable!"),
       statementMetavariableNodeQuery = nodeQuery("/statement/metavariable!"),
       assumptionMetavariableNodeQuery = nodeQuery("/assumption/metavariable!");
 
-class MetaLevelPass extends ZipPassBase {
+class StatementPass extends ZipPassBase {
   static maps = [
     {
       generalNodeQuery: assumptionMetavariableNodeQuery,
@@ -404,7 +402,7 @@ class IntrinsicLevelPass extends ZipPass {
   ];
 }
 
-const metaLevelPass = new MetaLevelPass(),
+const statementPass = new StatementPass(),
       combinatorPass = new CombinatorPass(),
       constructorPass = new ConstructorPass(),
       metavariablePass = new MetavariablePass(),
@@ -418,7 +416,7 @@ export function unifyStatement(generalStatement, specificStatement, generalConte
         specificStatementNode = specificStatement.getNode(),
         generalNode = generalStatementNode, ///
         specificNode = specificStatementNode,  ///
-        success = metaLevelPass.run(generalNode, specificNode, generalContext, specificContext);
+        success = statementPass.run(generalNode, specificNode, generalContext, specificContext);
 
   if (success) {
     statementUnifies = true;

package/src/utilities/context.js

@@ -12,7 +12,7 @@ import IllativeContext from "../context/illative";
 import BranchingContext from "../context/branching";
 import NominalFileContext from "../context/file/nominal";
 
-import { mnemicContextsFromJSON, mnemicContextToMnemicContextJSON } from "../utilities/json";
+import { mnemicContextFromJSON, mnemicContextsFromJSON, mnemicContextToMnemicContextJSON, mnemicContextsToMnemicContextsJSON } from "../utilities/json";
 
 export function join(innerFunction, ...contexts) {
   const synopticContext = SynopticContext.fromContexts(...contexts),
@@ -41,7 +41,7 @@ export function ablate(innerFunction, context) {
   while (!contextNominalFileContext) {
     context = context.getContext();
 
-    contextNominalFileContext = (context instanceof NominalFileContext)
+    contextNominalFileContext = (context instanceof NominalFileContext);
   }
 
   return innerFunction(context);
@@ -79,16 +79,12 @@ export function descend(innerFunction, context) {
   return innerFunction(context);
 }
 
-export function attempt(innerFunction, ...contexts) {
-  contexts = contexts.map((context) => {  ///
-    const mnemicContext = MenmicContext.fromNothing(context);
-
-    context = mnemicContext;  ///
+export function attempt(innerFunction, context) {
+  const mnemicContext = MenmicContext.fromNothing(context);
 
-    return context;
-  })
+  context = mnemicContext;  ///
 
-  return innerFunction(...contexts);
+  return innerFunction(context);
 }
 
 export function enclose(innerFunction, metaLevelAssumptions, context) {
@@ -119,13 +115,41 @@ export function reconcile(innerFunction, context) {
   return innerFunction(context);
 }
 
-export function serialise(innerFunction, ...contexts) {
+export function serialise(innerFunction, context) {
+  const mnemicContext = context, ///
+        mnemicContextJSON = mnemicContextToMnemicContextJSON(mnemicContext),
+        contextJSON = mnemicContextJSON; ///
+
+  context = contextJSON;  ///
+
+  return innerFunction(context);
+}
+
+export function instantiate(innerFunction, context) {
+  const literalContext = LiteralContext.fromNothing(context);
+
+  context = literalContext;  ///
+
+  return innerFunction(context);
+}
+
+export function unserialise(innerFunction, json, context) {
+  const mnemicContext = mnemicContextFromJSON(json, context);
+
+  context = mnemicContext; ///
+
+  return innerFunction(json, context);
+}
+
+export function ablates(innerFunction, ...contexts) {
   contexts = contexts.map((context) => {  ///
-    const mnemicContext = context, ///
-          mnemicContextJSON = mnemicContextToMnemicContextJSON(mnemicContext),
-          contextJSON = mnemicContextJSON; ///
+    let contextNominalFileContext = (context instanceof NominalFileContext);
+
+    while (!contextNominalFileContext) {
+      context = context.getContext();
 
-    context = contextJSON;  ///
+      contextNominalFileContext = (context instanceof NominalFileContext);
+    }
 
     return context;
   });
@@ -133,17 +157,31 @@ export function serialise(innerFunction, ...contexts) {
   return innerFunction(...contexts);
 }
 
-export function unserialise(innerFunction, json, context) {
-  const mnemicContexts = mnemicContextsFromJSON(json, context),
-        contexts = mnemicContexts; ///
+export function attempts(innerFunction, ...contexts) {
+  contexts = contexts.map((context) => {
+    const mnemicContext = MenmicContext.fromNothing(context);
 
-  return innerFunction(json, ...contexts);
+    context = mnemicContext;  ///
+
+    return context;
+  });
+
+  return innerFunction(...contexts);
 }
 
-export function instantiate(innerFunction, context) {
-  const literalContext = LiteralContext.fromNothing(context);
+export function serialises(innerFunction, ...contexts) {
+  const mnemicContexts = contexts, ///
+        mnemicContextsJSON = mnemicContextsToMnemicContextsJSON(mnemicContexts),
+        contextsJSON = mnemicContextsJSON; ///
 
-  context = literalContext;  ///
+  contexts = contextsJSON;  ///
 
-  return innerFunction(context);
+  return innerFunction(...contexts);
+}
+
+export function unserialises(innerFunction, json, context) {
+  const mnemicContexts = mnemicContextsFromJSON(json, context),
+        contexts = mnemicContexts; ///
+
+  return innerFunction(json, ...contexts);
 }

package/src/utilities/element.js

@@ -11,7 +11,6 @@ import { equivalenceStringFromTerms,
          procedureCallStringFromProcedureReferenceAndParameters,
          topLevelAssertionStringFromLabelsSuppositionsAndDeduction,
          topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction } from "../utilities/string";
-import statement from "../element/statement";
 
 export function typeFromTypeNode(typeNode, context) {
   let type;
@@ -675,28 +674,36 @@ export function propertyRelationFromPropertyRelationNode(propertyRelationNode, c
   return propertyRelation;
 }
 
-export function termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context) {
+export function termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, generalContext, specificContext) {
   const { TermSubstitution } = elements,
         node = termSubstitutionNode,  ///
+        context = specificContext,  ///
+        contexts = [
+          generalContext,
+          specificContext
+        ],
         string = context.nodeAsString(node),
         lineIndex = null,
-        generalContext = generalContextFromTermSubstitutionNode(termSubstitutionNode, context),
         targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
         replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context),
-        termSubstitution = new TermSubstitution(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm);
+        termSubstitution = new TermSubstitution(contexts, string, node, lineIndex, targetTerm, replacementTerm);
 
   return termSubstitution;
 }
 
-export function frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, context) {
+export function frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, generalContext, specificContext) {
   const { FrameSubstitution } = elements,
         node = frameSubstitutionNode,  ///
+        context = specificContext,  ///
+        contexts = [
+          generalContext,
+          specificContext
+        ],
         string = context.nodeAsString(node),
         lineIndex = null,
-        generalContext = generalContextFromFrameSubstitutionNode(frameSubstitutionNode, context),
         targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
         replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
-        frameSubstitution = new FrameSubstitution(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame);
+        frameSubstitution = new FrameSubstitution(contexts, string, node, lineIndex, targetFrame, replacementFrame);
 
   return frameSubstitution;
 }
@@ -853,31 +860,38 @@ export function simpleTypeDeclarationFromSimpleTypeDeclarationNode(simpleTypeDec
   return simpleTypeDeclaration;
 }
 
-export function referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, context) {
+export function referenceSubstitutionFromReferenceSubstitutionNode(referenceSubstitutionNode, generalContext, specificContext) {
   const { ReferenceSubstitution } = elements,
         node = referenceSubstitutionNode,  ///
+        context = specificContext,  ///
+        contexts = [
+          generalContext,
+          specificContext
+        ],
         string = context.nodeAsString(node),
         lineIndex = null,
-        generalContext = generalContextFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
         targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
         replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
-        referenceSubstitution = new ReferenceSubstitution(context, string, node, lineIndex, generalContext, targetReference, replacementReference);
+        referenceSubstitution = new ReferenceSubstitution(contexts, string, node, lineIndex, targetReference, replacementReference);
 
   return referenceSubstitution;
 }
 
-export function statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
-
+export function statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext) {
   const { StatementSubstitution } = elements,
         node = statementSubstitutionNode,  ///
+        context = specificContext,  ///
+        contexts = [
+          generalContext,
+          specificContext
+        ],
         string = context.nodeAsString(node),
         lineIndex = null,
-        generalContext = generalContextFromStatementSubstitutionNode(statementSubstitutionNode, context),
         resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
-        substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
+        substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext),
         targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
         replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
-        statementSubstitution = new StatementSubstitution(context, string, node, lineIndex, generalContext, resolved, substitution, targetStatement, replacementStatement);
+        statementSubstitution = new StatementSubstitution(contexts, string, node, lineIndex, resolved, substitution, targetStatement, replacementStatement);
 
   return statementSubstitution;
 }
@@ -1630,18 +1644,6 @@ export function definedAssertionFromStatementNode(statementNode, context) {
   return definedAssertion;
 }
 
-export function termSubstitutionFromStatementNode(statementNode, context) {
-  let termSubstitution = null;
-
-  const termSubstitutionNode = statementNode.getTermSubstitutionNode();
-
-  if (termSubstitutionNode !== null) {
-    termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);
-  }
-
-  return termSubstitution;
-}
-
 export function negatedFromContainedAssertionNode(containedAssertionNode, context) {
   const negated = containedAssertionNode.isNegated();
 
@@ -1697,18 +1699,6 @@ export function labelFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, cont
   return label;
 }
 
-export function frameSubstitutionFromStatementNode(statementNode, context) {
-  let frameSubstitution = null;
-
-  const frameSubstitutionNode = statementNode.getFrameSubstitutionNode();
-
-  if (frameSubstitutionNode !== null) {
-    frameSubstitution = frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, context);
-  }
-
-  return frameSubstitution;
-}
-
 export function propertyAssertionFromStatementNode(statementNode, context) {
   let propertyAssertion = null;
 
@@ -1863,12 +1853,6 @@ export function topLevelMetaAssertionFromReferenceNode(referenceNode, context) {
   return topLevelMetaAssertion;
 }
 
-export function generalContextFromTermSubstitutionNode(termSubstitutionNode, context) {
-  const generalContext = null;
-
-  return generalContext;
-}
-
 export function deductionFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context) {
   const deductionNode = metaLemmaMetathoremNode.getDeductionNode(),
         deduction = deductionFromDeductionNode(deductionNode, context);
@@ -1890,12 +1874,6 @@ export function replacementTermFromTermSubstitutionNode(termSubstitutionNode, co
   return replacementTerm;
 }
 
-export function generalContextFromFrameSubstitutionNode(frameSubstitutionNode, context) {
-  const generalContext = null;
-
-  return generalContext;
-}
-
 export function superTypesFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context) {
   let superTypes = [];
 
@@ -1972,9 +1950,9 @@ export function suppositionsFromTopLevelMetaAssertionNode(metaLemmaMetathoremNod
   return suppositions;
 }
 
-export function substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
-  const frameSubstitution = frameSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
-        termSubstitution = termSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
+export function substitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContxt, specificContext) {
+  const frameSubstitution = frameSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContxt, specificContext),
+        termSubstitution = termSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContxt, specificContext),
         substitution = (frameSubstitution || termSubstitution);
 
   return substitution;
@@ -1999,18 +1977,6 @@ export function provisionalFromComplexTypeDeclarationNode(complexTypeDeclaration
   return provisional;
 }
 
-export function generalContextFromStatementSubstitutionNode(statementSubstitutionNode, context) {
-  const generalContext = null;
-
-  return generalContext;
-}
-
-export function generalContextFromReferenceSubstitutionNode(referenceSubstitutionNode, context) {
-  const generalContext = null;
-
-  return generalContext;
-}
-
 export function metavariableFromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
   const metavariableNode = metavariableDeclarationNode.getMetavariableNode(),
         metavariable = metavariableFromMetavariableNode(metavariableNode, context);
@@ -2034,25 +2000,25 @@ export function targetStatementFromStatementSubstitutionNode(statementSubstituti
   return targetStatement;
 }
 
-export function termSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+export function termSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext) {
   let termSubstitution = null;
 
   const termSubstitutionNode = statementSubstitutionNode.getTermSubstitutionNode();
 
   if (termSubstitutionNode !== null) {
-    termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);
+    termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, generalContext, specificContext);
   }
 
   return termSubstitution;
 }
 
-export function frameSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+export function frameSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext) {
   let frameSubstitution = null;
 
   const frameSubstitutionNode = statementSubstitutionNode.getFrameSubstitutionNode();
 
   if (frameSubstitutionNode !== null) {
-    frameSubstitution = frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, context);
+    frameSubstitution = frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, generalContext, specificContext);
   }
 
   return frameSubstitution;

package/src/utilities/json.js

@@ -192,6 +192,20 @@ export function metavariableFromJSON(json, context) {
   return metavariable;
 }
 
+export function mnemicContextFromJSON(json, context) {
+  const releaseContext = context; ///
+
+  ({ context } = json);
+
+  json = context; ///
+
+  context = releaseContext; ///
+
+  const mnemicContext = MnemicContext.fromJSON(json, context);
+
+  return mnemicContext;
+}
+
 export function procedureCallFromJSON(json, context) {
   let { procedureCall = null } = json;
 
@@ -662,22 +676,17 @@ export function metavariablesFromJSON(json, context) {
 export function mnemicContextsFromJSON(json, context) {
   const releaseContext = context; ///
 
-  const { contexts = [] } = json;
+  const { contexts } = json;
 
-  ({ context = null } = json);
+  const mnemicContexts = contexts.map((context) => {
+    json = context; ///
 
-  if (context !== null) {
-    contexts.push(context);
-  }
+    context = releaseContext; ///
 
-  const contextsJSON = contexts,  ///
-        mnemicContexts = contextsJSON.map((contextJSON) => {
-          const json = contextJSON, ///
-                context = releaseContext, ///
-                mnemicContext = MnemicContext.fromJSON(json, context);
+    const mnemicContext = MnemicContext.fromJSON(json, context);
 
-          return mnemicContext;  ///
-        });
+    return mnemicContext;  ///
+  });
 
   return mnemicContexts;
 }
@@ -1168,6 +1177,16 @@ export function metavariablesToMetavariablesJSON(metavariables) {
   return metavariablesJSON;
 }
 
+export function mnemicContextsToMnemicContextsJSON(mnemicContexts) {
+  const mnemicContextsJSON = mnemicContexts.map((mnemicContext) => {
+    const mnemicContextJSON = mnemicContext.toJSON();
+
+    return mnemicContextJSON;
+  });
+
+  return mnemicContextsJSON;
+}
+
 export function propertyRelationsToPropertyRelationsJSON(propertyRelations) {
   const propertyRelationsJSON = propertyRelations.map((propertyRelation) => {
     const propertyRelationJSON = propertyRelation.toJSON();

package/src/utilities/validation.js

@@ -99,25 +99,25 @@ function validateStatementAsMetavariable(statement, context) {
     metavariable = metavariable.validate(strict, context);
 
     if (metavariable !== null) {
-      statementValidatesAsMetavariable = true;
 
       const { TermSubstitution, FrameSubstitution } = elements;
 
       let substitution;
 
-      const termSubstitution = TermSubstitution.fromStatement(statement, context),
-            frameSubstitution = FrameSubstitution.fromStatement(statement, context);
+      const generalContext = context, ///
+            specificContext = context,  ///
+            termSubstitution = TermSubstitution.fromStatement(statement, generalContext, specificContext),
+            frameSubstitution = FrameSubstitution.fromStatement(statement, generalContext, specificContext);
 
       substitution = (termSubstitution || frameSubstitution);
 
-      if (substitution !== null) {
-        const generalContext = context, ///
-              specificContext = context;  ///
-
+      if (substitution === null) {
+        statementValidatesAsMetavariable = true;
+      } else {
         substitution = substitution.validate(generalContext, specificContext);  ///
 
-        if (substitution === null) {
-          statementValidatesAsMetavariable = false;
+        if (substitution !== null) {
+          statementValidatesAsMetavariable = true;
         }
       }
     }