occam-verify-cli 1.0.617 → 1.0.631

package/src/utilities/string.js

@@ -16,20 +16,6 @@ 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();
@@ -131,20 +117,6 @@ export function suppositionsStringFromSuppositions(suppositions) {
   return suppositionsString;
 }
 
-export function substitutionsStringFromSubstitutions(substitutions) {
-  const substitutionsString = substitutions.reduce((substitutionsString, substitution) => {
-    const substitutionString = substitution.getString();
-
-    substitutionsString = (substitutionsString === null) ?
-                             substitutionString : ///
-                              `${substitutionsString}, ${substitutionString}`;
-
-    return substitutionsString;
-  }, null);
-
-  return substitutionsString;
-}
-
 export function signatureStringFromTerms(terms) {
   const termsString = termsStringFromTerms(terms),
         signatureString = `[${termsString}]`;
@@ -154,11 +126,17 @@ export function signatureStringFromTerms(terms) {
 
 export function equivalenceStringFromTerms(terms) {
   const termsString = termsStringFromTerms(terms),
-        equivalenceString = termsString;  ///
+        equivalenceString = `[${termsString}]`;
 
   return equivalenceString;
 }
 
+export function typeStringFromNominalTypeName(nominalTypeName) {
+  const typeString = nominalTypeName;  ///
+
+  return typeString;
+}
+
 export function termSubstitutionStringFromTermAndVariable(term, variable) {
   const termString = term.getString(),
         variableString = variable.getString(),

package/src/utilities/substitutions.js

@@ -13,17 +13,13 @@ export function termFromTermAndSubstitutions(term, generalContext, specificConte
 
     if (termSingular) {
       const variableIdentifier = termNode.getVariableIdentifier(),
-            variable = generalContext.findVariableByVariableIdentifier(variableIdentifier);
+            substitution = specificContext.findSubstitutionByVariableIdentifier(variableIdentifier);
 
-      if (variable !== null) {
-        const substitution = specificContext.findSubstitutionByVariableIdentifier(variableIdentifier);
+      if (substitution !== null) {
+        const termSubstitution = substitution,  ///
+              replacementTerm = termSubstitution.getReplacementTerm();
 
-        if (substitution !== null) {
-          const termSubstitution = substitution,  ///
-                replacementTerm = termSubstitution.getReplacementTerm();
-
-          term = replacementTerm; ///
-        }
+        term = replacementTerm; ///
       }
     }
   }
@@ -40,17 +36,13 @@ export function frameFromFrameAndSubstitutions(frame, generalContext, specificCo
 
     if (frameSingular) {
       const metavariableName = frameNode.getMetavariableName(),
-            metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);
-
-      if (metavariable !== null) {
-        const substitution = specificContext.findSubstitutionByMetavariableName(metavariableName);
+            substitution = specificContext.findSubstitutionByMetavariableName(metavariableName);
 
-        if (substitution !== null) {
-          const frameSubstitution = substitution, ///
-                replacementFrame = frameSubstitution.getReplacementFrame();
+      if (substitution !== null) {
+        const frameSubstitution = substitution, ///
+              replacementFrame = frameSubstitution.getReplacementFrame();
 
-          frame = replacementFrame; ///
-        }
+        frame = replacementFrame; ///
       }
     }
   }
@@ -86,20 +78,17 @@ export function statementFromStatementAndSubstitutions(statement, generalContext
         specificContext = context;  ///
       }
 
-      const metavariableName = statementNode.getMetavariableName(),
-            metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);
+      const metavariableName = statementNode.getMetavariableName();
 
-      if (metavariable !== null) {
-        substitution = (substitution !== null) ?
-                         specificContext.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) :
-                           specificContext.findSubstitutionByMetavariableName(metavariableName);
+      substitution = (substitution !== null) ?
+                       specificContext.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) :
+                         specificContext.findSubstitutionByMetavariableName(metavariableName);
 
-        if (substitution !== null) {
-          const statementSubstitution = substitution, ///
-                replacementStatement = statementSubstitution.getReplacementStatement();
+      if (substitution !== null) {
+        const statementSubstitution = substitution, ///
+              replacementStatement = statementSubstitution.getReplacementStatement();
 
-          statement = replacementStatement; ///
-        }
+        statement = replacementStatement; ///
       }
     }
   }