occam-verify-cli 1.0.457 → 1.0.473

package/src/utilities/instance.js

@@ -2,7 +2,7 @@
 
 import nominalContext from "../context/nominal";
 
-import { withinFragment } from "../utilities/fragment";
+import { literally } from "../utilities/context";
 import { BASE_TYPE_SYMBOL } from "../constants";
 import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
 import { instantiateCombinator, instantiateConstructor } from "../process/instantiate";
@@ -15,7 +15,7 @@ export function bracketedCombinatorFromNothing() {
   if (bracketedCombinator === null) {
     const context = nominalContext; ///
 
-    bracketedCombinator = withinFragment((context) => {
+    bracketedCombinator = literally((context) => {
       const bracketedCombinatorString = `(${STATEMENT_META_TYPE_NAME})`,
             string = bracketedCombinatorString, ///
             combinatorNode = instantiateCombinator(string, context),
@@ -33,7 +33,7 @@ export function bracketedConstructorFromNothing() {
   if (bracketedConstructor === null) {
     const context = nominalContext; ///
 
-    bracketedConstructor = withinFragment((context) => {
+    bracketedConstructor = literally((context) => {
       const bracketedConstructorString = `(${BASE_TYPE_SYMBOL})`,
             string = bracketedConstructorString,  ///
             constructorNode = instantiateConstructor(string, context),

package/src/utilities/string.js

@@ -44,7 +44,7 @@ export function premisesStringFromPremises(premises) {
   return premisesString;
 }
 
-export function hypothesesStringFromHypotheses(hypotheses, context) {
+export function hypothesesStringFromHypotheses(hypotheses) {
   const hypothesesString = hypotheses.reduce((hypothesesString, hypothesis) => {
     const hypothesisString = hypothesis.getString();
 
@@ -94,8 +94,8 @@ export function assumptionsStringFromAssumptions(assumptions) {
     const assumptionString = assumption.getString();
 
     assumptionsString = (assumptionsString === null) ?
-                          assumptionString :
-                            `${assumptionsString}, ${assumptionString}`;
+                          assumptionString: ///
+                           `${assumptionsString}, ${assumptionString}`;
 
     return assumptionsString;
   }, null);
@@ -145,6 +145,14 @@ export function equivalenceStringFromTerms(terms) {
   return equivalenceString;
 }
 
+export function termSubstitutionStringFromTermAndVariable(term, variable) {
+  const termString = term.getString(),
+        variableString = variable.getString(),
+        termSubstitutionString = `[${termString} for ${variableString}]`;
+
+  return termSubstitutionString;
+}
+
 export function rulsStringFromLabelsPremisesAndConclusion(labels, premises, conclusion) {
   const premisesString = premisesStringFromPremises(premises),
         conclusionString = conclusion.getString(),
@@ -156,10 +164,10 @@ export function rulsStringFromLabelsPremisesAndConclusion(labels, premises, conc
   return ruleString;
 }
 
-export function sectionStringFromHypothesesTopLevelAssertion(hypotheses, axiom, lemma, theorem, conjecture, context) {
+export function sectionStringFromHypothesesTopLevelAssertion(hypotheses, axiom, lemma, theorem, conjecture) {
   const topLevelAssertion = (axiom || lemma || theorem || conjecture),
         topLevelAssertionString = topLevelAssertion.getString(),
-        hypothesesString = hypothesesStringFromHypotheses(hypotheses, context),
+        hypothesesString = hypothesesStringFromHypotheses(hypotheses),
         sectionString = (topLevelAssertionString !== null) ?
                           `[${hypothesesString}]::: ${topLevelAssertionString}` :
                             `[${hypothesesString}]::: `;
@@ -216,6 +224,14 @@ export function statementSubstitutionStringFromStatementAndMetavariable(statemen
   return statementSubstitutionString;
 }
 
+export function referenceSubstitutionStringFromReferenceAndMetavariable(reference, metavariable) {
+  const referenceString = reference.getString(),
+        metavariableString = metavariable.getString(),
+        referenceSubstitutionString = `[${referenceString} for ${metavariableString}]`;
+
+  return referenceSubstitutionString;
+}
+
 export function topLevelAssertionStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction) {
   let topLevelAssertionString;
 

package/src/utilities/unification.js

@@ -4,6 +4,7 @@ import { arrayUtilities } from "necessary";
 
 import elements from "../elements";
 
+import { synthetically } from "../utilities/context";
 import { equalityFromStatement,
          judgementFromStatement,
          typeAssertionFromStatement,
@@ -12,7 +13,7 @@ import { equalityFromStatement,
 
 const { backwardsSome } = arrayUtilities;
 
-function unifyStatementWithRule(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementWithRule(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesWithRule = false;
 
   if (reference !== null) {
@@ -40,7 +41,7 @@ function unifyStatementWithRule(statement, reference, satisfiesAssertion, substi
   return statementUnifiesWithRule;
 }
 
-function unifyStatementWithReference(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementWithReference(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesWithReference = false;
 
   if (reference !== null) {
@@ -52,12 +53,14 @@ function unifyStatementWithReference(statement, reference, satisfiesAssertion, s
     const metavariableValidates = reference.validateMetavariable(context);
 
     if (metavariableValidates) {
-      const { StatementSubstitution } = elements,
-            metavariable = reference.getMetavariable(),
-            statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),
-            substitution = statementSubstitution; ///
+      const metavariable = reference.getMetavariable();
 
-      substitutions.addSubstitution(substitution, context);
+      synthetically((context) => {
+        const { StatementSubstitution } = elements;
+
+        StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context);
+
+      }, generalContext, specificContext);
 
       statementUnifiesWithReference = true;
     }
@@ -70,7 +73,7 @@ function unifyStatementWithReference(statement, reference, satisfiesAssertion, s
   return statementUnifiesWithReference;
 }
 
-function unifyStatementAsSatisfiesAssertion(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementAsSatisfiesAssertion(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesAsSatisfiesAssertion = false;
 
   satisfiesAssertion = satisfiesAssertionFromStatement(statement, context);
@@ -108,7 +111,7 @@ function unifyStatementAsSatisfiesAssertion(statement, reference, satisfiesAsser
 
           if (satisfiable) {
             const { Substitutions } = elements,
-                  substitutions = Substitutions.fromNothing(),
+                  substitutions = Substitutions.fromNothing(context),
                   topLevelAssertionUnifies = axiom.unifyTopLevelAssertion(topLevelAssertion, substitutions, context);
 
             if (topLevelAssertionUnifies) {
@@ -135,7 +138,7 @@ function unifyStatementAsSatisfiesAssertion(statement, reference, satisfiesAsser
   return statementUnifiesAsSatisfiesAssertion;
 }
 
-function unifyStatementWithTopLevelAssertion(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementWithTopLevelAssertion(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesWithTopLevelAssertion = false;
 
   if (reference !== null) {
@@ -151,19 +154,19 @@ function unifyStatementWithTopLevelAssertion(statement, reference, satisfiesAsse
 
       const subproofOrProofAssertions = context.getSubproofOrProofAssertions();
 
-      substitutions = Substitutions.fromNothing();
+      substitutions = Substitutions.fromNothing(context);
 
       const statementAndSubproofOrProofAssertionsUnify = topLevelAssertion.unifyStatementAndSubproofOrProofAssertions(statement, subproofOrProofAssertions, substitutions, context);
 
       if (statementAndSubproofOrProofAssertionsUnify) {
-        const { StatementSubstitution } = elements,
-              metavariable = reference.getMetavariable(),
-              statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),
-              substitution = statementSubstitution;  ///
+        const metavariable = reference.getMetavariable();
+
+        synthetically((context) => {
+          const { StatementSubstitution } = elements;
 
-        substitutions = generalSubstitutions; ///
+          StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context);
 
-        substitutions.addSubstitution(substitution, context);
+        }, generalContext, specificContext);
 
         statementUnifiesWithTopLevelAssertion = true;
       }
@@ -177,7 +180,7 @@ function unifyStatementWithTopLevelAssertion(statement, reference, satisfiesAsse
   return statementUnifiesWithTopLevelAssertion;
 }
 
-function unifyStatementAEquality(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementAEquality(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesAEquality = false;
 
   if (reference === null) {
@@ -203,7 +206,7 @@ function unifyStatementAEquality(statement, reference, satisfiesAssertion, subst
   return statementUnifiesAEquality;
 }
 
-function unifyStatementAsJudgement(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementAsJudgement(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesAsJudgement = false;
 
   if (reference === null) {
@@ -225,7 +228,7 @@ function unifyStatementAsJudgement(statement, reference, satisfiesAssertion, sub
   return statementUnifiesAsJudgement;
 }
 
-function unifyStatementAsTypeAssertion(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementAsTypeAssertion(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesAsTypeAssertion = false;
 
   if (reference === null) {
@@ -245,7 +248,7 @@ function unifyStatementAsTypeAssertion(statement, reference, satisfiesAssertion,
   return statementUnifiesAsTypeAssertion;
 }
 
-function unifyStatementAsPropertyAssertion(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementAsPropertyAssertion(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesAsPropertyAssertion = false;
 
   if (reference === null) {
@@ -283,7 +286,7 @@ function unifyStatementAsPropertyAssertion(statement, reference, satisfiesAssert
   return statementUnifiesAsPropertyAssertion;
 }
 
-function unifyStatementWithSatisfiesAssertion(statement, reference, satisfiesAssertion, substitutions, context) {
+function unifyStatementWithSatisfiesAssertion(statement, reference, satisfiesAssertion, context) {
   let statementUnifiesWithSatisfiesAssertion = false;
 
   if (satisfiesAssertion !== null) {
@@ -307,7 +310,7 @@ function unifyStatementWithSatisfiesAssertion(statement, reference, satisfiesAss
   return statementUnifiesWithSatisfiesAssertion;
 }
 
-function compareStatementWithSubproofOrProofAssertions(statement, reference, satisfiesAssertion, substitutions, context) {
+function compareStatementWithSubproofOrProofAssertions(statement, reference, satisfiesAssertion, context) {
   let statementEquatesWithStepOrSubproofs = false;
 
   if (reference === null) {

package/src/utilities/validation.js

@@ -12,32 +12,6 @@ import { equalityFromStatement,
          containedAssertionFromStatement,
          satisfiesAssertionFromStatement } from "../utilities/statement";
 
-function unifyTermWithBracketedConstructor(term, context, validateAhead) {
-  let termUnifiesWithBracketedConstructor;
-
-  const bracketedConstructor = bracketedConstructorFromNothing();
-
-  termUnifiesWithBracketedConstructor = bracketedConstructor.unifyTerm(term, context, validateAhead);
-
-  return termUnifiesWithBracketedConstructor;
-}
-
-function unifyTermWithConstructors(term, context, validateAhead) {
-  let termUnifiesWithConstructors;
-
-  const constructors = context.getConstructors();
-
-  termUnifiesWithConstructors = constructors.some((constructor) => {
-    const unifiesWithConstructor = constructor.unifyTerm(term, context, validateAhead);
-
-    if (unifiesWithConstructor) {
-      return true;
-    }
-  });
-
-  return termUnifiesWithConstructors;
-}
-
 function validateTermAsVariable(term, context, validateAhead) {
   let termValidatesAsVariable = false;
 
@@ -72,7 +46,33 @@ function validateTermAsVariable(term, context, validateAhead) {
   return termValidatesAsVariable;
 }
 
-function validateStatementAsMetavariableAndSubstitution(statement, assignments, stated, context) {
+function unifyTermWithConstructors(term, context, validateAhead) {
+  let termUnifiesWithConstructors;
+
+  const constructors = context.getConstructors();
+
+  termUnifiesWithConstructors = constructors.some((constructor) => {
+    const unifiesWithConstructor = constructor.unifyTerm(term, context, validateAhead);
+
+    if (unifiesWithConstructor) {
+      return true;
+    }
+  });
+
+  return termUnifiesWithConstructors;
+}
+
+function unifyTermWithBracketedConstructor(term, context, validateAhead) {
+  let termUnifiesWithBracketedConstructor;
+
+  const bracketedConstructor = bracketedConstructorFromNothing();
+
+  termUnifiesWithBracketedConstructor = bracketedConstructor.unifyTerm(term, context, validateAhead);
+
+  return termUnifiesWithBracketedConstructor;
+}
+
+function validateStatementAsMetavariable(statement, assignments, stated, context) {
   let statementValidatesAsMetavariableAndSubstitution = false;
 
   const statementNode = statement.getNode(),
@@ -81,7 +81,7 @@ function validateStatementAsMetavariableAndSubstitution(statement, assignments,
   if (metavariableNode !== null) {
     const statementString = statement.getString();
 
-    context.trace(`Validating the '${statementString}' statement as a metavariable and substitution...`);
+    context.trace(`Validating the '${statementString}' statement as a metavariable...`);
 
     const metavariableName = metavariableNode.getMetavariableName(),
           metavariable = context.findMetavariableByMetavariableName(metavariableName);
@@ -104,39 +104,39 @@ function validateStatementAsMetavariableAndSubstitution(statement, assignments,
     }
 
     if (statementValidatesAsMetavariableAndSubstitution) {
-      context.debug(`...validated the '${statementString}' statement as a metavariable and substitution.`);
+      context.debug(`...validated the '${statementString}' statement as a metavariable.`);
     }
   }
 
   return statementValidatesAsMetavariableAndSubstitution;
 }
 
-function unifyStatementWithBracketedCombinator(statement, assignments, stated, context) {
+function unifyStatementWithCombinators(statement, assignments, stated, context) {
   stated = true;  ///
 
   assignments = null; ///
 
-  const bracketedCombinator = bracketedCombinatorFromNothing(),
-        statementUnifiesWithBracketedCombinator = bracketedCombinator.unifyStatement(statement, assignments, stated, context);
+  const combinators = context.getCombinators(),
+    statementUnifiesWithCombinators = combinators.some((combinator) => {
+      const unifiesWithCombinator = combinator.unifyStatement(statement, assignments, stated, context);
 
-  return statementUnifiesWithBracketedCombinator;
+      if (unifiesWithCombinator) {
+        return true;
+      }
+    });
+
+  return statementUnifiesWithCombinators;
 }
 
-function unifyStatementWithCombinators(statement, assignments, stated, context) {
+function unifyStatementWithBracketedCombinator(statement, assignments, stated, context) {
   stated = true;  ///
 
   assignments = null; ///
 
-  const combinators = context.getCombinators(),
-        statementUnifiesWithCombinators = combinators.some((combinator) => {
-          const unifiesWithCombinator = combinator.unifyStatement(statement, assignments, stated, context);
-
-          if (unifiesWithCombinator) {
-            return true;
-          }
-        });
+  const bracketedCombinator = bracketedCombinatorFromNothing(),
+        statementUnifiesWithBracketedCombinator = bracketedCombinator.unifyStatement(statement, assignments, stated, context);
 
-  return statementUnifiesWithCombinators;
+  return statementUnifiesWithBracketedCombinator;
 }
 
 function validateStatementAsEquality(statement, assignments, stated, context) {
@@ -340,15 +340,15 @@ function validateStatementAsSatisfiesAssertion(statement, assignments, stated, c
 }
 
 export const validateTerms = [
-  unifyTermWithBracketedConstructor,
+  validateTermAsVariable,
   unifyTermWithConstructors,
-  validateTermAsVariable
+  unifyTermWithBracketedConstructor
 ];
 
 export const validateStatements = [
-  validateStatementAsMetavariableAndSubstitution,
-  unifyStatementWithBracketedCombinator,
+  validateStatementAsMetavariable,
   unifyStatementWithCombinators,
+  unifyStatementWithBracketedCombinator,
   validateStatementAsEquality,
   validateStatementAsJudgement,
   validateStatementAsTypeAssertion,

package/lib/context/fragment.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return FragmentContext;
-    }
-});
-var _node = require("../utilities/node");
-var _context = require("../utilities/context");
-function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-var FragmentContext = /*#__PURE__*/ function() {
-    function FragmentContext(context, tokens) {
-        _class_call_check(this, FragmentContext);
-        this.context = context;
-        this.tokens = tokens;
-        return (0, _context.chainContext)(this);
-    }
-    _create_class(FragmentContext, [
-        {
-            key: "getContext",
-            value: function getContext() {
-                return this.context;
-            }
-        },
-        {
-            key: "getTokens",
-            value: function getTokens() {
-                return this.tokens;
-            }
-        },
-        {
-            key: "setTokens",
-            value: function setTokens(tokens) {
-                this.tokens = tokens;
-            }
-        },
-        {
-            key: "nodeAsString",
-            value: function nodeAsString(node) {
-                var string = (0, _node.nodeAsString)(node, this.tokens);
-                return string;
-            }
-        }
-    ], [
-        {
-            key: "fromNothing",
-            value: function fromNothing(context) {
-                var tokens = null, fragmentContext = new FragmentContext(context, tokens);
-                return fragmentContext;
-            }
-        }
-    ]);
-    return FragmentContext;
-}();
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250ZXh0L2ZyYWdtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL25vZGVcIjtcbmltcG9ydCB7IGNoYWluQ29udGV4dCB9IGZyb20gXCIuLi91dGlsaXRpZXMvY29udGV4dFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBGcmFnbWVudENvbnRleHQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCB0b2tlbnMpIHtcbiAgICB0aGlzLmNvbnRleHQgPSBjb250ZXh0O1xuICAgIHRoaXMudG9rZW5zID0gdG9rZW5zO1xuXG4gICAgcmV0dXJuIGNoYWluQ29udGV4dCh0aGlzKTtcbiAgfVxuXG4gIGdldENvbnRleHQoKSB7XG4gICAgcmV0dXJuIHRoaXMuY29udGV4dDtcbiAgfVxuXG4gIGdldFRva2VucygpIHtcbiAgICByZXR1cm4gdGhpcy50b2tlbnM7XG4gIH1cblxuICBzZXRUb2tlbnModG9rZW5zKSB7XG4gICAgdGhpcy50b2tlbnMgPSB0b2tlbnM7XG4gIH1cblxuICBub2RlQXNTdHJpbmcobm9kZSkge1xuICAgIGNvbnN0IHN0cmluZyA9IG5vZGVBc1N0cmluZyhub2RlLCB0aGlzLnRva2Vucyk7XG5cbiAgICByZXR1cm4gc3RyaW5nO1xuICB9XG5cbiAgc3RhdGljIGZyb21Ob3RoaW5nKGNvbnRleHQpIHtcbiAgICBjb25zdCB0b2tlbnMgPSBudWxsLFxuICAgICAgICAgIGZyYWdtZW50Q29udGV4dCA9IG5ldyBGcmFnbWVudENvbnRleHQoY29udGV4dCwgdG9rZW5zKTtcblxuICAgIHJldHVybiBmcmFnbWVudENvbnRleHQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJGcmFnbWVudENvbnRleHQiLCJjb250ZXh0IiwidG9rZW5zIiwiY2hhaW5Db250ZXh0IiwiZ2V0Q29udGV4dCIsImdldFRva2VucyIsInNldFRva2VucyIsIm5vZGVBc1N0cmluZyIsIm5vZGUiLCJzdHJpbmciLCJmcm9tTm90aGluZyIsImZyYWdtZW50Q29udGV4dCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFLcUJBOzs7b0JBSFE7dUJBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWQsSUFBQSxBQUFNQSxnQ0FBTjthQUFNQSxnQkFDUEMsT0FBTyxFQUFFQyxNQUFNO2dDQURSRjtRQUVqQixJQUFJLENBQUNDLE9BQU8sR0FBR0E7UUFDZixJQUFJLENBQUNDLE1BQU0sR0FBR0E7UUFFZCxPQUFPQyxJQUFBQSxxQkFBWSxFQUFDLElBQUk7O2tCQUxQSDs7WUFRbkJJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsT0FBTztZQUNyQjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsTUFBTTtZQUNwQjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQSxVQUFVSixNQUFNO2dCQUNkLElBQUksQ0FBQ0EsTUFBTSxHQUFHQTtZQUNoQjs7O1lBRUFLLEtBQUFBO21CQUFBQSxTQUFBQSxhQUFhQyxJQUFJO2dCQUNmLElBQU1DLFNBQVNGLElBQUFBLGtCQUFZLEVBQUNDLE1BQU0sSUFBSSxDQUFDTixNQUFNO2dCQUU3QyxPQUFPTztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLFlBQVlULE9BQU87Z0JBQ3hCLElBQU1DLFNBQVMsTUFDVFMsa0JBQWtCLElBNUJQWCxnQkE0QjJCQyxTQUFTQztnQkFFckQsT0FBT1M7WUFDVDs7O1dBL0JtQlgifQ==