occam-verify-cli 1.0.587 → 1.0.602

package/src/utilities/element.js

@@ -668,17 +668,12 @@ export function referenceSubstitutionFromReferenceSubstitutionNode(referenceSubs
   return referenceSubstitution;
 }
 
-export function statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, substitution, context) {
-  if (context === undefined) {
-    context = substitution; ///
-
-    substitution = null;
-  }
-
+export function statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
   const { StatementSubstitution } = elements,
         node = statementSubstitutionNode,  ///
         string = context.nodeAsString(node),
-        resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, substitution, context),
+        resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
+        substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
         targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
         replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
         statementSubstitution = new StatementSubstitution(context, string, node, resolved, substitution, targetStatement, replacementStatement);
@@ -1431,8 +1426,8 @@ export function prefixedFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode,
   return prefixed;
 }
 
-export function resolvedFromStatementSubstitutionNode(statementSubstitutionNode, substitution, context) {
-  const resolved = (substitution === null);
+export function resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+  const resolved = statementSubstitutionNode.isResolved();
 
   return resolved;
 }
@@ -1506,6 +1501,14 @@ export function suppositionsFromTopLevelMetaAssertionNode(metaLemmaMetathoremNod
   return suppositions;
 }
 
+export function substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+  const frameSubstitution = frameSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
+        termSubstitution = termSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
+        substitution = (frameSubstitution || termSubstitution);
+
+  return substitution;
+}
+
 export function constructorFromConstructorDeclarationNode(constructorDeclarationNode, context) {
   const constructorNode = constructorDeclarationNode.getConstructorNode(),
         constructor = constructorFromConstructorNode(constructorNode, context);
@@ -1534,6 +1537,30 @@ export function targetStatementFromStatementSubstitutionNode(statementSubstituti
   return targetStatement;
 }
 
+export function termSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+  let termSubstitution = null;
+
+  const termSubstitutionNode = statementSubstitutionNode.getTermSubstitutionNode();
+
+  if (termSubstitutionNode !== null) {
+    termSubstitution = termSubstitutionFromTermubstitutionNode(termSubstitutionNode, context);
+  }
+
+  return termSubstitution;
+}
+
+export function frameSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+  let frameSubstitution = null;
+
+  const frameSubstitutionNode = statementSubstitutionNode.getFrameSubstitutionNode();
+
+  if (frameSubstitutionNode !== null) {
+    frameSubstitution = frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode, context);
+  }
+
+  return frameSubstitution;
+}
+
 export function replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context) {
   const replacementReferenceNode = referenceSubstitutionNode.getReplacementReferenceNode(),
         replacementReference = referenceFromReferenceNode(replacementReferenceNode, context);

package/src/utilities/statement.js

@@ -24,13 +24,6 @@ export function judgementFromStatement(statement, context) {
   return judgement;
 }
 
-export function metavariableFromStatement(statement, context) {
-  const statementNode = statement.getNode(),
-        metavariable = metavariableFromStatementNode(statementNode, context);
-
-  return metavariable;
-}
-
 export function typeAssertionFromStatement(statement, context) {
   const statementNode = statement.getNode(),
         typeAssertion = typeAssertionFromStatementNode(statementNode, context);

package/src/utilities/string.js

@@ -16,6 +16,20 @@ export function termsStringFromTerms(terms) {
   return termsString;
 }
 
+export function framesStringFromFrames(frames) {
+  const framesString = frames.reduce((framesString, frame) => {
+    const frameString = frame.getString();
+
+    framesString = (framesString !== null) ?
+                    `${framesString}, ${frameString}` :
+                       frameString;
+
+    return framesString;
+  }, null);
+
+  return framesString;
+}
+
 export function labelsStringFromLabels(labels) {
   const labelsString = labels.reduce((labelsString, label) => {
     const labelString = label.getString();

package/src/utilities/substitutions.js

@@ -1,6 +1,10 @@
 "use strict";
 
-export function termFromTermAndSubstitutions(term, substitutions, generalContext, specificContext) {
+import { arrayUtilities } from "necessary";
+
+const { compress } = arrayUtilities;
+
+export function termFromTermAndSubstitutions(term, generalContext, specificContext) {
   if (term !== null) {
     const termNode = term.getNode(),
           termSingular = term.isSingular();
@@ -12,12 +16,13 @@ export function termFromTermAndSubstitutions(term, substitutions, generalContext
             variable = generalContext.findVariableByVariableIdentifier(variableIdentifier);
 
       if (variable !== null) {
-        const substitution = substitutions.findSubstitutionByVariable(variable);
+        const substitution = specificContext.findSubstitutionByVariable(variable, generalContext, specificContext);
 
         if (substitution !== null) {
-          const termSubstitution = substitution;  ///
+          const termSubstitution = substitution,  ///
+                replacementTerm = termSubstitution.getReplacementTerm();
 
-          term = termSubstitution.getTerm();
+          term = replacementTerm; ///
         }
       }
     }
@@ -26,7 +31,7 @@ export function termFromTermAndSubstitutions(term, substitutions, generalContext
   return term;
 }
 
-export function frameFromFrameAndSubstitutions(frame, substitutions, generalContext, specificContext) {
+export function frameFromFrameAndSubstitutions(frame, generalContext, specificContext) {
   if (frame !== null) {
     const frameNode = frame.getNode(),
           frameSingular = frame.isSingular();
@@ -38,14 +43,13 @@ export function frameFromFrameAndSubstitutions(frame, substitutions, generalCont
             metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);
 
       if (metavariable !== null) {
-        let substitution = null;
-
-        substitution = substitutions.findSubstitutionByMetavariableAndSubstitution(metavariable, substitution);
+        const substitution = specificContext.findSubstitutionByMetavariable(metavariable, generalContext, specificContext);
 
         if (substitution !== null) {
-          const frameSubstitution = substitution; ///
+          const frameSubstitution = substitution, ///
+                replacementFrame = frameSubstitution.getReplacementFrame();
 
-          frame = frameSubstitution.getFrame();
+          frame = replacementFrame; ///
         }
       }
     }
@@ -54,32 +58,47 @@ export function frameFromFrameAndSubstitutions(frame, substitutions, generalCont
   return frame;
 }
 
-export function statementFromStatementAndSubstitutions(statement, substitutions, generalContext, specificContext) {
+export function statementFromStatementAndSubstitutions(statement, generalContext, specificContext) {
   if (statement !== null) {
     const statementNode = statement.getNode(),
           statementSingular = statement.isSingular();
 
-    if (statementSingular) {
-      statement = null;
+    statement = null;
 
+    if (statementSingular) {
       let substitution = null;
 
       const substitutionNode = statementNode.getSubstitutionNode();
 
       if (substitutionNode !== null) {
-        substitution = generalContext.findSubstitutionBySubstitutionNode(substitutionNode);
+        let context = generalContext; ///
+
+        generalContext = specificContext; ///
+
+        specificContext = context;  ///
+
+        substitution = specificContext.findSubstitutionBySubstitutionNode(substitutionNode, generalContext, specificContext);
+
+        context = generalContext; ///
+
+        generalContext = specificContext; ///
+
+        specificContext = context;  ///
       }
 
       const metavariableName = statementNode.getMetavariableName(),
             metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);
 
       if (metavariable !== null) {
-        substitution = substitutions.findSubstitutionByMetavariableAndSubstitution(metavariable, substitution);
+        substitution = (substitution !== null) ?
+                         specificContext.findSubstitutionByMetavariableAndSubstitution(metavariable, substitution, generalContext, specificContext) :
+                           specificContext.findSubstitutionByMetavariable(metavariable, generalContext, specificContext);
 
         if (substitution !== null) {
-          const statementSubstitution = substitution; ///
+          const statementSubstitution = substitution, ///
+                replacementStatement = statementSubstitution.getReplacementStatement();
 
-          statement = statementSubstitution.getStatement();
+          statement = replacementStatement; ///
         }
       }
     }
@@ -87,3 +106,26 @@ export function statementFromStatementAndSubstitutions(statement, substitutions,
 
   return statement;
 }
+
+export function metavariablesFromSubstitutions(substitutions, generalContext, specificContext) {
+  const metavariables = [];
+
+  substitutions.forEach((substitution) => {
+    const context = generalContext, ///
+          metavariable = substitution.getMetavariable(generalContext, specificContext);
+
+    if (metavariable !== null) {
+      metavariables.push(metavariable);
+    }
+  });
+
+  compress(metavariables, (metavariableA, metavariableB) => {
+    const metavariableComparesToMetavariableB = metavariableB.compare(metavariableA);
+
+    if (!metavariableComparesToMetavariableB) {
+      return true;
+    }
+  });
+
+  return metavariables;
+}

package/src/utilities/unification.js

@@ -60,6 +60,8 @@ async function unifyStatementWithReference(statement, reference, satisfiesAssert
       //   const { StatementSubstitution } = elements;
       //
       //   StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context);
+
+      //  validate
       //
       // }, generalContext, specificContext);
 
@@ -164,6 +166,8 @@ async function unifyStatementWithTopLevelAssertion(statement, reference, satisfi
         //   const { StatementSubstitution } = elements;
         //
         //   StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context);
+
+        // vaiddate
         //
         // }, generalContext, specificContext);
 

package/src/utilities/validation.js

@@ -95,7 +95,9 @@ function validateStatementAsMetavariable(statement, assignments, stated, context
             substitution = (termSubstitution || frameSubstitution);
 
       if (substitution !== null) {
-        const substitutionValidates = substitution.validate(context);
+        const generalContext = context, ///
+              specificContext = context,  ///
+              substitutionValidates = substitution.validate(generalContext, specificContext);
 
         if (!substitutionValidates) {
           statementValidatesAsMetavariableAndSubstitution = false;