occam-verify-cli 1.0.760 → 1.0.764

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/utilities/context.js

@@ -1,13 +1,25 @@
 "use strict";
 
 import ScopedContext from "../context/scoped";
-import LiminalContext from "../context/liminal";
-import LiteralContext from "../context/literal";
 import nominalContext from "../context/nominal";
+import LiteralContext from "../context/literal";
+import LiminalContext from "../context/liminal";
 import EphemeralContext from "../context/ephemeral";
 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),
         context = syntheticContext;  ///
@@ -39,26 +51,22 @@ export function reconcile(innerFunction, context) {
   return innerFunction(context);
 }
 
-export function nominally(innerFunction) {
-  let context;
-
-  context = nominalContext; ///
-
+export function instantiate(innerFunction, context) {
   const literalContext = LiteralContext.fromNothing(context);
 
   context = literalContext;  ///
 
-  return innerFunction(context);
-}
+  const element = innerFunction(context);
 
-export function instantiate(innerFunction, context) {
-  const literalContext = LiteralContext.fromNothing(context);
+  context = element.getContext();
 
-  steriiseLiteralContext(literalContext);
+  if (context !== null) {
+    context = context.getContext();
 
-  context = literalContext;  ///
+    element.setContext(context);
+  }
 
-  return innerFunction(context);
+  return element;
 }
 
 export async function asyncRestrict(innerFunction, metaLevelSubstitutions, context) {
@@ -83,10 +91,27 @@ export async function asyncReconcile(innerFunction, context) {
   return await innerFunction(context);
 }
 
-function steriiseLiteralContext(literalContext) {
-  let context;
+function sanitisedContextFromContext(context) {
+  let contextExtraneousContext = isContextExtraneousContext(context);
+
+  while (contextExtraneousContext) {
+    context = context.getContext();
 
-  context = literalContext.getContext();
+    contextExtraneousContext = isContextExtraneousContext(context);
+  }
+
+  const ephemeralContext = EphemeralContext.fromNothing(context),
+        sanitisedContext = ephemeralContext; ///
+
+  return sanitisedContext;
+}
 
+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/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;
         }
       }