occam-verify-cli 1.0.421 → 1.0.427

package/src/{ontology → element}/metavariable.js

@@ -1,19 +1,18 @@
 "use strict";
 
-import ontology from "../ontology";
-import MetavariablePartialContext from "../context/partial/metavariable";
+import elements from "../elements";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 import { EMPTY_STRING } from "../constants";
+import { instantiateMetavariable } from "../process/instantiate";
 import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 import { metaTypeFromJSON, metaTypeToMetaTypeJSON } from "../utilities/json";
 import { unifyMetavariable, unifyMetavariableIntrinsically } from "../process/unify";
 
 export default define(class Metavariable {
-  constructor(string, node, tokens, name, type, metaType) {
+  constructor(string, node, name, type, metaType) {
     this.string = string;
     this.node = node;
-    this.tokens = tokens;
     this.name = name;
     this.type = type;
     this.metaType = metaType;
@@ -27,10 +26,6 @@ export default define(class Metavariable {
     return this.node;
   }
 
-  getTokens() {
-    return this.tokens;
-  }
-
   getName() {
     return this.name;
   }
@@ -43,18 +38,6 @@ export default define(class Metavariable {
     return this.metaType;
   }
 
-  setNode(node) {
-    this.node = node;
-  }
-
-  setTokens(tokens) {
-    this.tokens = tokens;
-  }
-
-  setName(name) {
-    this.name = name;
-  }
-
   setType(type) {
     this.type = type;
   }
@@ -156,7 +139,7 @@ export default define(class Metavariable {
           frameUnifies = true;
         }
       } else {
-        const { FrameSubstitution } = ontology,
+        const { FrameSubstitution } = elements,
               context = specificContext,  ///
               metavariable = this,  ///
               frameSubstitution = FrameSubstitution.fromFrameAndMetavariable(frame, metavariable, context),
@@ -204,7 +187,7 @@ export default define(class Metavariable {
           statementUnifies = true;
         }
       } else {
-        const { StatementSubstitution } = ontology,
+        const { StatementSubstitution } = elements,
               metavariable = this,
               statementSubstitution = StatementSubstitution.fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context);
 
@@ -249,7 +232,7 @@ export default define(class Metavariable {
           referenceUnifies = true;
         }
       } else {
-        const { ReferenceSubstitution } = ontology,
+        const { ReferenceSubstitution } = elements,
               metavariable = this,
               referenceSubstitution = ReferenceSubstitution.fromReferenceAndMetavariable(reference, metavariable, context),
               substitution = referenceSubstitution;  ///
@@ -422,18 +405,13 @@ export default define(class Metavariable {
 
   static fromJSON(json, context) {
     const { string } = json,
-          lexer = context.getLexer(),
-          parser = context.getParser(),
-          metavariablePartialContext = MetavariablePartialContext.fromStringLexerAndParser(string, lexer, parser),
-          metavariableTokens = metavariablePartialContext.getMetavariableTokens(),
-          metavariableNode = metavariablePartialContext.getMetavariableNode(),
+          metavariableNode = instantiateMetavariable(string, context),
           metavariableName = metavariableNode.getMetavariableName(),
           name = metavariableName,  ///
           node = metavariableNode,  ///
-          tokens = metavariableTokens, ///
           type = typeFromJSON(json, context),
           metaType = metaTypeFromJSON(json, context),
-          metavariable = new Metavariable(string, node, tokens, name, type, metaType);
+          metavariable = new Metavariable(string, node, name, type, metaType);
 
     return metavariable;
   }
@@ -498,7 +476,7 @@ export default define(class Metavariable {
   }
 
   static fromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
-    const { MetaType } = ontology,
+    const { MetaType } = elements,
           metavariableNode = metavariableDeclarationNode.getMetavariableNode(),
           type = typeFromMetavariableDeclarationNode(metavariableDeclarationNode, context),
           metaType = MetaType.fromMetavariableDeclarationNode(metavariableDeclarationNode, context),
@@ -511,31 +489,3 @@ export default define(class Metavariable {
     return metavariable;
   }
 });
-
-function metavariableFromMetavariableNode(metavariableNode, context) {
-  const { Metavariable } = ontology,
-        metavariableName = metavariableNode.getMetavariableName(),
-        type = null,
-        name = metavariableName,  ///
-        node = metavariableNode,  ///
-        string = context.nodeAsString(node),
-        tokens = context.nodeAsTokens(node),
-        metaType = null,
-        metavariable = new Metavariable(string, node, tokens, name, type, metaType);
-
-  return metavariable;
-}
-
-function typeFromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
-  let type = null;
-
-  const typeNode = metavariableDeclarationNode.getTypeNode();
-
-  if (typeNode !== null) {
-    const nominalTypeName = typeNode.getNominalTypeName();
-
-    type = context.findTypeByNominalTypeName(nominalTypeName);
-  }
-
-  return type;
-}

package/src/{ontology → element}/parameter.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 
 export default define(class Parameter {
   constructor(name) {

package/src/{ontology → element}/premise.js

@@ -1,18 +1,18 @@
 "use strict";
 
-import ontology from "../ontology";
+import elements from "../elements";
 import TemporaryContext from "../context/temporary";
+import assignAssignments from "../process/assign";
 
-import { define } from "../ontology";
-import { assignAssignments } from "../utilities/assignments";
-import { subproofAssertionFromStatement } from "../utilities/context";
+import { define } from "../elements";
+import { subproofAssertionFromStatement } from "../utilities/statement";
 import { termsFromJSON, framesFromJSON, statementFromJSON, procedureCallFromJSON, termsToTermsJSON, framesToFramesJSON, statementToStatementJSON, procedureCallToProcedureCallJSON } from "../utilities/json";
 
 export default define(class Premise {
-  constructor(context, node, string, statement, procedureCall) {
+  constructor(context, string, node, statement, procedureCall) {
     this.context = context;
-    this.node = node;
     this.string = string;
+    this.node = node;
     this.statement = statement;
     this.procedureCall = procedureCall;
   }
@@ -21,14 +21,14 @@ export default define(class Premise {
     return this.context;
   }
 
-  getNode() {
-    return this.node;
-  }
-
   getString() {
     return this.string;
   }
 
+  getNode() {
+    return this.node;
+  }
+
   getStatement() {
     return this.statement;
   }
@@ -59,7 +59,7 @@ export default define(class Premise {
         const assignmentsAssigned = assignAssignments(assignments, context);
 
         if (assignmentsAssigned) {
-          const { Step } = ontology,
+          const { Step } = elements,
                 step = Step.fromStatement(this.statement, context),
                 stepOrSubproof = step;  ///
 
@@ -273,13 +273,13 @@ export default define(class Premise {
 
     context = temporaryContext; ///
 
-    const premise = new Premise(context, node, string, statement, procedureCall);
+    const premise = new Premise(context, string, node, statement, procedureCall);
 
     return premise;
   }
 
   static fromPremiseNode(premiseNode, context) {
-    const { Statement, ProcedureCall } = ontology,
+    const { Statement, ProcedureCall } = elements,
           node = premiseNode, ///
           string = context.nodeAsString(node),
           statement = Statement.fromPremiseNode(premiseNode, context),
@@ -288,7 +288,7 @@ export default define(class Premise {
 
     context = temporaryContext; ///
 
-    const premise = new Premise(context, node, string, statement, procedureCall);
+    const premise = new Premise(context, string, node, statement, procedureCall);
 
     return premise
   }

package/src/{ontology → element}/procedureCall.js

@@ -2,9 +2,9 @@
 
 import { Expressions } from "occam-furtle";
 
-import ontology from "../ontology";
+import elements from "../elements";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 import { parametersFromJSON, procedureReferenceFromJSON, parametersToParametersJSON, procedureReferenceToProcedureReferenceJSON } from "../utilities/json";
 
 export default define(class ProcedureCall {
@@ -153,7 +153,7 @@ export default define(class ProcedureCall {
 });
 
 function procedureCallFromProcedureCallNode(procedureCallNode, context) {
-  const { ProcedureCall, ProcedureReference } = ontology,
+  const { ProcedureCall, ProcedureReference } = elements,
         node = procedureCallNode, ///
         parameters = parametersFromProcedureCallNode(procedureCallNode, context),
         procedureReference = ProcedureReference.fromProcedureCallNode(procedureCallNode, context),
@@ -164,7 +164,7 @@ function procedureCallFromProcedureCallNode(procedureCallNode, context) {
 }
 
 function parametersFromProcedureCallNode(procedureCallNode, context) {
-  const { Parameter } = ontology,
+  const { Parameter } = elements,
         parameterNodes = procedureCallNode.getParameterNodes(),
         parameters = parameterNodes.map((parameterNode) => {
           const parameter = Parameter.fromParameterNode(parameterNode, context);

package/src/{ontology → element}/procedureReference.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 
 export default define(class ProcedureReference {
   constructor(string, name) {

package/src/{ontology → element}/proof.js

@@ -1,9 +1,9 @@
 "use strict";
 
-import ontology from "../ontology";
+import elements from "../elements";
 import LocalContext from "../context/local";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 
 export default define(class Proof {
   constructor(derivation) {
@@ -56,7 +56,7 @@ export default define(class Proof {
     let proof = null;
 
     if (proofNode !== null) {
-      const { Derivation } = ontology,
+      const { Derivation } = elements,
             derivationNode = proofNode.getDerivationNode(),
             derivation = Derivation.fromDerivationNode(derivationNode, context);
 

package/src/{ontology → element}/property.js

@@ -1,12 +1,11 @@
 "use strict";
 
-import ontology from "../ontology";
-
-import { define } from "../ontology";
+import { define } from "../elements";
 
 export default define(class Property {
-  constructor(string, name, nominalTypeName) {
+  constructor(string, node, name, nominalTypeName) {
     this.string = string;
+    this.node = node;
     this.name = name;
     this.nominalTypeName = nominalTypeName;
   }
@@ -15,6 +14,10 @@ export default define(class Property {
     return this.string;
   }
 
+  getNode() {
+    return this.node;
+  }
+
   getName() {
     return this.name;
   }
@@ -73,14 +76,3 @@ export default define(class Property {
     return property;
   }
 });
-
-function propertyFromPropertyNode(propertyNode, context) {
-  const { Property } = ontology,
-        propertyName = propertyNode.getPropertyName(),
-        nominalTypeName = null,
-        name = propertyName,  ///
-        string = name,  ///
-        property = new Property(string, name, nominalTypeName);
-
-  return property;
-}

package/src/{ontology → element}/propertyRelation.js

@@ -1,14 +1,13 @@
 "use strict";
 
-import ontology from "../ontology";
+import elements from "../elements";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 
 export default define(class PropertyRelation {
-  constructor(string, node, tokens, property, term) {
+  constructor(string, node, property, term) {
     this.string = string;
     this.node = node;
-    this.tokens = tokens;
     this.property = property;
     this.term = term;
   }
@@ -21,10 +20,6 @@ export default define(class PropertyRelation {
     return this.node;
   }
 
-  getTokens() {
-    return this.tokens;
-  }
-
   getProperty() {
     return this.property;
   }
@@ -120,14 +115,13 @@ export default define(class PropertyRelation {
   static name = "PropertyRelation";
 
   static fromPropertyAssertionNode(propertyAssertionNode, context) {
-    const { Term, Property } = ontology,
+    const { Term, Property } = elements,
           propertyRelationNode = propertyAssertionNode.getPropertyRelationNode(),
           node = propertyRelationNode,  ///
           string = context.nodeAsString(node),
-          tokens = context.nodeAsTokens(node),
           property = Property.fromPropertyRelationNode(propertyRelationNode, context),
           term = Term.fromPropertyRelationNode(propertyRelationNode, context),
-          propertyRelation = new PropertyRelation(string, node, tokens, property, term);
+          propertyRelation = new PropertyRelation(string, node, property, term);
 
     return propertyRelation;
   }

package/src/{ontology → element}/reference.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import ontology from "../ontology";
+import elements from "../elements";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 import { referenceMetaType } from ".//metaType";
 import { unifyMetavariableIntrinsically } from "../process/unify";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
@@ -140,7 +140,7 @@ export default define(class Reference {
 
     context.trace(`Unifying the '${metavariableString}' metavariable with the '${referenceString}' reference...`);
 
-    const { Substitutions } = ontology,
+    const { Substitutions } = elements,
           substitutions = Substitutions.fromNothing(),
           generalContext = context, ///
           specificContext = context,  ///
@@ -166,7 +166,7 @@ export default define(class Reference {
 
     context.trace(`Unifying the '${metaLemmaMetatheoremString}' meta-lemma or metatheorem with the '${referenceString}' reference...`);
 
-    const { Substitutions } = ontology,
+    const { Substitutions } = elements,
           label = metaLemmaMetatheorem.getLabel(),
           substitutions = Substitutions.fromNothing(),
           labelUnifies = this.unifyLabel(label, substitutions, context);
@@ -211,12 +211,6 @@ export default define(class Reference {
     return reference;
   }
 
-  static fromReferenceNode(referenceNode, context) {
-    const reference = referenceFromReferenceNode(referenceNode, context);
-
-    return reference;
-  }
-
   static fromAssumptionNode(assumptionNode, context) {
     let reference = null;
 
@@ -255,16 +249,8 @@ export default define(class Reference {
   }
 });
 
-function referenceFromReferenceNode(referenceNode, context) {
-  const { Reference, Metavariable } = ontology,
-        metavariable = Metavariable.fromReferenceNode(referenceNode, context),
-        reference = new Reference(metavariable);
-
-  return reference;
-}
-
 function referenceFromMetavariableNode(metavariableNode, context) {
-  const { Reference, Metavariable } = ontology,
+  const { Reference, Metavariable } = elements,
         metavariable = Metavariable.fromMetavariableNode(metavariableNode, context),
         reference = new Reference(metavariable);
 

package/src/{ontology → element}/rule.js

@@ -2,11 +2,11 @@
 
 import { arrayUtilities } from "necessary";
 
-import ontology from "../ontology";
+import elements from "../elements";
 import LocalContext from "../context/local";
 
-import { define } from "../ontology";
-import { labelsStringFromLabels } from "./topLevelAssertion";
+import { define } from "../elements";
+import { labelsStringFromLabels } from "./axiomLemmaTheoremConjecture";
 import { labelsFromJSON,
          premisesFromJSON,
          conclusionFromJSON,
@@ -17,10 +17,10 @@ import { labelsFromJSON,
 const { reverse, extract, backwardsEvery } = arrayUtilities;
 
 export default define(class Rule {
-  constructor(context, node, string, labels, premises, conclusion, proof) {
+  constructor(context, string, node, labels, premises, conclusion, proof) {
     this.context = context;
-    this.node = node;
     this.string = string;
+    this.node = node;
     this.labels = labels;
     this.premises = premises;
     this.conclusion = conclusion;
@@ -148,7 +148,7 @@ export default define(class Rule {
     if (this.proof === null) {
       proofVerifies = true;
     } else {
-      const { Substitutions } = ontology,
+      const { Substitutions } = elements,
             substitutions = Substitutions.fromNothing();
 
       proofVerifies = this.proof.verify(substitutions, this.conclusion, context);
@@ -172,7 +172,7 @@ export default define(class Rule {
   unifyStatementAndStepsOrSubproofs(statement, stepsOrSubproofs, context) {
     let statementAndStepsOrSubproofsUnify = false;
 
-    const { Substitutions } = ontology,
+    const { Substitutions } = elements,
           substitutions = Substitutions.fromNothing(),
           statementUnifiesWithConclusion = this.unifyStatementWithConclusion(statement, substitutions, context);
 
@@ -261,7 +261,7 @@ export default define(class Rule {
           conclusion = conclusionFromJSON(json, context),
           string = stringFromLabelsPremisesAndConclusion(labels, premises, conclusion);
 
-    rule = new Rule(context, node, string, labels, premises, conclusion, proof);
+    rule = new Rule(context, string, node, labels, premises, conclusion, proof);
 
     return rule;
   }
@@ -273,14 +273,14 @@ export default define(class Rule {
           premises = premisesFromRuleNode(ruleNode, context),
           conclusion = conclusionFromRuleNode(ruleNode, context),
           string = stringFromLabelsPremisesAndConclusion(labels, premises, conclusion),
-          rule = new Rule(context, node, string, labels, premises, conclusion, proof);
+          rule = new Rule(context, string, node, labels, premises, conclusion, proof);
 
     return rule;
   }
 });
 
 function proofFromRuleNode(ruleNode, context) {
-  const { Proof } = ontology,
+  const { Proof } = elements,
         proofNode = ruleNode.getProofNode(),
         proof = Proof.fromProofNode(proofNode, context);
 
@@ -288,7 +288,7 @@ function proofFromRuleNode(ruleNode, context) {
 }
 
 function labelsFromRuleNode(ruleNode, context) {
-  const { Label } = ontology,
+  const { Label } = elements,
         labelNodes = ruleNode.getLabelNodes(),
         labels = labelNodes.map((labelNode) => {
           const label = Label.fromLabelNode(labelNode, context);
@@ -300,7 +300,7 @@ function labelsFromRuleNode(ruleNode, context) {
 }
 
 function premisesFromRuleNode(ruleNode, context) {
-  const { Premise } = ontology,
+  const { Premise } = elements,
         premiseNodes = ruleNode.getPremiseNodes(),
         premises = premiseNodes.map((premiseNode) => {
           const premise = Premise.fromPremiseNode(premiseNode, context);
@@ -312,7 +312,7 @@ function premisesFromRuleNode(ruleNode, context) {
 }
 
 function conclusionFromRuleNode(ruleNode, context) {
-  const { Conclusion } = ontology,
+  const { Conclusion } = elements,
         conclusionNode = ruleNode.getConclusionNode(),
         conclusion = Conclusion.fromConclusionNode(conclusionNode, context);
 

package/src/{ontology → element}/section.js

@@ -1,15 +1,15 @@
 "use strict";
 
-import ontology from "../ontology";
+import elements from "../elements";
 import LocalContext from "../context/local";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 
 export default define(class Section {
-  constructor(context, node, string, hypotheses, axiom, lemma, theorem, conjecture) {
+  constructor(context, string, node, hypotheses, axiom, lemma, theorem, conjecture) {
     this.context = context;
-    this.node = node;
     this.string = string;
+    this.node = node;
     this.hypotheses = hypotheses;
     this.axiom = axiom;
     this.lemma = lemma;
@@ -103,7 +103,7 @@ export default define(class Section {
           conjecture = conjectureFroSectionNode(sectionNode, context),
           node = sectionNode, ///
           string = stringFromHypothesesAxiomLemmaTheoremAndConjecture(hypotheses, axiom, lemma, theorem, conjecture, context),
-          section = new Section(context, node, string, hypotheses, axiom, lemma, theorem, conjecture);
+          section = new Section(context, string, node, hypotheses, axiom, lemma, theorem, conjecture);
 
     return section;
   }
@@ -115,7 +115,7 @@ function axiomFroSectionNode(sectionNode, context) {
   const axiomNode = sectionNode.getAxiomNode();
 
   if (axiomNode !== null) {
-    const { Axiom } = ontology;
+    const { Axiom } = elements;
 
     axiom = Axiom.fromAxiomNode(axiomNode, context);
   }
@@ -129,7 +129,7 @@ function lemmaFroSectionNode(sectionNode, context) {
   const lemmaNode = sectionNode.getLemmaNode();
 
   if (lemmaNode !== null) {
-    const { Lemma } = ontology;
+    const { Lemma } = elements;
 
     lemma = Lemma.fromLemmaNode(lemmaNode, context);
   }
@@ -143,7 +143,7 @@ function theoremFroSectionNode(sectionNode, context) {
   const theoremNode = sectionNode.getTheoremNode();
 
   if (theoremNode !== null) {
-    const { Theorem } = ontology;
+    const { Theorem } = elements;
 
     theorem = Theorem.fromTheoremNode(theoremNode, context);
   }
@@ -157,7 +157,7 @@ function conjectureFroSectionNode(sectionNode, context) {
   const conjectureNode = sectionNode.getConjectureNode();
 
   if (conjectureNode !== null) {
-    const { Conjecture } = ontology;
+    const { Conjecture } = elements;
 
     conjecture = Conjecture.fromConjectureNode(conjectureNode, context);
   }
@@ -167,7 +167,7 @@ function conjectureFroSectionNode(sectionNode, context) {
 
 function hypothesesFromHypothesisNodes(hypothesisNodes, context) {
   const hypotheses = hypothesisNodes.map((hypothesisNode) => {
-    const { Hypothesis } = ontology,
+    const { Hypothesis } = elements,
           hypothesis = Hypothesis.fromHypothesisNode(hypothesisNode, context);
 
     return hypothesis;

package/src/{ontology → element}/signature.js

@@ -2,17 +2,18 @@
 
 import { arrayUtilities } from "necessary";
 
-import ontology from "../ontology";
+import elements from "../elements";
 
-import { define } from "../ontology";
+import { define } from "../elements";
+import { signatureStringFromTerms } from "../utilities/string";
 import { termsFromJSON, termsToTermsJSON } from "../utilities/json";
-import { stringFromTerms, variableFromTerm, termsFromTermNodes } from "../utilities/node";
 
 const { match, compare, correlate } = arrayUtilities;
 
 export default define(class Signature {
-  constructor(string, terms) {
+  constructor(string, node, terms) {
     this.string = string;
+    this.node = node;
     this.terms = terms;
   }
 
@@ -20,6 +21,10 @@ export default define(class Signature {
     return this.string;
   }
 
+  getNode() {
+    return this.node;
+  }
+
   getTerms() {
     return this.terms;
   }
@@ -66,7 +71,7 @@ export default define(class Signature {
                     termTypeEqualToOrSubTypeOfVariableType = termType.isEqualToOrSubTypeOf(variableType);
 
               if (termTypeEqualToOrSubTypeOfVariableType) {
-                const { TermSubstitution } = ontology,
+                const { TermSubstitution } = elements,
                       context = specificContext,  ///
                       termSubstitution = TermSubstitution.fromTernAndVariable(term, variable, context),
                       substitution = termSubstitution;  ///
@@ -153,16 +158,8 @@ export default define(class Signature {
 
   static fromJSON(json, context) {
     const terms = termsFromJSON(json, context),
-          string = stringFromTerms(terms),
-          signature = new Signature(string, terms);
-
-    return signature;
-  }
-
-  static fromSignatureNode(signatureNode, context) {
-    const termNodes = signatureNode.getTermNodes(),
-          terms = termsFromTermNodes(termNodes, context),
-          string = stringFromTerms(terms),
+          signatureString = signatureStringFromTerms(terms),
+          string = signatureString, ///
           signature = new Signature(string, terms);
 
     return signature;