occam-verify-cli 1.0.792 → 1.0.796

package/src/utilities/string.js

@@ -117,6 +117,20 @@ 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}]`;
@@ -137,14 +151,6 @@ export function typeStringFromNominalTypeName(nominalTypeName) {
   return typeString;
 }
 
-export function assumptionStringFromStatementAndReference(statement, reference) {
-  const statementString = statement.getString(),
-        referneceString = reference.getString(),
-        assumptionString = `${referneceString} :: ${statementString}`;
-
-  return assumptionString;
-}
-
 export function termSubstitutionStringFromTermAndVariable(term, variable) {
   const termString = term.getString(),
         variableString = variable.getString(),
@@ -192,6 +198,14 @@ export function frameSubstitutionStringFromFrameAndMetavariable(frame, metavaria
   return string;
 }
 
+export function metaLevelAssumptionStringFromStatementAndReference(statement, reference) {
+  const statementString = statement.getString(),
+        referneceString = reference.getString(),
+        metaLevelAssumptionString = `${referneceString} :: ${statementString}`;
+
+  return metaLevelAssumptionString;
+}
+
 export function procedureCallStringFromProcedureReferenceAndParameters(procedureReference, parameters) {
   const procedureReferenceName = procedureReference.getName(),
         parametersString = parametersStringFromParameters(parameters),
@@ -236,17 +250,6 @@ export function topLevelAssertionStringFromLabelsSuppositionsAndDeduction(labels
   return topLevelAssertionString;
 }
 
-export function topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction) {
-  const suppositionsString = suppositionsStringFromSuppositions(suppositions),
-        deductionString = deduction.getString(),
-        labelString = label.getString(),
-        topLevelMetaAssertionString = (suppositionsString !== null) ?
-                                       `${labelString} :: [${suppositionsString}]...${deductionString}` :
-                                         `${labelString} :: ${deductionString}`;
-
-  return topLevelMetaAssertionString;
-}
-
 export function statementSubstitutionStringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution) {
   const statementString = statement.getString(),
         metavariableString = metavariable.getString(),
@@ -255,3 +258,15 @@ 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/unification.js

@@ -59,10 +59,10 @@ async function unifyStatementWithReference(statement, reference, satisfiesAssert
 
       if (metaLevel) {
         descend((context) => {
-          const { Assumption } = elements,
-                assumption = Assumption.fromStatementAndReference(statement, reference, context);
+          const { MetaLevelAssumption } = elements,
+                metaLevelAssumption = MetaLevelAssumption.fromStatementAndReference(statement, reference, context);
 
-          assumption.validate(context);
+          metaLevelAssumption.validate(context);
 
           statementUnifiesWithReference = true;
         }, context);

package/src/utilities/validation.js

@@ -94,7 +94,9 @@ function validateStatementAsMetavariable(statement, context) {
 
     context.trace(`Validating the '${statementString}' statement as a metavariable...`);
 
-    metavariable = metavariable.validate(context);
+    const declared = true;  ///
+
+    metavariable = metavariable.validate(declared, context);
 
     if (metavariable !== null) {
       statementValidatesAsMetavariable = true;
@@ -103,25 +105,17 @@ function validateStatementAsMetavariable(statement, context) {
             generalContext = context, ///
             specificContext = context;  ///
 
-      let termSubstitution,
-          frameSubstitution;
-
-      termSubstitution = TermSubstitution.fromStatement(statement, context);
-
-      if (termSubstitution !== null) {
-        termSubstitution = termSubstitution.validate(generalContext, specificContext);  ///
+      let substitution;
 
-        if (termSubstitution === null) {
-          statementValidatesAsMetavariable = false;
-        }
-      }
+      const frameSubstitution = FrameSubstitution.fromStatement(statement, context),
+            termSubstitution = TermSubstitution.fromStatement(statement, context);
 
-      frameSubstitution = FrameSubstitution.fromStatement(statement, context);
+      substitution = (termSubstitution || frameSubstitution);
 
-      if (frameSubstitution !== null) {
-        frameSubstitution = frameSubstitution.validate(generalContext, specificContext);  ///
+      if (substitution !== null) {
+        substitution = substitution.validate(generalContext, specificContext);  ///
 
-        if (frameSubstitution === null) {
+        if (substitution === null) {
           statementValidatesAsMetavariable = false;
         }
       }