occam-verify-cli 1.0.382 → 1.0.385

package/src/{dom → ontology}/derivation.js

@@ -2,14 +2,14 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { assignAssignments } from "../utilities/assignments";
 
 const { last } = arrayUtilities;
 
-export default domAssigned(class Derivation {
+export default define(class Derivation {
   constructor(stepsOrSubproofs) {
     this.stepsOrSubproofs = stepsOrSubproofs;
   }
@@ -61,7 +61,7 @@ export default domAssigned(class Derivation {
 });
 
 function stepsOrSubproofsFromDerivationNode(derivationNode, context) {
-  const { Step, Subproof } = dom,
+  const { Step, Subproof } = ontology,
         stepOrSubproofNodes = derivationNode.getStepOrSubproofNodes(),
         stepsOrSubproofs = stepOrSubproofNodes.map((stepOrSubproofNode) => {
           let stepOrSubproof;

package/src/{dom → ontology}/equality.js

@@ -1,13 +1,13 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import equationalUnifier from "../unifier/equantional";
 import EqualityAssignment from "../assignment/equality";
 import VariableAssignment from "../assignment/variable";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Equality {
+export default define(class Equality {
   constructor(string, leftTerm, rightTerm) {
     this.string = string;
     this.leftTerm = leftTerm;
@@ -186,7 +186,7 @@ export default domAssigned(class Equality {
       return;
     }
 
-    const { Variable } = dom,
+    const { Variable } = ontology,
           type = this.getType(),
           leftTermNode = this.leftTerm.getNode(),
           rightTermNode = this.rightTerm.getNode(),
@@ -244,7 +244,7 @@ export default domAssigned(class Equality {
 });
 
 function leftTermFromEqualityNode(equalityNode, context) {
-  const { Term } = dom,
+  const { Term } = ontology,
         leftTermNode = equalityNode.getLeftTermNode(),
         leftTerm = Term.fromTermNode(leftTermNode, context);
 
@@ -252,7 +252,7 @@ function leftTermFromEqualityNode(equalityNode, context) {
 }
 
 function rightTermFromEqualityNode(equalityNode, context) {
-  const { Term } = dom,
+  const { Term } = ontology,
         rightTermNode = equalityNode.getRightTermNode(),
         rightTerm = Term.fromTermNode(rightTermNode, context);
 

package/src/{dom → ontology}/error.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Error {
+export default define(class Error {
   constructor(context, node, string) {
     this.context = context;
     this.node = node;

package/src/{dom → ontology}/frame.js

@@ -2,15 +2,15 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
+import { define } from "../ontology";
 import { S, NOTHING } from "../constants";
-import { domAssigned } from "../dom";
 import { FRAME_META_TYPE_NAME } from "../metaTypeNames";
 
 const { first } = arrayUtilities;
 
-export default domAssigned(class Frame {
+export default define(class Frame {
   constructor(string, node, tokens, declarations) {
     this.string = string;
     this.node = node;
@@ -289,7 +289,7 @@ export default domAssigned(class Frame {
 });
 
 function frameFromFrameNode(frameNode, context) {
-  const { Frame } = dom,
+  const { Frame } = ontology,
         node = frameNode, ///
         string = context.nodeAsString(node),
         tokens = context.nodeAsTokens(node),
@@ -301,7 +301,7 @@ function frameFromFrameNode(frameNode, context) {
 }
 
 function declarationsFromFrameNode(frameNode, context) {
-  const { Declaration } = dom,
+  const { Declaration } = ontology,
         declarationNodes = frameNode.getDeclarationNodes(),
         declarations = declarationNodes.map((declarationNode) => {
           const declaration = Declaration.fromDeclarationNode(declarationNode, context);
@@ -313,7 +313,7 @@ function declarationsFromFrameNode(frameNode, context) {
 }
 
 function metavariablesFromFrameNode(frameNode, context) {
-  const { Metavariable } = dom,
+  const { Metavariable } = ontology,
         metavariableNodes = frameNode.getMetavariableNodes(),
         metavariables = metavariableNodes.map((metavariableNode) => {
           const metavariable = Metavariable.fromMetavariableNode(metavariableNode, context);

package/src/{dom → ontology}/hypothesis.js

@@ -1,13 +1,12 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { assignAssignments } from "../utilities/assignments";
-import { subproofAssertionFromStatement } from "../utilities/context";
 import { statementFromJSON, statementToStatementJSON } from "../utilities/json";
 
-export default domAssigned(class Hypothesis {
+export default define(class Hypothesis {
   constructor(node, string, statement) {
     this.node = node;
     this.string = string;
@@ -44,7 +43,7 @@ export default domAssigned(class Hypothesis {
         const assignmentsAssigned = assignAssignments(assignments, context);
 
         if (assignmentsAssigned) {
-          const { Step } = dom,
+          const { Step } = ontology,
                 step = Step.fromStatement(this.statement, context),
                 stepOrSubproof = step;  ///
 
@@ -114,7 +113,7 @@ export default domAssigned(class Hypothesis {
   }
 
   static fromHypothesisNode(hypothesisNode, context) {
-    const { Statement } = dom,
+    const { Statement } = ontology,
           node = hypothesisNode, ///
           string = context.nodeAsString(node),
           statement = Statement.fromHypothesisNode(hypothesisNode, context),

package/src/{dom → ontology}/judgement.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import JudgementAssignment from "../assignment/judgement";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Judgement {
+export default define(class Judgement {
   constructor(string, frame, declaration) {
     this.string = string;
     this.frame = frame;
@@ -151,7 +151,7 @@ export default domAssigned(class Judgement {
     const judgementNode = statementNode.getJudgementNode();
 
     if (judgementNode !== null) {
-      const { Frame, Declaration} = dom,
+      const { Frame, Declaration} = ontology,
             node = judgementNode, ///
             string = context.nodeAsString(node),
             frame = Frame.fromJudgementNode(judgementNode, context),
@@ -165,7 +165,7 @@ export default domAssigned(class Judgement {
 });
 
 function referenceFromMetavariable(metavariable, context) {
-  const { Reference } = dom,
+  const { Reference } = ontology,
         metavariableNode = metavariable.getNode(),
         reference = Reference.fromMetavariableNode(metavariableNode, context);
 

package/src/{dom → ontology}/label.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
-export default domAssigned(class Label {
+export default define(class Label {
   constructor(context, metavariable) {
     this.context = context;
     this.metavariable = metavariable;
@@ -102,7 +102,7 @@ export default domAssigned(class Label {
   }
 
   static fromLabelNode(labelNode, context) {
-    const { Metavariable } = dom,
+    const { Metavariable } = ontology,
           metavariable = Metavariable.fromLabelNode(labelNode, context),
           label = new Label(context, metavariable);
 

package/src/{dom → ontology}/lemma.js

@@ -2,9 +2,9 @@
 
 import TopLevelAssertion from "./topLevelAssertion";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Lemma extends TopLevelAssertion {
+export default define(class Lemma extends TopLevelAssertion {
   verify() {
     let verifies;
 

package/src/{dom → ontology}/metaLemma.js

@@ -2,9 +2,9 @@
 
 import TopLevelMetaAssertion from "./topLevelMetaAssertion";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class MetaLemma extends TopLevelMetaAssertion {
+export default define(class MetaLemma extends TopLevelMetaAssertion {
   verify() {
     let verifies;
 

package/src/{dom → ontology}/metaType.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { FRAME_META_TYPE_NAME, REFERENCE_META_TYPE_NAME, STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
 
 class MetaType {
@@ -70,7 +70,7 @@ function metaTypeFromMetaTypeNode(metaTypeNode, context) {
   return metaType;
 }
 
-export default domAssigned(MetaType);
+export default define(MetaType);
 
 class FrameMetaType extends MetaType {
   static fromNothing() {

package/src/{dom → ontology}/metatheorem.js

@@ -2,9 +2,9 @@
 
 import TopLevelMetaAssertion from "./topLevelMetaAssertion";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Metatheorem extends TopLevelMetaAssertion {
+export default define(class Metatheorem extends TopLevelMetaAssertion {
   verify() {
     let verifies;
 

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

@@ -1,16 +1,16 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import MetavariablePartialContext from "../context/partial/metavariable";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { EMPTY_STRING } from "../constants";
 import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 import { metaTypeFromJSON, metaTypeToMetaTypeJSON } from "../utilities/json";
 import { metavariableFromFrame, metavariableFromStatement } from "../utilities/context";
 import { unifyMetavariable, unifyMetavariableIntrinsically } from "../utilities/unification";
 
-export default domAssigned(class Metavariable {
+export default define(class Metavariable {
   constructor(string, node, tokens, name, type, metaType) {
     this.string = string;
     this.node = node;
@@ -161,7 +161,7 @@ export default domAssigned(class Metavariable {
           frameUnifies = true;
         }
       } else {
-        const { FrameSubstitution } = dom,
+        const { FrameSubstitution } = ontology,
               context = specificContext,  ///
               metavariable = this,  ///
               frameSubstitution = FrameSubstitution.fromFrameAndMetavariable(frame, metavariable, context),
@@ -206,7 +206,7 @@ export default domAssigned(class Metavariable {
           referenceUnifies = true;
         }
       } else {
-        const { ReferenceSubstitution } = dom,
+        const { ReferenceSubstitution } = ontology,
               metavariable = this,
               referenceSubstitution = ReferenceSubstitution.fromReferenceAndMetavariable(reference, metavariable, context),
               substitution = referenceSubstitution;  ///
@@ -253,7 +253,7 @@ export default domAssigned(class Metavariable {
           statementUnifies = true;
         }
       } else {
-        const { StatementSubstitution } = dom,
+        const { StatementSubstitution } = ontology,
               metavariable = this,
               statementSubstitution = StatementSubstitution.fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context);
 
@@ -495,7 +495,7 @@ export default domAssigned(class Metavariable {
   }
 
   static fromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
-    const { MetaType } = dom,
+    const { MetaType } = ontology,
           metavariableNode = metavariableDeclarationNode.getMetavariableNode(),
           type = typeFromMetavariableDeclarationNode(metavariableDeclarationNode, context),
           metaType = MetaType.fromMetavariableDeclarationNode(metavariableDeclarationNode, context),
@@ -510,7 +510,7 @@ export default domAssigned(class Metavariable {
 });
 
 function metavariableFromMetavariableNode(metavariableNode, context) {
-  const { Metavariable } = dom,
+  const { Metavariable } = ontology,
         metavariableName = metavariableNode.getMetavariableName(),
         type = null,
         name = metavariableName,  ///

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

@@ -1,8 +1,8 @@
 "use strict";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Parameter {
+export default define(class Parameter {
   constructor(name) {
     this.name = name;
   }

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

@@ -1,13 +1,13 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { assignAssignments } from "../utilities/assignments";
 import { subproofAssertionFromStatement } from "../utilities/context";
 import { statementFromJSON, procedureCallFromJSON, statementToStatementJSON, procedureCallToProcedureCallJSON } from "../utilities/json";
 
-export default domAssigned(class Premise {
+export default define(class Premise {
   constructor(node, string, statement, procedureCall) {
     this.node = node;
     this.string = string;
@@ -49,7 +49,7 @@ export default domAssigned(class Premise {
         const assignmentsAssigned = assignAssignments(assignments, context);
 
         if (assignmentsAssigned) {
-          const { Step } = dom,
+          const { Step } = ontology,
                 step = Step.fromStatement(this.statement, context),
                 stepOrSubproof = step;  ///
 
@@ -226,7 +226,7 @@ export default domAssigned(class Premise {
   }
 
   static fromPremiseNode(premiseNode, context) {
-    const { Statement, ProcedureCall } = dom,
+    const { Statement, ProcedureCall } = ontology,
           node = premiseNode, ///
           string = context.nodeAsString(node),
           statement = Statement.fromPremiseNode(premiseNode, context),

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

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

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

@@ -1,8 +1,8 @@
 "use strict";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class ProcedureReference {
+export default define(class ProcedureReference {
   constructor(string, name) {
     this.string = string;
     this.name = name;

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

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

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

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Property {
+export default define(class Property {
   constructor(string, name, nominalTypeName) {
     this.string = string;
     this.name = name;
@@ -75,7 +75,7 @@ export default domAssigned(class Property {
 });
 
 function propertyFromPropertyNode(propertyNode, context) {
-  const { Property } = dom,
+  const { Property } = ontology,
         propertyName = propertyNode.getPropertyName(),
         nominalTypeName = null,
         name = propertyName,  ///

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

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class PropertyRelation {
+export default define(class PropertyRelation {
   constructor(string, node, tokens, property, term) {
     this.string = string;
     this.node = node;
@@ -119,7 +119,7 @@ export default domAssigned(class PropertyRelation {
   static name = "PropertyRelation";
 
   static fromPropertyAssertionNode(propertyAssertionNode, context) {
-    const { Term, Property } = dom,
+    const { Term, Property } = ontology,
           propertyRelationNode = propertyAssertionNode.getPropertyRelationNode(),
           node = propertyRelationNode,  ///
           string = context.nodeAsString(node),

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

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import Substitutions from "../substitutions";
 
-import { domAssigned } from "../dom";
-import { referenceMetaType } from "../dom/metaType";
+import { define } from "../ontology";
+import { referenceMetaType } from ".//metaType";
 import { unifyMetavariableIntrinsically } from "../utilities/unification";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
-export default domAssigned(class Reference {
+export default define(class Reference {
   constructor(metavariable) {
     this.metavariable = metavariable;
   }
@@ -222,7 +222,7 @@ export default domAssigned(class Reference {
 });
 
 function referenceFromReferenceNode(referenceNode, context) {
-  const { Reference, Metavariable } = dom,
+  const { Reference, Metavariable } = ontology,
         metavariable = Metavariable.fromReferenceNode(referenceNode, context),
         reference = new Reference(metavariable);
 
@@ -230,7 +230,7 @@ function referenceFromReferenceNode(referenceNode, context) {
 }
 
 function referenceFromMetavariableNode(metavariableNode, context) {
-  const { Reference, Metavariable } = dom,
+  const { Reference, Metavariable } = ontology,
         metavariable = Metavariable.fromMetavariableNode(metavariableNode, context),
         reference = new Reference(metavariable);
 

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

@@ -2,11 +2,11 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 import Substitutions from "../substitutions";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { labelsStringFromLabels } from "./topLevelAssertion";
 import { labelsFromJSON,
          premisesFromJSON,
@@ -17,7 +17,7 @@ import { labelsFromJSON,
 
 const { reverse, extract, backwardsEvery } = arrayUtilities;
 
-export default domAssigned(class Rule {
+export default define(class Rule {
   constructor(context, node, string, labels, premises, conclusion, proof) {
     this.context = context;
     this.node = node;
@@ -283,7 +283,7 @@ export default domAssigned(class Rule {
 });
 
 function proofFromRuleNode(ruleNode, context) {
-  const { Proof } = dom,
+  const { Proof } = ontology,
         proofNode = ruleNode.getProofNode(),
         proof = Proof.fromProofNode(proofNode, context);
 
@@ -291,7 +291,7 @@ function proofFromRuleNode(ruleNode, context) {
 }
 
 function labelsFromRuleNode(ruleNode, context) {
-  const { Label } = dom,
+  const { Label } = ontology,
         labelNodes = ruleNode.getLabelNodes(),
         labels = labelNodes.map((labelNode) => {
           const label = Label.fromLabelNode(labelNode, context);
@@ -303,7 +303,7 @@ function labelsFromRuleNode(ruleNode, context) {
 }
 
 function premisesFromRuleNode(ruleNode, context) {
-  const { Premise } = dom,
+  const { Premise } = ontology,
         premiseNodes = ruleNode.getPremiseNodes(),
         premises = premiseNodes.map((premiseNode) => {
           const premise = Premise.fromPremiseNode(premiseNode, context);
@@ -315,7 +315,7 @@ function premisesFromRuleNode(ruleNode, context) {
 }
 
 function conclusionFromRuleNode(ruleNode, context) {
-  const { Conclusion } = dom,
+  const { Conclusion } = ontology,
         conclusionNode = ruleNode.getConclusionNode(),
         conclusion = Conclusion.fromConclusionNode(conclusionNode, context);
 

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

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