occam-verify-cli 1.0.387 → 1.0.396

package/src/context/file.js

@@ -496,16 +496,17 @@ export default class FileContext {
     return axiomLemmaTheoremOrConjecture;
   }
 
-  findMetavariable(metavariable, generalContext, specificContext) {
-    const specificMetavariable = metavariable,  ///
-          metavariables = this.getMetavariables();
+  findMetavariable(metavariable) {
+    const metavariables = this.getMetavariables(),
+          specificMetavariable = metavariable;  ///
 
     metavariable = metavariables.find((metavariable) => {
       const generalMetavariable = metavariable; ///
 
       metavariable = specificMetavariable;  ///
 
-      const metavariableUnifies = generalMetavariable.unifyMetavariable(metavariable, generalContext, specificContext);
+      const context = this, ///
+            metavariableUnifies = generalMetavariable.unifyMetavariable(metavariable, context);
 
       if (metavariableUnifies) {
         return true;
@@ -627,7 +628,7 @@ export default class FileContext {
   findLabelByMetavariable(metavariable) {
     const labels = this.getLabels(),
           label = labels.find((label) => {
-            const metavariableEqualToLabelMetavariable = label.isMetavariableEqualTo(metavariable);
+            const metavariableEqualToLabelMetavariable = label.isMetavariableEqualToMetavariable(metavariable);
 
             if (metavariableEqualToLabelMetavariable) {
               return true;
@@ -668,8 +669,8 @@ export default class FileContext {
     return metavariable;
   }
 
-  isMetavariablePresent(metavariable, generalContext, specificContext) {
-    metavariable = this.findMetavariable(metavariable, generalContext, specificContext);  ///
+  isMetavariablePresent(metavariable) {
+    metavariable = this.findMetavariable(metavariable);
 
     const metavariablePresent = (metavariable !== null);
 

package/src/context/local.js

@@ -8,9 +8,8 @@ import Equivalences from "../equivalences";
 const { last } = arrayUtilities;
 
 class LocalContext {
-  constructor(context, tokens, variables, judgements, equivalences, stepsOrSubproofs) {
+  constructor(context, variables, judgements, equivalences, stepsOrSubproofs) {
     this.context = context;
-    this.tokens = tokens;
     this.variables = variables;
     this.judgements = judgements;
     this.equivalences = equivalences;
@@ -21,10 +20,6 @@ class LocalContext {
     return this.context;
   }
 
-  getTokens() {
-    return this.tokens;
-  }
-
   getVariables(nested = true) {
     let variables;
 
@@ -155,10 +150,6 @@ class LocalContext {
     return variableAdded;
   }
 
-  addStepOrSubproof(stepOrSubproof) {
-    this.stepsOrSubproofs.push(stepOrSubproof);
-  }
-
   addJudgement(judgement) {
     let judgementAdded = false;
 
@@ -174,6 +165,10 @@ class LocalContext {
     return judgementAdded;
   }
 
+  addStepOrSubproof(stepOrSubproof) {
+    this.stepsOrSubproofs.push(stepOrSubproof);
+  }
+
   findProcedureByName(name) { return this.context.findProcedureByName(name); }
 
   findLabelByReference(reference, context) { return this.context.findLabelByReference(reference, context); }
@@ -229,7 +224,7 @@ class LocalContext {
 
   findEquivalenceByTerm(term) { return this.equivalences.findEquivalenceByTerm(term); }
 
-  findMetavariable(metavariable, generalContext, specificContext) { return this.context.findMetavariable(metavariable, generalContext, specificContext); }
+  findMetavariable(metavariable) { return this.context.findMetavariable(metavariable); }
 
   findLabelByMetavariable(metavariable) { return this.context.findLabelByMetavariable(metavariable); }
 
@@ -249,7 +244,7 @@ class LocalContext {
 
   findAxiomLemmaTheoremOrConjectureByReference(reference) { return this.context.findAxiomLemmaTheoremOrConjectureByReference(reference); }
 
-  isMetavariablePresent(metavariable, generalContext, specificContext) { return this.context.isMetavariablePresent(metavariable, generalContext, specificContext); }
+  isMetavariablePresent(metavariable) { return this.context.isMetavariablePresent(metavariable); }
 
   isTypePresentByTypeName(typeName, includeRelease = true, includeDependencies = true) { return this.context.isTypePresentByTypeName(typeName, includeRelease, includeDependencies); }
 
@@ -341,45 +336,13 @@ class LocalContext {
     return termAndPropertyRelationMatches;
   }
 
-  nodeAsString(node, tokens = null) {
-    if (tokens === null) {
-      tokens = this.tokens;
-    }
-
-    const string = this.context.nodeAsString(node, tokens);
-
-    return string;
-  }
+  nodeAsString(node, tokens) { return this.context.nodeAsString(node, tokens); }
 
-  nodesAsString(node, tokens = null) {
-    if (tokens === null) {
-      tokens = this.tokens;
-    }
+  nodesAsString(node, tokens) { return this.context.nodesAsString(node, tokens); }
 
-    const string = this.context.nodesAsString(node, tokens);
+  nodeAsTokens(node, tokens) { return this.context.nodeAsTokens(node, tokens); }
 
-    return string;
-  }
-
-  nodeAsTokens(node, tokens = null) {
-    if (tokens === null) {
-      tokens = this.tokens;
-    }
-
-    tokens = this.context.nodeAsTokens(node, tokens); ///
-
-    return tokens;
-  }
-
-  nodesAsTokens(node, tokens = null) {
-    if (tokens === null) {
-      tokens = this.tokens;
-    }
-
-    tokens = this.context.nodesAsTokens(node, tokens);  ///
-
-    return tokens;
-  }
+  nodesAsTokens(node, tokens) { return this.context.nodesAsTokens(node, tokens); }
 
   tokensAsString(tokens) { return this.context.tokensAsString(tokens); }
 
@@ -393,23 +356,12 @@ class LocalContext {
 
   error(message, node = null) { this.context.error(message, node); }
 
-  static fromContext(context) {
-    const tokens = null,
-          variables = [],
-          judgements = [],
-          equivalences = Equivalences.fromNothing(),
-          stepsOrSubproofs = [],
-          localContext = new LocalContext(context, tokens, variables, judgements, equivalences, stepsOrSubproofs);
-
-    return localContext;
-  }
-
-  static fromContextAndTokens(context, tokens) {
+  static fromNothing(context) {
     const variables = [],
           judgements = [],
           equivalences = Equivalences.fromNothing(),
           stepsOrSubproofs = [],
-          localContext = new LocalContext(context, tokens, variables, judgements, equivalences, stepsOrSubproofs);
+          localContext = new LocalContext(context, variables, judgements, equivalences, stepsOrSubproofs);
 
     return localContext;
   }

package/src/context/temporary.js

@@ -0,0 +1,394 @@
+"use strict";
+
+import { arrayUtilities } from "necessary";
+
+const { first, extract } = arrayUtilities;
+
+export default class TemporaryContext {
+  constructor(context, tokens, terms, frames, statements, assertions, reference, substitution) {
+    this.context = context;
+    this.tokens = tokens;
+    this.terms = terms;
+    this.frames = frames;
+    this.statements = statements;
+    this.assertions = assertions;
+    this.reference = reference;
+    this.substitution = substitution;
+  }
+
+  getContext() {
+    return this.context;
+  }
+
+  getTokens() {
+    return tokens;
+  }
+
+  getTerms() {
+    return this.terms;
+  }
+
+  getFrames() {
+    return this.frames;
+  }
+
+  getStatements() {
+    return this.statements;
+  }
+
+  getAssertions() {
+    return this.assertions;
+  }
+
+  getReferences() {
+    return this.reference;
+  }
+
+  getSubstitution() {
+    return this.substitution;
+  }
+
+  addTerm(term) {
+    const termNode = term.getNode();
+
+    extract(this.terms, (term) => {
+      const termMatchesTermNode = term.matchTermNode(termNode);
+
+      if (termMatchesTermNode) {
+        return true;
+      }
+    });
+
+    this.terms.push(term);
+  }
+
+  addFrame(frame) {
+    const frameNode = frame.getNode();
+
+    extract(this.frames, (frame) => {
+      const frameMatchesFrameNode = frame.matchFrameNode(frameNode);
+
+      if (frameMatchesFrameNode) {
+        return true;
+      }
+    });
+
+    this.frames.push(frame);
+  }
+
+  removeFrame(frame) {
+    const index = this.frames.indexOf(frame),
+          start = index,  ///
+          deleteCount = 1;
+
+    this.frames.splice(start, deleteCount);
+  }
+
+  addStatement(statement) {
+    const statementNode = statement.getNode();
+
+    extract(this.statements, (statement) => {
+      const statementMatchesFrameNode = statement.matchStatementNode(statementNode);
+
+      if (statementMatchesFrameNode) {
+        return true;
+      }
+    });
+
+    this.statements.push(statement);
+  }
+
+  addAssertion(assertion) {
+    const assertionNode = assertion.getNode();
+
+    extract(this.assertions, (assertion) => {
+      const assertionMatchesFrameNode = assertion.matchAssertionNode(assertionNode);
+
+      if (assertionMatchesFrameNode) {
+        return true;
+      }
+    });
+
+    this.assertions.push(assertion);
+  }
+
+  addReference(reference) {
+    this.reference = reference;
+  }
+
+  addSubstitution(substitution) {
+    this.substitution = substitution;
+  }
+
+  findTermByTermNode(termNode) {
+    const term = this.terms.find((term) => {
+      const termMatchesTermNode = term.matchTermNode(termNode);
+
+      if (termMatchesTermNode) {
+        return true;
+      }
+    }) || null;
+
+    return term;
+  }
+
+  findFrameByFrameNode(frameNode) {
+    const frame = this.frames.find((frame) => {
+      const frameMatchesFrameNode = frame.matchFrameNode(frameNode);
+
+      if (frameMatchesFrameNode) {
+        return true;
+      }
+    }) || null;
+
+    return frame;
+  }
+
+  findStatementByStatementNode(statementNode) {
+    const statement = this.statements.find((statement) => {
+      const statementMatchesStatementNode = statement.matchStatementNode(statementNode);
+
+      if (statementMatchesStatementNode) {
+        return true;
+      }
+    }) || null;
+
+    return statement;
+  }
+
+  findReferenceByMetavariableName(metavariableName) {
+    let reference = null;
+
+    const referenceMatchesMetavariableName = this.reference.matchMetavariableName(metavariableName);
+
+    if (referenceMatchesMetavariableName) {
+      reference = this.reference;
+    }
+
+    return reference;
+  }
+
+  getFrame() {
+    let frame = null;
+
+    const framesLengtrh = this.frames.length;
+
+    if (framesLengtrh === 1) {
+      const firstFrame = first(this.frames);
+
+      frame = firstFrame; ///
+    }
+
+    return frame;
+  }
+
+  getVariables(nested = true) { return this.context.getVariables(nested); }
+
+  getJudgements() { return this.context.getJudgements(); }
+
+  getEquivalences() { return this.context.getEquivalences(); }
+
+  getSteps() { return this.context.getSteps(); }
+
+  getLastStep() { return this.context.getLastStep(); }
+
+  getStepsOrSubproofs() { return this.context.getStepsOrSubproofs(); }
+
+  getFilePath() { return this.context.getFilePath(); }
+
+  getLexer() { return this.context.getLexer(); }
+
+  getParser() { return this.context.getParser(); }
+
+  getAxioms() { return this.context.getAxioms(); }
+
+  getLemmas() { return this.context.getLemmas(); }
+
+  getTheorems() { return this.context.getTheorems(); }
+
+  getConjectures() { return this.context.getConjectures(); }
+
+  getCombinators() { return this.context.getCombinators(); }
+
+  getConstructors() { return this.context.getConstructors(); }
+
+  getTypePrefix() { return this.context.getTypePrefix(); }
+
+  addAxiom(axiom) { this.context.addAxiom(axiom); }
+
+  addLemma(lemma) { this.context.addLemma(lemma); }
+
+  addTheorem(theorem) { this.context.addTheorem(theorem); }
+
+  addEquality(equality, context) { return this.context.addEquality(equality, context); }
+
+  addVariable(variable, nested = true) { return this.context.addVariable(variable, nested); }
+
+  addJudgement(judgement) { return this.context.addJudgement(judgement); }
+
+  addStepOrSubproof(stepOrSubproof) { this.context.addStepOrSubproof(stepOrSubproof); }
+
+  findProcedureByName(name) { return this.context.findProcedureByName(name); }
+
+  findLabelByReference(reference, context) { return this.context.findLabelByReference(reference, context); }
+
+  findRuleByReference(reference) { return this.context.findRuleByReference(reference); }
+
+  findAxiomByReference(reference) { return this.context.findAxiomByReference(reference); }
+
+  findLemmaByReference(reference) { return this.context.findLemmaByReference(reference); }
+
+  findTheoremByReference(reference) { return this.context.findTheoremByReference(reference); }
+
+  findConjectureByReference(reference) { return this.context.findConjectureByReference(reference); }
+
+  findMetaLemmasByReference(reference) { return this.context.findMetaLemmasByReference(reference); }
+
+  findMetatheoremsByReference(reference) { return this.context.findMetatheoremsByReference(reference); }
+
+  findMetaLemmaMetatheoremByReference(reference) { return this.context.findMetaLemmaMetatheoremByReference(reference); }
+
+  findMetaLemmaMetatheoremsByReference(reference) { return this.context.findMetaLemmaMetatheoremsByReference(reference); }
+
+  findVariableByVariableIdentifier(variableIdentifier, nested = true) { return this.context.findVariableByVariableIdentifier(variableIdentifier, nested); }
+
+  findJudgementByMetavariable(metavariable) { return this.context.findJudgementByMetavariable(metavariable); }
+
+  findEquivalenceByTerm(term) { return this.context.findEquivalenceByTerm(term); }
+
+  findMetavariable(metavariable) { return this.context.findMetavariable(metavariable); }
+
+  findLabelByMetavariable(metavariable) { return this.context.findLabelByMetavariable(metavariable); }
+
+  findTypeByNominalTypeName(nominalTypeName) { return this.context.findTypeByNominalTypeName(nominalTypeName); }
+
+  findMetaTypeByMetaTypeName(metaTypeName) { return this.context.findMetaTypeByMetaTypeName(metaTypeName); }
+
+  findMetavariableByMetavariableName(metavariableName) { return this.context.findMetavariableByMetavariableName(metavariableName); }
+
+  isProcedurePresentByName(name) { return this.context.isProcedurePresentByName(name); }
+
+  isLabelPresentByReference(reference) { return this.context.isLabelPresentByReference(reference); }
+
+  isMetavariablePresentByReference(reference) { return this.context.isMetavariablePresentByReference(reference); }
+
+  isMetaLemmaMetatheoremPresentByReference(reference) { return this.context.isMetaLemmaMetatheoremPresentByReference(reference); }
+
+  findAxiomLemmaTheoremOrConjectureByReference(reference) { return this.context.findAxiomLemmaTheoremOrConjectureByReference(reference); }
+
+  isMetavariablePresent(metavariable) { return this.context.isMetavariablePresent(metavariable); }
+
+  isTypePresentByTypeName(typeName, includeRelease = true, includeDependencies = true) { return this.context.isTypePresentByTypeName(typeName, includeRelease, includeDependencies); }
+
+  isTypePresentByNominalTypeName(nominalTypeName) { return this.context.isTypePresentByNominalTypeName(nominalTypeName); }
+
+  isTypePresentByPrefixedTypeName(prefixedTypeName) { return this.context.isTypePresentByPrefixedTypeName(prefixedTypeName); }
+
+  isTypePrefixPresentByTypePrefixName(typePrefixName) { return this.context.isTypePrefixPresentByTypePrefixName(typePrefixName); }
+
+  isVariablePresentByVariableIdentifier(variableIdentifier, nested = true) { return this.context.findVariableByVariableIdentifier(variableIdentifier, nested); }
+
+  isLabelPresentByMetavariableName(metavariableName) { return this.context.isLabelPresentByMetavariableName(metavariableName); }
+
+  isLabelPresentByMetavariable(metavariable) { return this.context.isLabelPresentByMetavariable(metavariable); }
+
+  isMetavariablePresentByMetavariableName(metavariableNode) { return this.context.isMetavariablePresentByMetavariableName(metavariableNode); }
+
+  isJudgementPresentByMetavariable(metavariable) { return this.context.isJudgementPresentByMetavariable(metavariable); }
+
+  isTermGrounded(term) { return this.context.isTermGrounded(term); }
+
+  isVariableDefined(variable) { return this.context.isVariableDefined(variable); }
+
+  isMetavariableDefined(metavariable) { return this.context.isMetavariableDefined(metavariable); }
+
+  matchTermAndPropertyRelation(term, propertyRelation) { return this.context.matchTermAndPropertyRelation(term, propertyRelation); }
+
+  nodeAsString(node, tokens = null) {
+    if (tokens === null) {
+      tokens = this.tokens;
+    }
+
+    const string = this.context.nodeAsString(node, tokens);
+
+    return string;
+  }
+
+  nodesAsString(node, tokens = null) {
+    if (tokens === null) {
+      tokens = this.tokens;
+    }
+
+    const string = this.context.nodesAsString(node, tokens);
+
+    return string;
+  }
+
+  nodeAsTokens(node, tokens = null) {
+    if (tokens === null) {
+      tokens = this.tokens;
+    }
+
+    tokens = this.context.nodeAsTokens(node, tokens); ///
+
+    return tokens;
+  }
+
+  nodesAsTokens(node, tokens = null) {
+    if (tokens === null) {
+      tokens = this.tokens;
+    }
+
+    tokens = this.context.nodesAsTokens(node, tokens);  ///
+
+    return tokens;
+  }
+
+  tokensAsString(tokens) { return this.context.tokensAsString(tokens); }
+
+  trace(message, node = null) { this.context.trace(message, node); }
+
+  debug(message, node = null) { this.context.debug(message, node); }
+
+  info(message, node = null) { this.context.info(message, node); }
+
+  warning(message, node = null) { this.context.warning(message, node); }
+
+  error(message, node = null) { this.context.error(message, node); }
+
+  static fromNothing(context) {
+    const terms = [],
+          frames = [],
+          tokens = null,
+          statements = [],
+          assertions = [],
+          reference = null,
+          substitution = null,
+          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, reference, substitution);
+
+    return temporaryContext;
+  }
+
+  static fromTermsAndFrames(terms, frames, context) {
+    const tokens = null,
+          statements = [],
+          assertions = [],
+          reference = null,
+          substitution = null,
+          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, reference, substitution);
+
+    return temporaryContext;
+  }
+
+  static fromContextAndTokens(context, tokens) {
+    const terms = [],
+          frames = [],
+          statements = [],
+          assertions = [],
+          reference = null,
+          substitution = null,
+          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, reference, substitution);
+
+    return temporaryContext;
+  }
+}