occam-verify-cli 1.0.871 → 1.0.873

package/src/process/unify.js

@@ -147,6 +147,38 @@ class StatementPass extends ZipPassBase {
   ];
 }
 
+class IntrinsicPass extends ZipPass {
+  static maps = [
+    {
+      generalNodeQuery: termVariableNodeQuery,
+      specificNodeQuery: termNodeQuery,
+      run: (generalTermVariableNode, specificTermNode, generalContext, specificContext) => {
+        let success = false;
+
+        const termNode = specificTermNode, ///
+              variableNode = generalTermVariableNode; ///
+
+        let context;
+
+        context = generalContext; ///
+
+        const variable = context.findVariableByVariableNode(variableNode);
+
+        context = specificContext;  ///
+
+        const term = context.findTermByTermNode(termNode),
+              termUnifies = variable.unifyTerm(term, generalContext, specificContext);
+
+        if (termUnifies) {
+          success = true;
+        }
+
+        return success;
+      }
+    }
+  ];
+}
+
 class CombinatorPass extends ZipPass {
   static maps = [
     {
@@ -370,44 +402,12 @@ class SubstitutionPass extends ZipPass {
   ];
 }
 
-class IntrinsicLevelPass extends ZipPass {
-  static maps = [
-    {
-      generalNodeQuery: termVariableNodeQuery,
-      specificNodeQuery: termNodeQuery,
-      run: (generalTermVariableNode, specificTermNode, generalContext, specificContext) => {
-        let success = false;
-
-        const termNode = specificTermNode, ///
-              variableNode = generalTermVariableNode; ///
-
-        let context;
-
-        context = generalContext; ///
-
-        const variable = context.findVariableByVariableNode(variableNode);
-
-        context = specificContext;  ///
-
-        const term = context.findTermByTermNode(termNode),
-              termUnifies = variable.unifyTerm(term, generalContext, specificContext);
-
-        if (termUnifies) {
-          success = true;
-        }
-
-        return success;
-      }
-    }
-  ];
-}
-
 const statementPass = new StatementPass(),
+      intrinsicPass = new IntrinsicPass(),
       combinatorPass = new CombinatorPass(),
       constructorPass = new ConstructorPass(),
       metavariablePass = new MetavariablePass(),
-      substitutionPass = new SubstitutionPass(),
-      intrinsicLevelPass = new IntrinsicLevelPass();
+      substitutionPass = new SubstitutionPass();
 
 export function unifyStatement(generalStatement, specificStatement, generalContext, specificContext) {
   let statementUnifies = false;
@@ -425,6 +425,20 @@ export function unifyStatement(generalStatement, specificStatement, generalConte
   return statementUnifies;
 }
 
+export function unifyMetavariable(generalMetavariable, specificMetavariable, generalContext, specificContext) {
+  let metavariableUnifies = false;
+
+  const generalMetavariableNode = generalMetavariable.getNode(),
+        specificMetavariableNode = specificMetavariable.getNode(),
+        success = metavariablePass.run(generalMetavariableNode, specificMetavariableNode, generalContext, specificContext);
+
+  if (success) {
+    metavariableUnifies = true;
+  }
+
+  return metavariableUnifies;
+}
+
 export function unifySubstitution(generalSubstitution, specificSubstitution, generalContext, specificContext) {
   let substitutionUnifies = false;
 
@@ -441,20 +455,6 @@ export function unifySubstitution(generalSubstitution, specificSubstitution, gen
   return substitutionUnifies;
 }
 
-export function unifyMetavariable(generalMetavariable, specificMetavariable, generalContext, specificContext) {
-  let metavariableUnifies = false;
-
-  const generalMetavariableNode = generalMetavariable.getNode(),
-        specificMetavariableNode = specificMetavariable.getNode(),
-        success = metavariablePass.run(generalMetavariableNode, specificMetavariableNode, generalContext, specificContext);
-
-  if (success) {
-    metavariableUnifies = true;
-  }
-
-  return metavariableUnifies;
-}
-
 export function unifyTermWithConstructor(term, constructor, generalContext, specificContext) {
   let termUnifiesWithConstructor = false;
 
@@ -492,7 +492,7 @@ export function unifyMetavariableIntrinsically(generalMetavariable, specificMeta
         specificMetavariableNode = specificMetavariable.getNode(),
         generalNode = generalMetavariableNode, ///
         specificNode = specificMetavariableNode, ///
-        success = intrinsicLevelPass.run(generalNode, specificNode, generalContext, specificContext);
+        success = intrinsicPass.run(generalNode, specificNode, generalContext, specificContext);
 
   if (success) {
     metavariableUnifiesIntrinsically = true;

package/src/utilities/context.js

@@ -36,12 +36,16 @@ export function ground(innerFunction) {
 }
 
 export function ablate(innerFunction, context) {
-  let contextNominalFileContext = (context instanceof NominalFileContext);
+  const released = context.isReleased();
 
-  while (!contextNominalFileContext) {
-    context = context.getContext();
+  if (!released) {
+    let contextNominalFileContext = (context instanceof NominalFileContext);
 
-    contextNominalFileContext = (context instanceof NominalFileContext);
+    while (!contextNominalFileContext) {
+      context = context.getContext();
+
+      contextNominalFileContext = (context instanceof NominalFileContext);
+    }
   }
 
   return innerFunction(context);
@@ -80,9 +84,13 @@ export function descend(innerFunction, context) {
 }
 
 export function attempt(innerFunction, context) {
-  const mnemicContext = MenmicContext.fromNothing(context);
+  const released = context.isReleased();
+
+  if (!released) {
+    const mnemicContext = MenmicContext.fromNothing(context);
 
-  context = mnemicContext;  ///
+    context = mnemicContext;  ///
+  }
 
   return innerFunction(context);
 }
@@ -143,12 +151,16 @@ export function unserialise(innerFunction, json, context) {
 
 export function ablates(innerFunction, ...contexts) {
   contexts = contexts.map((context) => {  ///
-    let contextNominalFileContext = (context instanceof NominalFileContext);
+    const released = context.isReleased();
 
-    while (!contextNominalFileContext) {
-      context = context.getContext();
+    if (!released) {
+      let contextNominalFileContext = (context instanceof NominalFileContext);
 
-      contextNominalFileContext = (context instanceof NominalFileContext);
+      while (!contextNominalFileContext) {
+        context = context.getContext();
+
+        contextNominalFileContext = (context instanceof NominalFileContext);
+      }
     }
 
     return context;
@@ -158,10 +170,14 @@ export function ablates(innerFunction, ...contexts) {
 }
 
 export function attempts(innerFunction, ...contexts) {
-  contexts = contexts.map((context) => {
-    const mnemicContext = MenmicContext.fromNothing(context);
+  contexts = contexts.map((context) => {  ///
+    const released = context.isReleased();
 
-    context = mnemicContext;  ///
+    if (!released) {
+      const mnemicContext = MenmicContext.fromNothing(context);
+
+      context = mnemicContext;  ///
+    }
 
     return context;
   });

package/src/utilities/json.js

@@ -772,9 +772,13 @@ export function termToTermJSON(term) {
 }
 
 export function typeToTypeJSON(type) {
-  const typeJSON = (type !== null) ?
-                     type.toJSON() :
-                       null;
+  let typeJSON = null;
+
+  if (type !== null) {
+    const abridged = true;
+
+    typeJSON = type.toJSON(abridged);
+  }
 
   return typeJSON;
 }
@@ -1008,9 +1012,9 @@ export function hypothesesToHypothesesJSON(hypotheses) {
 }
 
 export function superTypesToSuperTypesJSON(superTypes) {
-  const abridged = true,
-        superTypesJSON = superTypes.map((superType) => {
-          const superTypeJSON = superType.toJSON(abridged);
+  const superTypesJSON = superTypes.map((superType) => {
+          const abridged = true,
+                superTypeJSON = superType.toJSON(abridged);
 
           return superTypeJSON;
         });

package/src/utilities/validation.js

@@ -104,10 +104,8 @@ function validateStatementAsMetavariable(statement, context) {
 
       let substitution;
 
-      const generalContext = context, ///
-            specificContext = context,  ///
-            termSubstitution = TermSubstitution.fromStatement(statement, generalContext, specificContext),
-            frameSubstitution = FrameSubstitution.fromStatement(statement, generalContext, specificContext);
+      const termSubstitution = TermSubstitution.fromStatement(statement, context),
+            frameSubstitution = FrameSubstitution.fromStatement(statement, context);
 
       substitution = (termSubstitution || frameSubstitution);