occam-verify-cli 1.0.857 → 1.0.859

package/src/process/unify.js

@@ -149,72 +149,6 @@ class MetaLevelPass extends ZipPassBase {
   ];
 }
 
-class AssumptionPass extends ZipPass {
-  static maps = [
-    {
-      generalNodeQuery: statementMetavariableNodeQuery,
-      specificNodeQuery: statementNodeQuery,
-      run: (generalStatementMetavariableNode, specificStatementNode, generalContext, specificContext) => {
-        let success = false;
-
-        const statementNode = specificStatementNode, ///
-              metavariableNode = generalStatementMetavariableNode;  ///
-
-        let context;
-
-        context = generalContext; ///
-
-        const metavariable = context.findMetavariableByMetavariableNode(metavariableNode);
-
-        context = specificContext;  ///
-
-        const statement = context.findStatementByStatementNode(statementNode),
-              substitution = null,
-              statementUnifies = metavariable.unifyStatement(statement, substitution, generalContext, specificContext);
-
-        if (statementUnifies) {
-          success = true;
-        }
-
-        return success;
-      }
-    },
-    {
-      generalNodeQuery: metavariableNodeQuery,
-      specificNodeQuery: referenceMetavariableNodeQuery,
-      run: (generalMetavariableNode, specificReferenceMetavariableNode, generalContext, specificContext) => {
-        let success = false;
-
-        let context,
-            reference,
-            metavariableNode;
-
-        context = generalContext; ///
-
-        metavariableNode = generalMetavariableNode;  ///
-
-        reference = context.findReferenceByMetavariableNode(metavariableNode);
-
-        const metavariable = reference.getMetavariable();
-
-        context = specificContext;  ///
-
-        metavariableNode = specificReferenceMetavariableNode; ///
-
-        reference = context.findReferenceByMetavariableNode(metavariableNode);
-
-        const referenceUnifies = metavariable.unifyReference(reference, generalContext, specificContext);
-
-        if (referenceUnifies) {
-          success = true;
-        }
-
-        return success;
-      }
-    }
-  ];
-}
-
 class CombinatorPass extends ZipPass {
   static maps = [
     {
@@ -471,7 +405,6 @@ class IntrinsicLevelPass extends ZipPass {
 }
 
 const metaLevelPass = new MetaLevelPass(),
-      assumptionPass = new AssumptionPass(),
       combinatorPass = new CombinatorPass(),
       constructorPass = new ConstructorPass(),
       metavariablePass = new MetavariablePass(),
@@ -494,22 +427,6 @@ export function unifyStatement(generalStatement, specificStatement, generalConte
   return statementUnifies;
 }
 
-export function unifyAssumption(generalAssumption, specificAssumption, generalContext, specificContext) {
-  let assumptionUnifies = false;
-
-  const generalAssumptionNode = generalAssumption.getNode(),
-        specificAssumptionNode = specificAssumption.getNode(),
-        generalNode = generalAssumptionNode, ///
-        specificNode = specificAssumptionNode,  ///
-        success = assumptionPass.run(generalNode, specificNode, generalContext, specificContext);
-
-  if (success) {
-    assumptionUnifies = true;
-  }
-
-  return assumptionUnifies;
-}
-
 export function unifySubstitution(generalSubstitution, specificSubstitution, generalContext, specificContext) {
   let substitutionUnifies = false;
 

package/src/utilities/element.js

@@ -11,6 +11,7 @@ import { equivalenceStringFromTerms,
          procedureCallStringFromProcedureReferenceAndParameters,
          topLevelAssertionStringFromLabelsSuppositionsAndDeduction,
          topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction } from "../utilities/string";
+import statement from "../element/statement";
 
 export function typeFromTypeNode(typeNode, context) {
   let type;
@@ -1327,11 +1328,18 @@ export function identifierFromParameterNode(parameterNode, context) {
 
 export function referenceFromAssumptionNode(assumptionNode, context) {
   const metavariableNode = assumptionNode.getMetavariableNode(),
-        reference = referenceFromMetavariableNode(metavariableNode, context);
+    reference = referenceFromMetavariableNode(metavariableNode, context);
 
   return reference;
 }
 
+export function statementFromAssumptionNode(assumptionNode, context) {
+  const statesmentNode = assumptionNode.getStatementNode(),
+        statement = statementFromStatementNode(statesmentNode, context);
+
+  return statement;
+}
+
 export function statementFromCombinatorNode(combinatorNode, context) {
   const statementNode = combinatorNode.getStatementNode(),
         statement = statementFromStatementNode(statementNode, context);
@@ -1351,13 +1359,6 @@ export function statementFromConclusionNode(conclusinoNode, context) {
   return statement;
 }
 
-export function statementFromAssumptionNode(assumptionNode, context) {
-  const statementNode = assumptionNode.getStatementNode(),
-        statement = statementFromStatementNode(statementNode, context);
-
-  return statement;
-}
-
 export function statementFromHypothesisNode(hypothesisNode, context) {
   let statement = null;
 
@@ -1827,13 +1828,6 @@ export function targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, cont
   return targetFrame;
 }
 
-export function statementFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context) {
-  const statementNode = metaLevelAssumptionNode.getStatementNode(),
-        statement = statementFromStatementNode(statementNode, context);
-
-  return statement;
-}
-
 export function referenceFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context) {
   const { Reference } = elements,
         referenceNode = metaLevelAssumptionNode.getReferenceNode(),
@@ -1843,6 +1837,13 @@ export function referenceFromMetaLevelAssumptionNode(metaLevelAssumptionNode, co
   return reference;
 }
 
+export function statementFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context) {
+  const statementNode = metaLevelAssumptionNode.getStatementNode(),
+        statement = statementFromStatementNode(statementNode, context);
+
+  return statement;
+}
+
 export function suppositionsFromTopLevelAssertionNode(topLevelAsssertionNode, context) {
   const suppositionNodes = topLevelAsssertionNode.getSuppositionNodes(),
         suppositions = suppositionsFromSuppositionNodes(suppositionNodes, context);

package/src/utilities/string.js

@@ -131,6 +131,14 @@ export function termSubstitutionStringFromTermAndVariable(term, variable) {
   return termSubstitutionString;
 }
 
+export function assumptionStringFromReferenceAndStatement(reference, statement) {
+  const referenceString = reference.getString(),
+        statementString = statement.getString(),
+        assumptionString = `${referenceString} :: ${statementString}`;
+
+  return assumptionString;
+}
+
 export function rulsStringFromLabelsPremisesAndConclusion(labels, premises, conclusion) {
   const conclusionString = conclusion.getString(),
         premisesString = premisesStringFromPremises(premises),
@@ -170,7 +178,7 @@ export function frameSubstitutionStringFromFrameAndMetavariable(frame, metavaria
   return string;
 }
 
-export function metaLevelAssumptionStringFromStatementAndReference(statement, reference) {
+export function metaLevelAssumptionStringFromReferenceAndStatement(reference, statement) {
   const statementString = statement.getString(),
         referneceString = reference.getString(),
         metaLevelAssumptionString = `${referneceString} :: ${statementString}`;