occam-verify-cli 1.0.421 → 1.0.428

package/src/{ontology/topLevelAssertion.js → element/axiomLemmaTheoremConjecture.js}

@@ -2,7 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
-import ontology from "../ontology";
+import elements from "../elements";
 import LocalContext from "../context/local";
 
 import { labelsFromJSON,
@@ -18,11 +18,11 @@ import { labelsFromJSON,
 
 const { extract, reverse, correlate, backwardsEvery } = arrayUtilities;
 
-export default class TopLevelAssertion {
-  constructor(context, node, string, labels, suppositions, deduction, proof, signature, hypotheses) {
+export default class AxiomLemmaTheoremConjecture {
+  constructor(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses) {
     this.context = context;
-    this.node = node;
     this.string = string;
+    this.node = node;
     this.labels = labels;
     this.suppositions = suppositions;
     this.deduction = deduction;
@@ -174,7 +174,7 @@ export default class TopLevelAssertion {
     if (this.proof === null) {
       proofVerifies = true;
     } else {
-      const { Substitutions } = ontology,
+      const { Substitutions } = elements,
             substitutions = Substitutions.fromNothing();
 
       proofVerifies = this.proof.verify(substitutions, this.deduction, context);
@@ -318,9 +318,9 @@ export default class TopLevelAssertion {
           node = null,
           proof = null,
           string = stringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction),
-          topLevelAssertion = new Class(context, node, string, labels, suppositions, deduction, proof, signature, hypotheses);
+          axiomLemmaTheoremConjecture = new Class(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses);
 
-    return topLevelAssertion;
+    return axiomLemmaTheoremConjecture;
   }
 
   static fromNode(Class, node, context) {
@@ -337,104 +337,8 @@ export default class TopLevelAssertion {
           signature = signatureFromSignatureNode(signatureNode, context),
           hypotheses = [],
           string = stringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction),
-          topLevelAssertion = new Class(context, node, string, labels, suppositions, deduction, proof, signature, hypotheses);
-
-    return topLevelAssertion;
-  }
-}
-
-export function proofFromProofNode(proofNode, context) {
-  const { Proof } = ontology,
-        proof = Proof.fromProofNode(proofNode, context);
-
-  return proof;
-}
-
-export function labelsFromLabelNodes(labelNodes, context) {
-  const { Label } = ontology,
-        labels = labelNodes.map((labelNode) => {
-          const label = Label.fromLabelNode(labelNode, context);
-
-          return label;
-        });
-
-  return labels;
-}
-
-export function signatureFromSignatureNode(signatureNode, context) {
-  let signature = null;
-
-  if (signatureNode !== null) {
-    const { Signature } = ontology;
-
-    signature = Signature.fromSignatureNode(signatureNode, context);
-  }
-
-  return signature;
-}
+          axiomLemmaTheoremConjecture = new Class(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses);
 
-export function deductionFromDeductionNode(deductionNode, context) {
-  const { Deduction } = ontology,
-        deduction = Deduction.fromDeductionNode(deductionNode, context);
-
-  return deduction;
-}
-
-export function suppositionsFromSuppositionNodes(suppositionNodes, context) {
-  const { Supposition } = ontology,
-        suppositions = suppositionNodes.map((suppositionNode) => {
-          const supposition = Supposition.fromSuppositionNode(suppositionNode, context);
-
-          return supposition;
-        });
-
-    return suppositions;
-}
-
-export function labelsStringFromLabels(labels) {
-  const labelsString = labels.reduce((labelsString, label) => {
-    const labelString = label.getString();
-
-    labelsString = (labelsString === null) ?
-                      labelString: ///
-                        `${labelsString}, ${labelString}`;
-
-    return labelsString;
-  }, null);
-
-  return labelsString;
-}
-
-export function suppositionsStringFromSuppositions(suppositions) {
-  const suppositionsString = suppositions.reduce((suppositionsString, supposition) => {
-    const suppositionString = supposition.getString();
-
-    suppositionsString = (suppositionsString !== null) ?
-                           `${suppositionsString}, ${suppositionString}` :
-                             suppositionString;  ///
-
-    return suppositionsString;
-  }, null);
-
-  return suppositionsString;
-}
-
-export function stringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction) {
-  let string;
-
-  const suppositionsString = suppositionsStringFromSuppositions(suppositions),
-        deductionString = deduction.getString(),
-        labelsString = labelsStringFromLabels(labels);
-
-  if (labelsString !== null) {
-    string = (suppositionsString !== null) ?
-               `${labelsString} :: [${suppositionsString}] ... ${deductionString}` :
-                 `${labelsString} :: ${deductionString}`;
-  } else {
-    string = (suppositionsString !== null) ?
-               `[${suppositionsString}] ... ${deductionString}` :
-                 deductionString;
+    return axiomLemmaTheoremConjecture;
   }
-
-  return string;
 }

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

@@ -1,16 +1,15 @@
 "use strict";
 
-import ontology from "../ontology";
 import TemporaryContext from "../context/temporary";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 import { termsFromJSON, framesFromJSON, statementFromJSON, termsToTermsJSON, framesToFramesJSON, statementToStatementJSON } from "../utilities/json";
 
 export  default define(class Conclusion {
-  constructor(context, node, string, statement) {
+  constructor(context, string, node, statement) {
     this.context = context;
-    this.node = node;
     this.string = string;
+    this.node = node;
     this.statement = statement;
   }
 
@@ -120,21 +119,7 @@ export  default define(class Conclusion {
 
     context = temporaryContext; ///
 
-    const conclusion = new Conclusion(context, node, string, statement);
-
-    return conclusion;
-  }
-
-  static fromConclusionNode(conclusionNode, context) {
-    const { Statement } = ontology,
-          node = conclusionNode,  ///
-          string = context.nodeAsString(node),
-          statement = Statement.fromConclusionNode(conclusionNode, context),
-          temporaryContext = null;
-
-    context = temporaryContext; ///
-
-    const conclusion = new Conclusion(context, node, string, statement);
+    const conclusion = new Conclusion(context, string, node, statement);
 
     return conclusion;
   }

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

@@ -1,10 +1,10 @@
 "use strict";
 
-import TopLevelAssertion from "./topLevelAssertion";
+import AxiomLemmaTheoremConjecture from "./axiomLemmaTheoremConjecture";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 
-export default define(class Conjecture extends TopLevelAssertion {
+export default define(class Conjecture extends AxiomLemmaTheoremConjecture {
   verify() {
     let verifies;
 
@@ -30,12 +30,5 @@ export default define(class Conjecture extends TopLevelAssertion {
 
   static name = "Conjecture";
 
-  static fromJSON(json, context) { return TopLevelAssertion.fromJSON(Conjecture, json, context); }
-
-  static fromConjectureNode(conjectureNode, context) {
-    const node = conjectureNode,  ///
-          conjecture = TopLevelAssertion.fromNode(Conjecture, node, context);
-
-    return conjecture;
-  }
+  static fromJSON(json, context) { return AxiomLemmaTheoremConjecture.fromJSON(Conjecture, json, context); }
 });

package/src/{ontology → element}/declaration/combinator.js

@@ -1,14 +1,13 @@
 "use strict";
 
-import ontology from "../../ontology";
 import Declaration from "../declaration";
 
-import { define } from "../../ontology";
+import { define } from "../../elements";
 import { verifyStatement } from "../../process/verify";
 
 export default define(class CombinatorDeclaration extends Declaration {
-  constructor(context, node, string, combinator) {
-    super(context, node, string);
+  constructor(context, string, node, combinator) {
+    super(context, string, node);
 
     this.combinator = combinator;
   }
@@ -63,14 +62,4 @@ export default define(class CombinatorDeclaration extends Declaration {
   }
 
   static name = "CombinatorDeclaration";
-
-  static fromCombinatorDeclarationNode(combinatorDeclarationNode, context) {
-    const { Combinator } = ontology,
-          node = combinatorDeclarationNode, ///
-          string = context.nodeAsString(node),
-          combinator = Combinator.fromCombinatorDeclarationNode(combinatorDeclarationNode, context),
-          combinatorDeclaration = new CombinatorDeclaration(context, node, string, combinator);
-
-    return combinatorDeclaration;
-  }
 });

package/src/{ontology → element}/declaration/complexType.js

@@ -1,14 +1,12 @@
 "use strict";
 
-import ontology from "../../ontology";
 import Declaration from "../declaration";
 
-import { define } from "../../ontology";
-import { stringFromTypeNameTypePrefixNameAndSuperTypes } from "../../utilities/type";
+import { define } from "../../elements";
 
 export default define(class ComplexTypeDeclaration extends Declaration {
-  constructor(context, node, string, type, prefixed) {
-    super(context, node, string);
+  constructor(context, string, node, type, prefixed) {
+    super(context, string, node);
 
     this.type = type;
     this.prefixed = prefixed;
@@ -313,18 +311,4 @@ export default define(class ComplexTypeDeclaration extends Declaration {
   }
 
   static name = "ComplexTypeDeclaration";
-
-  static fromComplexTypeDeclarationNode(complexTypeDeclarationNode, context) {
-    const { Type } = ontology,
-          type = Type.fromComplexTypeDeclarationNode(complexTypeDeclarationNode, context),
-          node = complexTypeDeclarationNode,  ///
-          prefixed = complexTypeDeclarationNode.isPrefixed(),
-          typePrefixName = complexTypeDeclarationNode.getTypePrefixName(),
-          typeName = type.getName(),
-          superTypes = type.getSuperTypes(),
-          string = stringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes),
-          complexTypeDeclaration = new ComplexTypeDeclaration(context, node, string, type, prefixed);
-
-    return complexTypeDeclaration;
-  }
 });

package/src/{ontology → element}/declaration/constructor.js

@@ -1,14 +1,13 @@
 "use strict";
 
-import ontology from "../../ontology";
 import Declaration from "../declaration";
 
-import { define } from "../../ontology";
+import { define } from "../../elements";
 import { verifyTerm } from "../../process/verify";
 
 export default define(class ConstructorDeclaration extends Declaration {
-  constructor(context, node, string, constructor) {
-    super(context, node, string);
+  constructor(context, string, node, constructor) {
+    super(context, string, node);
 
     this.constructor = constructor;
   }
@@ -112,14 +111,4 @@ export default define(class ConstructorDeclaration extends Declaration {
   }
 
   static name = "ConstructorDeclaration";
-
-  static fromConstructorDeclarationNode(constructorDeclarationNode, context) {
-    const { Constructor } = ontology,
-          node = constructorDeclarationNode,  ///
-          string = context.nodeAsString(node),
-          constructor = Constructor.fromConstructorDeclarationNode(constructorDeclarationNode, context),
-          constructorDeclaration = new ConstructorDeclaration(context, node, string, constructor);
-
-    return constructorDeclaration;
-  }
 });

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

@@ -1,13 +1,12 @@
 "use strict";
 
-import ontology from "../../ontology";
 import Declaration from "../declaration";
 
-import { define } from "../../ontology";
+import { define } from "../../elements";
 
 export default define(class MetavariableDeclaration extends Declaration {
-  constructor(context, node, string, metavariable) {
-    super(context, node, string);
+  constructor(context, string, node, metavariable) {
+    super(context, string, node);
 
     this.metavariable = metavariable;
   }
@@ -106,39 +105,4 @@ export default define(class MetavariableDeclaration extends Declaration {
   }
 
   static name = "MetavariableDeclaration";
-
-  static fromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
-    const { Metavariable } = ontology,
-          node = metavariableDeclarationNode, ///
-          metaType = metaTypeFromMetavariableDeclarationNode(metavariableDeclarationNode, context),
-          metavariable = Metavariable.fromMetavariableDeclarationNode(metavariableDeclarationNode, context),
-          string = stringFromMetavariableAndMetaType(metavariable, metaType),
-          metavariableDeclaration = new MetavariableDeclaration(context, node, string, metavariable);
-
-    return metavariableDeclaration;
-  }
 });
-
-function stringFromMetavariableAndMetaType(metavariable, metaType) {
-  let string;
-
-  const metavariableString = metavariable.getString();
-
-  if (metaType === null) {
-    string = metavariableString; ///
-  } else {
-    const metaTypeString = metaType.getString();
-
-    string = `${metavariableString}:${metaTypeString}`;
-  }
-
-  return string;
-}
-
-function metaTypeFromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
-  const { MetaType } = ontology,
-        metaTypeNode = metavariableDeclarationNode.getMetaTypeNode(),
-        metaType = MetaType.fromMetaTypeNode(metaTypeNode, context);
-
-  return metaType;
-}

package/src/{ontology → element}/declaration/simpleType.js

@@ -1,14 +1,12 @@
 "use strict";
 
-import ontology from "../../ontology";
 import Declaration from "../declaration";
 
-import { define } from "../../ontology";
-import { stringFromTypeNameTypePrefixNameAndSuperTypes } from "../../utilities/type";
+import { define } from "../../elements";
 
 export default define(class SimpleTypeDeclaration extends Declaration {
-  constructor(context, node, string, type, prefixed) {
-    super(context, node, string);
+  constructor(context, string, node, type, prefixed) {
+    super(context, string, node);
 
     this.type = type;
     this.prefixed = prefixed;
@@ -172,18 +170,4 @@ export default define(class SimpleTypeDeclaration extends Declaration {
   }
 
   static name = "SimpleTypeDeclaration";
-
-  static fromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context) {
-    const { Type } = ontology,
-          type = Type.fromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context),
-          node = simpleTypeDeclarationNode, ///
-          prefixed = simpleTypeDeclarationNode.isPrefixed(),
-          typePrefixName = simpleTypeDeclarationNode.getTypePrefixName(),
-          typeName = type.getName(),
-          superTypes = type.getSuperTypes(),
-          string = stringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes),
-          simpleTypeDeclaration = new SimpleTypeDeclaration(context, node, string, type, prefixed);
-
-    return simpleTypeDeclaration;
-  }
 });

package/src/{ontology → element}/declaration/typePrefix.js

@@ -1,13 +1,12 @@
 "use strict";
 
-import ontology from "../../ontology";
 import Declaration from "../declaration";
 
-import { define } from "../../ontology";
+import { define } from "../../elements";
 
 export default define(class TypePrefixDeclaration extends Declaration {
-  constructor(context, node, string, typePrefix) {
-    super(context, node, string);
+  constructor(context, string, node, typePrefix) {
+    super(context, string, node);
 
     this.typePrefix = typePrefix;
   }
@@ -89,15 +88,4 @@ export default define(class TypePrefixDeclaration extends Declaration {
   }
 
   static name = "TypePrefixDeclaration";
-
-  static fromTypePrefixDeclarationNode(typePrefixDeclarationNode, context) {
-    const { TypePrefix } = ontology,
-          node = typePrefixDeclarationNode, ///
-          typePrefix = TypePrefix.fromTypePrefixDeclarationNode(typePrefixDeclarationNode, context),
-          typePrefixName = typePrefix.getName(),
-          string = typePrefixName,  ///
-          simpleTypeDeclaration = new TypePrefixDeclaration(context, node, string, typePrefix);
-
-    return simpleTypeDeclaration;
-  }
 });

package/src/{ontology → element}/declaration/variable.js

@@ -1,13 +1,12 @@
 "use strict";
 
-import ontology from "../../ontology";
 import Declaration from "../declaration";
 
-import { define } from "../../ontology";
+import { define } from "../../elements";
 
 export default define(class VariableDeclaration extends Declaration {
-  constructor(context, node, string, variable) {
-    super(context, node, string);
+  constructor(context, string, node, variable) {
+    super(context, string, node);
 
     this.variable = variable;
   }
@@ -115,14 +114,4 @@ export default define(class VariableDeclaration extends Declaration {
   }
 
   static name = "VariableDeclaration";
-
-  static fromVariableDeclarationNode(variableDeclarationNode, context) {
-    const { Variable } = ontology,
-          node = variableDeclarationNode, ///
-          string = context.nodeAsString(node),
-          variable = Variable.fromVariableDeclarationNode(variableDeclarationNode, context),
-          variableDeclaration = new VariableDeclaration(context, node, string, variable);
-
-    return variableDeclaration;
-  }
 });

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

@@ -1,21 +1,21 @@
 "use strict";
 
 export default class Declaration {
-  constructor(context, node, string) {
+  constructor(context, string, node) {
     this.context = context;
-    this.node = node;
     this.string = string;
+    this.node = node;
   }
 
   getContext() {
     return this.context;
   }
 
-  getNode() {
-    return this.node;
-  }
-
   getString() {
     return this.string;
   }
+
+  getNode() {
+    return this.node;
+  }
 }

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

@@ -1,14 +1,15 @@
 "use strict";
 
-import ontology from "../ontology";
+import elements from "../elements";
 import TemporaryContext from "../context/temporary";
 
-import { define } from "../ontology";
+import { define } from "../elements";
 import { termsFromJSON, framesFromJSON, statementFromJSON, termsToTermsJSON, framesToFramesJSON, statementToStatementJSON } from "../utilities/json";
 
 export default define(class Deduction {
-  constructor(context, node, string, statement) {
+  constructor(context, string, statement) {
     this.context = context;
+    this.string = string;
     this.node = node;
     this.string = string;
     this.statement = statement;
@@ -18,14 +19,14 @@ export default define(class Deduction {
     return this.context;
   }
 
-  getNode(node) {
-    return this.node;
-  }
-
   getString() {
     return this.string;
   }
 
+  getNode() {
+    return this.node;
+  }
+
   getStatement() {
     return this.statement;
   }
@@ -141,21 +142,7 @@ export default define(class Deduction {
 
     context = temporaryContext; ///
 
-    const deduction = new Deduction(context, node, string, statement);
-
-    return deduction;
-  }
-
-  static fromDeductionNode(deductionNode, context) {
-    const { Statement } = ontology,
-          node = deductionNode,  ///
-          string = context.nodeAsString(node),
-          statement = Statement.fromDeductionNode(deductionNode, context),
-          temporaryContext = null;
-
-    context = temporaryContext;  ///
-
-    const deduction = new Deduction(context, node, string, statement);
+    const deduction = new Deduction(context, string, statement);
 
     return deduction;
   }

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

@@ -2,10 +2,9 @@
 
 import { arrayUtilities } from "necessary";
 
-import ontology from "../ontology";
+import assignAssignments from "../process/assign";
 
-import { define } from "../ontology";
-import { assignAssignments } from "../utilities/assignments";
+import { define } from "../elements";
 
 const { last } = arrayUtilities;
 
@@ -51,34 +50,5 @@ export default define(class Derivation {
   }
 
   static name = "Derivation";
-
-  static fromDerivationNode(derivationNode, context) {
-    const stepsOrSubproofs = stepsOrSubproofsFromDerivationNode(derivationNode, context),
-          derivation = new Derivation(stepsOrSubproofs);
-
-    return derivation;
-  }
 });
 
-function stepsOrSubproofsFromDerivationNode(derivationNode, context) {
-  const { Step, Subproof } = ontology,
-        stepOrSubproofNodes = derivationNode.getStepOrSubproofNodes(),
-        stepsOrSubproofs = stepOrSubproofNodes.map((stepOrSubproofNode) => {
-          let stepOrSubproof;
-
-          const step = Step.fromStepOrSubproofNode(stepOrSubproofNode, context),
-                subproof = Subproof.fromStepOrSubproofNode(stepOrSubproofNode, context);
-
-          if (false) {
-            ///
-          } else if (step !== null) {
-            stepOrSubproof = step;  ///
-          } else if (subproof !== null) {
-            stepOrSubproof = subproof;  ///
-          }
-
-          return stepOrSubproof;
-        });
-
-  return stepsOrSubproofs;
-}