occam-verify-cli 1.0.758 → 1.0.762

package/src/element/proofAssertion/supposition.js

@@ -4,7 +4,7 @@ import ProofAssertion from "../proofAssertion";
 
 import { define } from "../../elements";
 import { instantiateSupposition} from "../../process/instantiate";
-import { attempt, reconcile, instantiate } from "../../utilities/context";
+import { join, attempt, reconcile, instantiate } from "../../utilities/context";
 import { statementFromSuppositionNode, procedureCallFromSuppositionNode } from "../../utilities/element";
 import { ephemeralContextFromJSON, ephemeralContextToEphemeralContextJSON } from "../../utilities/json";
 
@@ -191,16 +191,18 @@ export default define(class Supposition extends ProofAssertion {
           generalContext = suppositionContext, ///
           specificContext = proofAssertionContext;
 
-    reconcile((specificContext) => {
-      const statement = proofAssertion.getStatement(),
-            statementUnifies = this.unifyStatement(statement, generalContext, specificContext);
+    join((specificContext) => {
+      reconcile((specificContext) => {
+        const statement = proofAssertion.getStatement(),
+              statementUnifies = this.unifyStatement(statement, generalContext, specificContext);
 
-      if (statementUnifies) {
-        specificContext.commit(context);
+        if (statementUnifies) {
+          specificContext.commit(context);
 
-        proofAssertionUnifies = true;
-      }
-    }, specificContext);
+          proofAssertionUnifies = true;
+        }
+      }, specificContext);
+    }, specificContext, context);
 
     if (proofAssertionUnifies) {
       context.debug(`...unified the '${proofAssertionString}' proof assertion with the '${suppositionString}' supposition.`);
@@ -312,7 +314,7 @@ export default define(class Supposition extends ProofAssertion {
 
     context = ephemeralContext; ///
 
-    const supposition = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             suppositionNode = instantiateSupposition(string, context),
             node = suppositionNode,  ///
@@ -322,8 +324,6 @@ export default define(class Supposition extends ProofAssertion {
 
       return supposition;
     }, context);
-
-    return supposition;
   }
 });
 

package/src/element/property.js

@@ -58,7 +58,7 @@ export default define(class Property extends Element {
   static name = "Property";
 
   static fromJSON(json, context) {
-    const property = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             propertyNode = instantiateProperty(string, context),
             node = propertyNode,  ///
@@ -71,7 +71,5 @@ export default define(class Property extends Element {
 
       return property;
     }, context);
-
-    return property;
   }
 });

package/src/element/propertyRelation.js

@@ -124,7 +124,7 @@ export default define(class PropertyRelation extends Element {
   }
 
   static fromJSON(json, context) {
-    const propertyRelation = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             propertyRelationNode = instantiatePropertyRelation(string, context),
             node = propertyRelationNode,  ///
@@ -137,8 +137,6 @@ export default define(class PropertyRelation extends Element {
 
       return propertyRelation;
     }, context);
-
-    return propertyRelation;
   }
 });
 

package/src/element/reference.js

@@ -284,7 +284,7 @@ export default define(class Reference extends Element {
   static name = "Reference";
 
   static fromJSON(json, context) {
-    const reference = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             referenceNode = instantiateReference(string, context),
             node = referenceNode,  ///
@@ -296,7 +296,5 @@ export default define(class Reference extends Element {
 
       return reference;
     }, context);
-
-    return reference;
   }
 });

package/src/element/signature.js

@@ -225,7 +225,7 @@ export default define(class Signature extends Element {
   static name = "Signature";
 
   static fromJSON(json, context) {
-    const signature = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             signatureNode = instantiateSignature(string, context),
             node = signatureNode,  ///
@@ -234,7 +234,5 @@ export default define(class Signature extends Element {
 
       return signature;
     }, context);
-
-    return signature;
   }
 });

package/src/element/statement.js

@@ -385,7 +385,7 @@ export default define(class Statement extends Element {
   static name = "Statement";
 
   static fromJSON(json, context) {
-    const statement = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             statementNode = instantiateStatement(string, context),
             node = statementNode; ///
@@ -396,7 +396,5 @@ export default define(class Statement extends Element {
 
       return statement;
     }, context);
-
-    return statement;
   }
 });

package/src/element/substitution/frame.js

@@ -178,7 +178,7 @@ export default define(class FrameSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {
+      frameSubstitutionn = instantiate((context) => {
         const { string } = json,
               frameSubstitutionNode = instantiateFrameSubstitution(string, context),
               node = frameSubstitutionNode,  ///
@@ -187,7 +187,9 @@ export default define(class FrameSubstitution extends Substitution {
 
         context = null;
 
-        frameSubstitutionn = new FrameSubstitution(context, string, node, targetFrame, replacementFrame);
+        const frameSubstitutionn = new FrameSubstitution(context, string, node, targetFrame, replacementFrame);
+
+        return frameSubstitutionn;
       }, context);
     }
 

package/src/element/substitution/metaLevel.js

@@ -176,7 +176,7 @@ export default define(class MetaLevelSubstitution extends Substitution {
 
     context = ephemeralContext; ///
 
-    const metaLevelSubstitution = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             metaLevelSubstitutionNode = instantiateMetaLevelSubstitution(string, context),
             targetReference = targetReferenceFromMetaLevelSubstitutionNode(metaLevelSubstitutionNode, context),
@@ -186,8 +186,6 @@ export default define(class MetaLevelSubstitution extends Substitution {
 
       return metaLevelSubstitution;
     }, context);
-
-    return metaLevelSubstitution;
   }
 
   static fromStatementAndReference(statement, reference, context) {

package/src/element/substitution/reference.js

@@ -166,7 +166,7 @@ export default define(class ReferenceSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {
+      referenceSubstitutionn = instantiate((context) => {
         const { string } = json,
               referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),
               node = referenceSubstitutionNode,  ///
@@ -175,7 +175,9 @@ export default define(class ReferenceSubstitution extends Substitution {
 
         context = null;
 
-        referenceSubstitutionn = new ReferenceSubstitution(context, string, node, targetReference, replacementReference);
+        const referenceSubstitutionn = new ReferenceSubstitution(context, string, node, targetReference, replacementReference);
+
+        return referenceSubstitutionn;
       }, context);
     }
 

package/src/element/substitution/statement.js

@@ -284,7 +284,7 @@ export default define(class StatementSubstitution extends Substitution {
     return replacementStatemnentUnifies;
   }
 
-  unifyWithSipmleSubstitution(simpleSubstitution, generalContext, specificContext) {
+  unifyWithSimpleSubstitution(simpleSubstitution, generalContext, specificContext) {
     let substitution;
 
     const complexSubstitution = this; ///
@@ -316,7 +316,7 @@ export default define(class StatementSubstitution extends Substitution {
           simpleSubstitution = context.findSimpleSubstitutionByMetavariableName(metavariableName);
 
     if (simpleSubstitution !== null) {
-      const substitution = this.unifyWithSipmleSubstitution(simpleSubstitution, generalContext, specificContext); ///
+      const substitution = this.unifyWithSimpleSubstitution(simpleSubstitution, generalContext, specificContext); ///
 
       if (substitution !== null) {
         const complexSubstitution = this, ///
@@ -352,7 +352,7 @@ export default define(class StatementSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {
+      statementSubstitutionn = instantiate((context) => {
         const { string } = json,
               statementSubstitutionNode = instantiateStatementSubstitution(string, context),
               node = statementSubstitutionNode,  ///
@@ -361,7 +361,9 @@ export default define(class StatementSubstitution extends Substitution {
 
         context = null;
 
-        statementSubstitutionn = new StatementSubstitution(context, string, node, targetStatement, replacementStatement);
+        const statementSubstitutionn = new StatementSubstitution(context, string, node, targetStatement, replacementStatement);
+
+        return statementSubstitutionn;
       }, context);
     }
 

package/src/element/substitution/term.js

@@ -187,7 +187,7 @@ export default define(class TermSubstitution extends Substitution {
     const { name } = json;
 
     if (this.name === name) {
-      instantiate((context) => {
+      termSubstitutionn = instantiate((context) => {
         const { string } = json,
               termSubstitutionNode = instantiateTermSubstitution(string, context),
               node = termSubstitutionNode,  ///
@@ -196,7 +196,9 @@ export default define(class TermSubstitution extends Substitution {
 
         context = null;
 
-        termSubstitutionn = new TermSubstitution(context, string, node, targetTerm, replacementTerm);
+        const termSubstitutionn = new TermSubstitution(context, string, node, targetTerm, replacementTerm);
+
+        return termSubstitutionn;
       }, context);
     }
 

package/src/element/term.js

@@ -238,7 +238,7 @@ export default define(class Term extends Element {
   static name = "Term";
 
   static fromJSON(json, context) {
-    const term = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             termNode = instantiateTerm(string, context),
             node = termNode,  ///
@@ -250,7 +250,5 @@ export default define(class Term extends Element {
 
       return term;
     }, context);
-
-    return term;
   }
 });

package/src/element/type.js

@@ -316,7 +316,7 @@ export default define(class Type extends Element {
   static name = "Type";
 
   static fromJSON(json, context) {
-    const type = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             typeNode = instantiateType(string, context),
             node = typeNode, ///
@@ -332,8 +332,6 @@ export default define(class Type extends Element {
 
       return type;
     }, context);
-
-    return type;
   }
 
   static fromName(name, context) {

package/src/element/typePrefix.js

@@ -43,7 +43,8 @@ export default define(class TypePrefix extends Element {
   static name = "TypePrefix";
 
   static fromJSON(json, context) {
-    const typePrefix = instantiate((context) => {const { string } = json,
+    return instantiate((context) => {
+      const { string } = json,
             typePrefixNode = instantiateTypePrefix(string, context),
             node = typePrefixNode, ///
             name = nameFromTypePrefixNode(typePrefixNode, context);
@@ -54,7 +55,5 @@ export default define(class TypePrefix extends Element {
 
       return typePrefix;
     }, context);
-
-    return typePrefix;
   }
 });

package/src/element/variable.js

@@ -153,17 +153,12 @@ export default define(class Variable extends Element {
             termTypeEqualToOrSubTypeOfVariableType = termType.isEqualToOrSubTypeOf(variableType);
 
       if (termTypeEqualToOrSubTypeOfVariableType) {
-        const { TermSubstitution } = elements;
+        const { TermSubstitution } = elements,
+              termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, context);
 
-        let termSubstitution;
+        termSubstitution.validate(generalContext, specificContext);
 
-        termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, context);
-
-        termSubstitution = termSubstitution.validate(generalContext, specificContext);  ///
-
-        if (termSubstitution !== null) {
-          termUnifies = true;
-        }
+        termUnifies = true;
       }
     }
 
@@ -189,7 +184,7 @@ export default define(class Variable extends Element {
   static name = "Variable";
 
   static fromJSON(json, context) {
-    const variable = instantiate((context) => {
+    return instantiate((context) => {
       const { string } = json,
             variableNode = instantiateVariable(string, context),
             node = variableNode,  ///
@@ -202,7 +197,5 @@ export default define(class Variable extends Element {
 
       return variable;
     }, context);
-
-    return variable;
   }
 });

package/src/process/unify.js

@@ -466,22 +466,6 @@ export function unifyTermWithConstructor(term, constructor, generalContext, spec
   return termUnifiesWithConstructor;
 }
 
-export function unifyStatementIntrinsically(generalStatement, specificStatement, generalContext, specificContext) {
-  let statementUnifiesIntrinsically = false;
-
-  const generalStatementNode = generalStatement.getNode(),
-        specificStatementNode = specificStatement.getNode(),
-        generalNode = generalStatementNode, ///
-        specificNode = specificStatementNode, ///
-        success = intrinsicLevelPass.run(generalNode, specificNode, generalContext, specificContext);
-
-  if (success) {
-    statementUnifiesIntrinsically = true;
-  }
-
-  return statementUnifiesIntrinsically;
-}
-
 export function unifyStatementWithCombinator(statement, combinator, stated, generalContext, specificContext) {
   let statementUnifiesWithCombinator = false;
 

package/src/utilities/context.js

@@ -1,11 +1,24 @@
 "use strict";
 
 import ScopedContext from "../context/scoped";
-import LiminalContext from "../context/liminal";
+import nominalContext from "../context/nominal";
 import LiteralContext from "../context/literal";
+import LiminalContext from "../context/liminal";
 import EphemeralContext from "../context/ephemeral";
-import SyntheticContext from "../context/synthetic";
 import BranchingContext from "../context/branching";
+import SyntheticContext from "../context/synthetic";
+
+export function nominally(innerFunction) {
+  let context;
+
+  context = nominalContext; ///
+
+  const literalContext = LiteralContext.fromNothing(context);
+
+  context = literalContext;  ///
+
+  return innerFunction(context);
+}
 
 export function join(innerFunction, ...contexts) {
   const syntheticContext = SyntheticContext.fromContexts(...contexts),
@@ -39,11 +52,26 @@ export function reconcile(innerFunction, context) {
 }
 
 export function instantiate(innerFunction, context) {
+  const releaseContext = releaseContextFromContext(context),
+        sterilisedContext = sterilisedContextFromContext(context);
+
+  context = releaseContext; ///
+
   const literalContext = LiteralContext.fromNothing(context);
 
   context = literalContext;  ///
 
-  return innerFunction(context);
+  const element = innerFunction(context);
+
+  context = element.getContext();
+
+  if (context !== null) {
+    context = sterilisedContext;  ///
+
+    element.setContext(context);
+  }
+
+  return element;
 }
 
 export async function asyncRestrict(innerFunction, metaLevelSubstitutions, context) {
@@ -67,3 +95,57 @@ export async function asyncReconcile(innerFunction, context) {
 
   return await innerFunction(context);
 }
+
+function sterilisedContextFromContext(context) {
+  let contextExtraneousContext = isContextExtraneousContext(context);
+
+  while (contextExtraneousContext) {
+    context = context.getContext();
+
+    contextExtraneousContext = isContextExtraneousContext(context);
+  }
+
+  const ephemeralContext = EphemeralContext.fromNothing(context),
+        sterilisedContext = ephemeralContext; ///
+
+  return sterilisedContext;
+}
+
+function releaseContextFromContext(context) {
+  let contextFileContext = isContextFileContext(context);
+
+  while (!contextFileContext) {
+    context = context.getContext();
+
+    contextFileContext = isContextFileContext(context);
+  }
+
+  const releaseContext = context;
+
+  return releaseContext;
+}
+
+function isContextFileContext(context) {
+  const parentContext = context.getContext(), ///
+        parentContextReleaseContext = isContextReleaseContext(parentContext),
+        contextFileContext = parentContextReleaseContext; ///
+
+  return contextFileContext;
+}
+
+function isContextReleaseContext(context) {
+  const releaseContext = context.getReleaseContext(),
+        contextReleaseContext = (context === releaseContext);
+
+  return contextReleaseContext;
+}
+
+function isContextExtraneousContext(context) {
+  const contextLiminalContext = (context instanceof LiminalContext),
+        contextEphemeralContext = (context instanceof EphemeralContext),
+        contextBranchingContext = (context instanceof BranchingContext),
+        contextSyntheticContext = (context instanceof SyntheticContext),
+        contextExtraneousContext = (contextLiminalContext || contextEphemeralContext || contextBranchingContext || contextSyntheticContext);
+
+  return contextExtraneousContext;
+}

package/src/utilities/instance.js

@@ -1,8 +1,6 @@
 "use strict";
 
-import nominalContext from "../context/nominal";
-
-import { instantiate } from "../utilities/context";
+import { nominally } from "../utilities/context";
 import { BASE_TYPE_SYMBOL } from "../constants";
 import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
 import { instantiateCombinator, instantiateConstructor } from "../process/instantiate";
@@ -13,9 +11,7 @@ let bracketedCombinator = null,
 
 export function bracketedCombinatorFromNothing() {
   if (bracketedCombinator === null) {
-    const context = nominalContext; ///
-
-    bracketedCombinator = instantiate((context) => {
+    bracketedCombinator = nominally((context) => {
       const bracketedCombinatorString = `(${STATEMENT_META_TYPE_NAME})`,
             string = bracketedCombinatorString, ///
             combinatorNode = instantiateCombinator(string, context),
@@ -23,7 +19,7 @@ export function bracketedCombinatorFromNothing() {
             bracketedCombinator = combinatorFromCombinatorNode(bracketedCombinatorNode, context);
 
       return bracketedCombinator;
-    }, context);
+    });
   }
 
   return bracketedCombinator;
@@ -31,9 +27,7 @@ export function bracketedCombinatorFromNothing() {
 
 export function bracketedConstructorFromNothing() {
   if (bracketedConstructor === null) {
-    const context = nominalContext; ///
-
-    bracketedConstructor = instantiate((context) => {
+    bracketedConstructor = nominally((context) => {
       const bracketedConstructorString = `(${BASE_TYPE_SYMBOL})`,
             string = bracketedConstructorString,  ///
             constructorNode = instantiateConstructor(string, context),
@@ -41,7 +35,7 @@ export function bracketedConstructorFromNothing() {
             bracketedConstructor = constructorFromConstructorNode(bracketedConstructorNode, context);
 
       return bracketedConstructor;
-    }, context);
+    });
   }
 
   return bracketedConstructor;

package/src/utilities/unification.js

@@ -62,20 +62,14 @@ async function unifyStatementWithReference(statement, reference, satisfiesAssert
       const metaLevelSubstitutions = context.hasMetaLevelSubstitutions();
 
       if (metaLevelSubstitutions) {
-        const { MetaLevelSubstitution } = elements;
-
-        let metaLevelSubstitution;
-
-        metaLevelSubstitution = MetaLevelSubstitution.fromStatementAndReference(statement, reference, context);
-
-        const generalContext = context, ///
+        const { MetaLevelSubstitution } = elements,
+              metaLevelSubstitution = MetaLevelSubstitution.fromStatementAndReference(statement, reference, context),
+              generalContext = context, ///
               specificContext = context;  ///
 
-        metaLevelSubstitution = metaLevelSubstitution.validate(generalContext, specificContext);  ///
+        metaLevelSubstitution.validate(generalContext, specificContext);
 
-        if (metaLevelSubstitution !== null) {
-          statementUnifiesWithReference = true;
-        }
+        statementUnifiesWithReference = true;
       }
     }
 

package/src/utilities/validation.js

@@ -104,20 +104,28 @@ function validateStatementAsMetavariable(statement, stated, context) {
       statementValidatesAsMetavariable = true;
 
       const { TermSubstitution, FrameSubstitution } = elements,
-            frameSubstitution = FrameSubstitution.fromStatement(statement, context),
-            termSubstitution = TermSubstitution.fromStatement(statement, context);
+            generalContext = context, ///
+            specificContext = context;  ///
 
-      let substitution;
+      let termSubstitution,
+          frameSubstitution;
 
-      substitution = (termSubstitution || frameSubstitution);
+      termSubstitution = TermSubstitution.fromStatement(statement, context);
 
-      if (substitution !== null) {
-        const generalContext = context, ///
-              specificContext = context;  ///
+      if (termSubstitution !== null) {
+        termSubstitution = termSubstitution.validate(generalContext, specificContext);  ///
 
-        substitution = substitution.validate(generalContext, specificContext);
+        if (termSubstitution === null) {
+          statementValidatesAsMetavariable = false;
+        }
+      }
+
+      frameSubstitution = FrameSubstitution.fromStatement(statement, context);
+
+      if (frameSubstitution !== null) {
+        frameSubstitution = frameSubstitution.validate(generalContext, specificContext);  ///
 
-        if (substitution === null) {
+        if (frameSubstitution === null) {
           statementValidatesAsMetavariable = false;
         }
       }