occam-verify-cli 1.0.852 → 1.0.857

package/src/element/variable.js

@@ -113,22 +113,21 @@ export default define(class Variable extends Element {
     context.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);
 
     let variable,
-        substitution;
+        derivedSubstitution;
 
     variable = this; ///
 
     const variableNode = variable.getNode();
 
-    substitution = context.findSubstitutionByVariableNode(variableNode);
+    derivedSubstitution = context.findDerivedSubstitutionByVariableNode(variableNode);
 
-    if (substitution !== null) {
-      const substitutionComparesToTerm = substitution.compareTerm(term, context);
+    if (derivedSubstitution !== null) {
+      const derivedSubstitutionComparesToTerm = derivedSubstitution.compareTerm(term, context);
 
-      if (substitutionComparesToTerm) {
-        const termSubstitution = substitution,  ///
-              termSubstitutionString = termSubstitution.getString();
+      if (derivedSubstitutionComparesToTerm) {
+        const derivedSubstitutionString = derivedSubstitution.getString();
 
-        context.trace(`The '${termSubstitutionString}' term substitution is already present.`);
+        context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);
 
         termUnifies = true;
       }

package/src/utilities/context.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import MenmicContext from "../context/mnemic";
 import NestedContext from "../context/nested";
 import TheticContext from "../context/thetic";
 import BoundedContext from "../context/bounded";
@@ -8,11 +9,10 @@ import LiteralContext from "../context/literal";
 import LiminalContext from "../context/liminal";
 import SynopticContext from "../context/synoptic";
 import IllativeContext from "../context/illative";
-import EphemeralContext from "../context/ephemeral";
 import BranchingContext from "../context/branching";
 import NominalFileContext from "../context/file/nominal";
 
-import { ephemeralContextsFromJSON, ephemeralContextToEphemeralContextJSON } from "../utilities/json";
+import { mnemicContextsFromJSON, mnemicContextToMnemicContextJSON } from "../utilities/json";
 
 export function join(innerFunction, ...contexts) {
   const synopticContext = SynopticContext.fromContexts(...contexts),
@@ -81,9 +81,9 @@ export function descend(innerFunction, context) {
 
 export function attempt(innerFunction, ...contexts) {
   contexts = contexts.map((context) => {  ///
-    const ephemeralContext = EphemeralContext.fromNothing(context);
+    const mnemicContext = MenmicContext.fromNothing(context);
 
-    context = ephemeralContext;  ///
+    context = mnemicContext;  ///
 
     return context;
   })
@@ -121,9 +121,9 @@ export function reconcile(innerFunction, context) {
 
 export function serialise(innerFunction, ...contexts) {
   contexts = contexts.map((context) => {  ///
-    const ephemeralContext = context, ///
-          ephemeralContextJSON = ephemeralContextToEphemeralContextJSON(ephemeralContext),
-          contextJSON = ephemeralContextJSON; ///
+    const mnemicContext = context, ///
+          mnemicContextJSON = mnemicContextToMnemicContextJSON(mnemicContext),
+          contextJSON = mnemicContextJSON; ///
 
     context = contextJSON;  ///
 
@@ -134,8 +134,8 @@ export function serialise(innerFunction, ...contexts) {
 }
 
 export function unserialise(innerFunction, json, context) {
-  const ephemeralContexts = ephemeralContextsFromJSON(json, context),
-        contexts = ephemeralContexts; ///
+  const mnemicContexts = mnemicContextsFromJSON(json, context),
+        contexts = mnemicContexts; ///
 
   return innerFunction(json, ...contexts);
 }

package/src/utilities/element.js

@@ -10,7 +10,7 @@ import { equivalenceStringFromTerms,
          subproofStringFromSuppositionsAndSubDerivation,
          procedureCallStringFromProcedureReferenceAndParameters,
          topLevelAssertionStringFromLabelsSuppositionsAndDeduction,
-         topLevelMetaAssertionStringFromLabelSuppositionsDeductionAndMetaLevelAssumptions } from "../utilities/string";
+         topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction } from "../utilities/string";
 
 export function typeFromTypeNode(typeNode, context) {
   let type;
@@ -368,7 +368,7 @@ export function metaLemmaFromMetaLemmaNode(metaLemmaNode, context) {
         deduction = deductionFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context),
         suppositions = suppositionsFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context),
         metaLevelAssumptions = metaLevelAssumptionsFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context),
-        topLevelMetaAssertionString = topLevelMetaAssertionStringFromLabelSuppositionsDeductionAndMetaLevelAssumptions(label, suppositions, deduction, metaLevelAssumptions),
+        topLevelMetaAssertionString = topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction),
         node = metaLemmaMetathoremNode, ///
         string = topLevelMetaAssertionString, ///
         lineIndex = null;
@@ -561,7 +561,7 @@ export function metatheoremFromMetatheoremNode(metatheoremNode, context) {
         deduction = deductionFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context),
         suppositions = suppositionsFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context),
         metaLevelAssumptions = metaLevelAssumptionsFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context),
-        topLevelMetaAssertionString = topLevelMetaAssertionStringFromLabelSuppositionsDeductionAndMetaLevelAssumptions(label, suppositions, deduction, metaLevelAssumptions),
+        topLevelMetaAssertionString = topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction),
         node = metaLemmaMetathoremNode, ///
         string = topLevelMetaAssertionString, ///
         lineIndex = null;

package/src/utilities/json.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import elements from "../elements";
-import EphemeralContext from "../context/ephemeral";
+import MnemicContext from "../context/mnemic";
 
 export function nameFromJSON(json, context) {
   let { name } = json;
@@ -659,7 +659,7 @@ export function metavariablesFromJSON(json, context) {
   return metavariables;
 }
 
-export function ephemeralContextsFromJSON(json, context) {
+export function mnemicContextsFromJSON(json, context) {
   const releaseContext = context; ///
 
   const { contexts = [] } = json;
@@ -671,15 +671,15 @@ export function ephemeralContextsFromJSON(json, context) {
   }
 
   const contextsJSON = contexts,  ///
-        ephemeralContexts = contextsJSON.map((contextJSON) => {
+        mnemicContexts = contextsJSON.map((contextJSON) => {
           const json = contextJSON, ///
                 context = releaseContext, ///
-                emphemeralContext = EphemeralContext.fromJSON(json, context);
+                mnemicContext = MnemicContext.fromJSON(json, context);
 
-          return emphemeralContext;  ///
+          return mnemicContext;  ///
         });
 
-  return ephemeralContexts;
+  return mnemicContexts;
 }
 
 export function declaredVariablesFromJSON(json, context) {
@@ -870,10 +870,10 @@ export function nominalTypeNameToNominalTypeNameJSON(nominalTypeName) {
   return nominalTypeNameJSON;
 }
 
-export function ephemeralContextToEphemeralContextJSON(ephemeralContext) {
-  const ephemeralContextJSON = ephemeralContext.toJSON();
+export function mnemicContextToMnemicContextJSON(mnemicContext) {
+  const mnemicContextJSON = mnemicContext.toJSON();
 
-  return ephemeralContextJSON;
+  return mnemicContextJSON;
 }
 
 export function procedureReferenceToProcedureReferenceJSON(procedureReference) {

package/src/utilities/string.js

@@ -89,20 +89,6 @@ export function parametersStringFromParameters(parameters) {
   return parametersString;
 }
 
-export function assumptionsStringFromAssumptions(assumptions) {
-  const assumptionsString = assumptions.reduce((assumptionsString, assumption) => {
-    const assumptionString = assumption.getString();
-
-    assumptionsString = (assumptionsString === null) ?
-                          assumptionString: ///
-                           `${assumptionsString}, ${assumptionString}`;
-
-    return assumptionsString;
-  }, null);
-
-  return assumptionsString;
-}
-
 export function suppositionsStringFromSuppositions(suppositions) {
   const suppositionsString = suppositions.reduce((suppositionsString, supposition) => {
     const suppositionString = supposition.getString();
@@ -117,20 +103,6 @@ export function suppositionsStringFromSuppositions(suppositions) {
   return suppositionsString;
 }
 
-export function metalevelAssumptionsStringFromMetaLevelAssumptions(metaLevelAssumptions) {
-  const metaLevelAssumptionsString = metaLevelAssumptions.reduce((metaLevelAssumptionsString, metaLevelAssumption) => {
-    const metaLevelAssumptionString = metaLevelAssumption.getString();
-
-    metaLevelAssumptionsString = (metaLevelAssumptionsString === null) ?
-                                   metaLevelAssumptionString: ///
-                                    `${metaLevelAssumptionsString}, ${metaLevelAssumptionString}`;
-
-    return metaLevelAssumptionsString;
-  }, null);
-
-  return metaLevelAssumptionsString;
-}
-
 export function signatureStringFromTerms(terms) {
   const termsString = termsStringFromTerms(terms),
         signatureString = `[${termsString}]`;
@@ -250,6 +222,17 @@ export function topLevelAssertionStringFromLabelsSuppositionsAndDeduction(labels
   return topLevelAssertionString;
 }
 
+export function topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction) {
+  const labelString = label.getString(),
+        deductionString = deduction.getString(),
+        suppositionsString = suppositionsStringFromSuppositions(suppositions),
+        topLevelMetaAssertionString = (suppositionsString !== null) ?
+                                       `${labelString} :: [${suppositionsString}]...${deductionString}` :
+                                         `${labelString} :: ${deductionString}`;
+
+  return topLevelMetaAssertionString;
+}
+
 export function statementSubstitutionStringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution) {
   const statementString = statement.getString(),
         metavariableString = metavariable.getString(),
@@ -258,15 +241,3 @@ export function statementSubstitutionStringFromStatementMetavariableAndSubstitut
 
   return statementSubstitutionString;
 }
-
-export function topLevelMetaAssertionStringFromLabelSuppositionsDeductionAndMetaLevelAssumptions(label, suppositions, deduction, metaLevelAssumptions) {
-  const labelString = label.getString(),
-        deductionString = deduction.getString(),
-        suppositionsString = suppositionsStringFromSuppositions(suppositions),
-        metalevelAssumptionsString = metalevelAssumptionsStringFromMetaLevelAssumptions(metaLevelAssumptions),
-        topLevelMetaAssertionString = (suppositionsString !== null) ?
-                                       `${labelString} :: [${suppositionsString}]...${deductionString} ${metalevelAssumptionsString}` :
-                                         `${labelString} :: ${deductionString} ${metalevelAssumptionsString}`;
-
-  return topLevelMetaAssertionString;
-}

package/src/utilities/substitutions.js

@@ -96,11 +96,11 @@ export function statementFromStatementAndSubstitutions(statement, generalContext
   return statement;
 }
 
-export function metavariableNodesFromSubstitutions(substitutions) {
+export function metavariableNodesFromDerivedSubstitutions(derivedSubstitutions) {
   const metavariableNodes = [];
 
-  substitutions.forEach((substitution) => {
-    const metavariableNode = substitution.getMetavariableNode();
+  derivedSubstitutions.forEach((derivedSubstitution) => {
+    const metavariableNode = derivedSubstitution.getMetavariableNode();
 
     if (metavariableNode !== null) {
       metavariableNodes.push(metavariableNode);