occam-verify-cli 0.0.958 → 0.0.959

package/src/constructor.js

@@ -1,9 +1,6 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { typeFromJSONAndFileContext } from "./type";
-import { termNodeFromConstructorDeclarationTokens } from "./utilities/node";
-import { constructorDeclarationTokensFromTermString } from "./utilities/tokens";
 
 export default class Constructor {
   constructor(termNode, string, type) {
@@ -24,52 +21,12 @@ export default class Constructor {
     return this.type;
   }
 
-  toJSON(tokens) {
-    const termString = nodeAsString(this.termNode, tokens),
-          typeJSON = (this.type === null) ?
-                        null :
-                          this.type.toJSON(tokens),
-          term = termString,  ///
-          type = typeJSON,  ///
-          json = {
-            term,
-            type
-          };
-
-    return json;
-  }
-
   static fromTermNodeTypeAndTokens(termNode, type, tokens) {
     const string = stringFromTermNodeTypeAndTokens(termNode, type, tokens),
           constructor = new Constructor(termNode, string, type);
 
     return constructor;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const { term } = json,
-          termString = term,  ///
-          lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          constructorDeclarationTokens = constructorDeclarationTokensFromTermString(termString, lexer),
-          termNode = termNodeFromConstructorDeclarationTokens(constructorDeclarationTokens, parser);
-
-    let { type } = json;
-
-    if (type !== null) {
-      const typeJSON = type;  ///
-
-      json = typeJSON;  ///
-
-      type = typeFromJSONAndFileContext(json, fileContext);
-    }
-
-    const tokens = constructorDeclarationTokens,  ///
-          string = stringFromTermNodeTypeAndTokens(termNode, type, tokens),
-          constructor = new Constructor(termNode, string, type);
-
-    return constructor;
-  }
 }
 
 function stringFromTermNodeTypeAndTokens(termNode, type, tokens) {

package/src/context/local.js

@@ -451,28 +451,6 @@ class LocalContext {
 
     return localContext;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    let { variables } = json;
-
-    const variablesJSON = variables;
-
-    variables = variablesJSON.map((variableJSON) => {
-      const json = variableJSON,  ///
-            variable = Variable.fromJSONAndFileContext(json, fileContext);
-
-      return variable;
-    });
-
-    const context = fileContext,  ///
-          proofSteps = [],
-          equivalences = [],
-          judgements = [],
-          metavariables = [],
-          localContext = new LocalContext(context, variables, proofSteps, judgements, equivalences, metavariables);  ///
-
-    return localContext;
-  }
 }
 
 export default LocalContext;

package/src/label.js

@@ -1,7 +1,6 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { metavariableNodeFromMetavariableString } from "./utilities/node";
 
 export default class Label {
   constructor(metavariableNode) {
@@ -24,26 +23,9 @@ export default class Label {
     return string;
   }
 
-  toJSON(tokens) {
-    const string = nodeAsString(this.metavariableNode, tokens),
-          json = string;  ///
-
-    return json;
-  }
-
   static fromMetavariableNode(metavariableNode) {
     const label = new Label(metavariableNode);
 
     return label;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const metavariableString = json, ///
-          lexer  = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          metavariableNode = metavariableNodeFromMetavariableString(metavariableString, lexer, parser),
-          label = new Label(metavariableNode);
-
-    return label;
-  }
 }

package/src/lemma.js

@@ -3,7 +3,5 @@
 import TopLevelAssertion from "./topLevelAssertion";
 
 export default class Lemma extends TopLevelAssertion {
-  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(Lemma,json, fileContext); }
-
   static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return TopLevelAssertion.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Lemma, labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/metaLemma.js

@@ -3,7 +3,5 @@
 import TopLevelAssertion from "./topLevelAssertion";
 
 export default class MetaLemma extends TopLevelAssertion {
-  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(MetaLemma, json, fileContext); }
-
   static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return MetaLemma.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Metatheorem, labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/metaType.js

@@ -50,15 +50,6 @@ export default class MetaType {
     return string;
   }
 
-  toJSON(tokens) {
-    const name = this.name,
-          json = {
-            name
-          };
-
-    return json;
-  }
-
   static fromMetaTypeName(metaTypeName) {
     const name = metaTypeName,  ///
           metaType = new MetaType(name);

package/src/metatheorem.js

@@ -3,7 +3,5 @@
 import TopLevelAssertion from "./topLevelAssertion";
 
 export default class Metatheorem extends TopLevelAssertion {
-  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(Metatheorem, json, fileContext); }
-
   static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return TopLevelAssertion.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Metatheorem, labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/metavariable.js

@@ -6,8 +6,6 @@ import { first } from "./utilities/array";
 import { nodeQuery } from "./utilities/query";
 import { nodeAsString } from "./utilities/string";
 import { nameFromMetavariableNode } from "./utilities/name";
-import { metaTypeFromJSONAndFileContext } from "./metaType";
-import { metavariableNodeFromMetavariableString } from "./utilities/node";
 
 const termNodeQuery = nodeQuery("/metavariable/argument/term!"),
       typeNodeQuery = nodeQuery("/metavariable/argument/type!");
@@ -75,19 +73,6 @@ export default class Metavariable {
     return matchesNode;
   }
 
-  toJSON(tokens) {
-    const metaTypeJSON = this.metaType.toJSON(tokens),
-          string = nodeAsString(this.node, tokens),
-          node = string,  //
-          metaType = metaTypeJSON,  ///
-          json = {
-            node,
-            metaType
-          };
-
-    return json;
-  }
-
   asString(tokens) {
     const metaTypeName = this.metaType.getName();
 
@@ -98,29 +83,6 @@ export default class Metavariable {
     return string;
   }
 
-  static fromJSONAndFileContext(json, fileContext) {
-    let { node } = json;
-
-    const lexer  = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          variableString = node,  ///
-          metavariableNode = metavariableNodeFromMetavariableString(variableString, lexer, parser);
-
-    node = metavariableNode;  ///
-
-    let { metaType } = json;
-
-    json = metaType;  ///
-
-    metaType = metaTypeFromJSONAndFileContext(json, fileContext);
-
-    const name = nameFromMetavariableNode(metavariableNode),
-          termType = termTypeFromMetavariableNode(metavariableNode, fileContext),
-          metavariable = new Metavariable(node, name, termType, metaType);
-
-    return metavariable;
-  }
-
   static fromNodeNameTermTypeAndMetaType(node, name, termType, metaType) {
     const metavariable = new Metavariable(node, name, termType, metaType);
 

package/src/premise.js

@@ -5,7 +5,6 @@ import metaLevelUnifier from "./unifier/metaLevel";
 import { match } from "./utilities/array";
 import { nodeAsString } from "./utilities/string";
 import { nodeQuery, nodesQuery } from "./utilities/query";
-import { statementNodeFromStatementString } from "./utilities/node";
 
 const subproofAssertionNodeQuery = nodeQuery("/statement/subproofAssertion!"),
       subproofAssertionStatementNodesQuery = nodesQuery("/subproofAssertion/statement"),
@@ -66,30 +65,9 @@ export default class Premise {
     return subproofUnified;
   }
 
-  toJSON(tokens) {
-    const statementString = nodeAsString(this.statementNode, tokens),
-          statement = statementString,  ///
-          json = {
-            statement
-          };
-
-    return json;
-  }
-
   static fromStatementNode(statementNode) {
     const premise = new Premise(statementNode);
 
     return premise;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const { statement } = json,
-          statementString = statement,  ///
-          lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          statementNode = statementNodeFromStatementString(statementString, lexer, parser),
-          premise = new Premise(statementNode);
-
-    return premise;
-  }
 }

package/src/rule.js

@@ -1,8 +1,5 @@
 "use strict";
 
-import Label from "./label";
-import Premise from "./premise";
-import Conclusion from "./conclusion";
 import Substitutions from "./substitutions";
 import unifyPremisesAgainstProofSteps from "./unify/premisesAgainstProofSteps";
 import unifyConclusionAgainstStatement from "./unify/conclusionAgainstStatement";
@@ -64,68 +61,6 @@ export default class Rule {
     return matchesMetavariableNode;
   }
 
-  toJSON(tokens) {
-    const labelsJSON = this.labels.map((label) => {
-            const labelJSON = label.toJSON(tokens);
-
-            return labelJSON;
-          }),
-          premisesJSON = this.premises.map((premise) => {
-            const premiseJSON = premise.toJSON(tokens);
-
-            return premiseJSON;
-          }),
-          conclusionJSON = this.conclusion.toJSON(tokens),
-          labels = labelsJSON,  ///
-          premises = premisesJSON,  ///
-          conclusion = conclusionJSON,  ///
-          json = {
-            labels,
-            premises,
-            conclusion
-          };
-
-    return json;
-  }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    let rule;
-
-    let { labels } = json;
-
-    const labelsJSON = labels;  ///
-
-    labels = labelsJSON.map((labelJSON) => {
-      const json = labelJSON, ///
-            label = Label.fromJSONAndFileContext(json, fileContext);
-
-      return label;
-    });
-
-    let { premises } = json;
-
-    const premisesJSON = premises;  ///
-
-    premises = premisesJSON.map((premiseJSON) => {
-      const json = premiseJSON, ///
-            premise = Premise.fromJSONAndFileContext(json, fileContext);
-
-      return premise;
-    });
-
-    let { conclusion } = json;
-
-    const conclusionJSON = conclusion;  ///
-
-    json = conclusionJSON;  ///
-
-    conclusion = Conclusion.fromJSONAndFileContext(json, fileContext);
-
-    rule = new Rule(labels, premises, conclusion, fileContext);
-
-    return rule;
-  }
-
   static fromLabelsPremisesConclusionAndFileContext(labels, premises, conclusion, fileContext) {
     const rule = new Rule(labels, premises, conclusion, fileContext);
 

package/src/ruleNames.js

@@ -1,6 +1,4 @@
 "use strict";
 
-export const METAVARIABLE_RULE_NAME = "metavariable";
-export const VARIABLE_DECLARATION_RULE_NAME = "variableDeclaration";
 export const UNQUALIFIED_STATEMENT_RULE_NAME = "unqualifiedStatement";
 export const CONSTRUCTOR_DECLARATION_RULE_NAME = "constructorDeclaration";

package/src/substitution/statementForMetavariable.js

@@ -6,7 +6,6 @@ import TermForVariableSubstitution from "./termForVariable";
 import unifyStatementAgainstStatement from "../unify/statementAtainstStatement";
 
 import { nodeQuery } from "../utilities/query";
-import { statementNodeFromStatementString, metavariableNodeFromMetavariableString } from "../utilities/node";
 import { matchStatementModuloBrackets, bracketedStatementChildNodeFromStatementNode } from "../utilities/match";
 
 const metavariableNodeQuery = nodeQuery("/statement/metavariable!");
@@ -106,19 +105,6 @@ export default class StatementForMetavariableSubstitution extends Substitution {
     return string;
   }
 
-  static fromJSONAndFileContext(json, fileContext) {
-    const { metavariable, statement } = json,
-            metavariableString = metavariable,  ///
-            statementString = statement,  ///
-            lexer = fileContext.getLexer(),
-            parser = fileContext.getParser(),
-            statementNode = statementNodeFromStatementString(statementString, lexer, parser),
-            metavariableNode = metavariableNodeFromMetavariableString(metavariableString, lexer, parser),
-            statementForMetavariableSubstitution = new StatementForMetavariableSubstitution(statementNode, metavariableNode);
-
-    return statementForMetavariableSubstitution;
-  }
-
   static fromMetavariableNodeAndStatementNode(metavariableNode, statementNode) {
     let statementForMetavariableSubstitution;
 

package/src/substitutions.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import StatementForMetavariableSubstitution from "./substitution/statementForMetavariable";
-
 import { prune, compare, rightDifference } from "./utilities/array";
 
 export default class Substitutions {
@@ -102,16 +100,6 @@ export default class Substitutions {
     ///
   }
 
-  toJSON(tokens) {
-    const json = this.array.map((substitution) => {
-      const substitutionJSON = substitution.toJSON(tokens);
-
-      return substitutionJSON;
-    });
-
-    return json;
-  }
-
   static fromNothing() {
     const array = [],
           savedArray = null,
@@ -119,19 +107,4 @@ export default class Substitutions {
 
     return substitutions;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const substitutionsJSON = json, ///
-          array = substitutionsJSON.map((substitutionJSON) => {
-            const json = substitutionJSON,  ///
-                  statementForMetavariableSubstitution = StatementForMetavariableSubstitution.fromJSONAndFileContext(json, fileContext),
-                  substitution = statementForMetavariableSubstitution;  ///
-
-            return substitution;
-          }),
-          savedArray = null,
-          substitutions = new Substitutions(array, savedArray);
-
-    return substitutions;
-  }
 }

package/src/supposition.js

@@ -5,7 +5,6 @@ import metaLevelUnifier from "./unifier/metaLevel";
 import { match } from "./utilities/array";
 import { nodeAsString } from "./utilities/string";
 import { nodeQuery, nodesQuery } from "./utilities/query";
-import { statementNodeFromStatementString } from "./utilities/node";
 
 const subproofAssertionNodeQuery = nodeQuery("/statement/subproofAssertion!"),
       subproofAssertionStatementNodesQuery = nodesQuery("/subproofAssertion/statement"),
@@ -66,30 +65,9 @@ export default class Supposition {
     return subproofUnified;
   }
 
-  toJSON(tokens) {
-    const statementString = nodeAsString(this.statementNode, tokens),
-          statement = statementString, ///
-          json = {
-            statement
-          };
-
-    return json;
-  }
-
   static fromStatementNode(statementNode) {
     const supposition = new Supposition(statementNode);
 
     return supposition;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    const { statement } = json,
-          statementString = statement,  ///
-          lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          statementNode = statementNodeFromStatementString(statementString, lexer, parser),
-          supposition = new Supposition(statementNode);
-
-    return supposition;
-  }
 }

package/src/theorem.js

@@ -3,7 +3,5 @@
 import TopLevelAssertion from "./topLevelAssertion";
 
 export default class Theorem extends TopLevelAssertion {
-  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(Theorem, json, fileContext); }
-
   static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return TopLevelAssertion.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Theorem, labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/topLevelAssertion.js

@@ -1,8 +1,5 @@
 "use strict";
 
-import Label from "./label";
-import Consequent from "./consequent";
-import Supposition from "./supposition";
 import Substitutions from "./substitutions";
 import unifyConsequentAgainstStatement from "./unify/consequentAgainstStatement";
 import unifySuppositionsAgainstProofSteps from "./unify/suppositionsAgainstProofSteps";
@@ -69,70 +66,5 @@ export default class TopLevelAssertion {
     return matchesMetavariableNode;
   }
 
-  toJSON(tokens) {
-    const labelsJSON = this.labels.map((label) => {
-            const labelJSON = label.toJSON(tokens);
-
-            return labelJSON;
-          }),
-          suppositionsJSON = this.suppositions.map((supposition) => {
-            const suppositionJSON = supposition.toJSON(tokens);
-
-            return suppositionJSON;
-          }),
-          consequentJSON = this.consequent.toJSON(tokens),
-          substitutionsJSON = this.substitutions.toJSON(tokens),
-          labels = labelsJSON,  ///
-          suppositions = suppositionsJSON,  ///
-          consequent = consequentJSON,  ///
-          substitutions = substitutionsJSON,  ///
-          json = {
-            labels,
-            suppositions,
-            consequent,
-            substitutions
-          };
-
-    return json;
-  }
-
-  static fromJSONAndFileContext(Class, json, fileContext) {
-    let { labels } = json;
-
-    const labelsJSON = labels;  ///
-
-    labels = labelsJSON.map((labelJSON) => {
-      const json = labelJSON, ///
-            label = Label.fromJSONAndFileContext(json, fileContext);
-
-      return label;
-    });
-
-    let { suppositions, consequent, substitutions } = json;
-
-    const suppositionsJSON = suppositions;  ///
-
-    suppositions = suppositionsJSON.map((suppositionJSON) => {
-      const json = suppositionJSON, ///
-            supposition = Supposition.fromJSONAndFileContext(json, fileContext);
-
-      return supposition;
-    });
-
-    const consequentJSON = consequent;  ///
-
-    json = consequentJSON;  ///
-
-    consequent = Consequent.fromJSONAndFileContext(json, fileContext);
-
-    const substitutionsJSON = substitutions;  ///
-
-    json = substitutionsJSON; ///
-
-    substitutions = Substitutions.fromJSONAndFileContext(json, fileContext);
-
-    return new Class(labels, suppositions, consequent, substitutions, fileContext);  ///
-  }
-
   static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Class, labels, suppositions, consequent, substitutions, fileContext) { return new Class(labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/type.js

@@ -125,18 +125,6 @@ export default class Type {
     return string;
   }
 
-  toJSON(tokens) {
-    const superTypeJSON = this.superType.toJSON(tokens),
-          name = this.name,
-          superType = superTypeJSON,  ///
-          json = {
-            name,
-            superType
-          };
-
-    return json;
-  }
-
   static fromTypeName(typeName) {
     const name = typeName,  ///
           superType = objectType, ///
@@ -154,17 +142,6 @@ export default class Type {
 }
 
 class ObjectType extends Type {
-  toJSON(tokens) {
-    const name = this.name,
-          superType = null,  ///
-          json = {
-            name,
-            superType
-          };
-
-    return json;
-  }
-
   static fromNothing() {
     const name = OBJECT_TYPE_NAME,
           superType = null,
@@ -175,24 +152,3 @@ class ObjectType extends Type {
 }
 
 export const objectType = ObjectType.fromNothing();
-
-export function typeFromJSONAndFileContext(json, fileContext) {
-  let type;
-
-  const { name } = json,
-        typeName = name;  ///
-
-  type = fileContext.findTypeByTypeName(typeName);
-
-  if (type === null) {
-    let { superType } = json;
-
-    const superJSON = superType;  ///
-
-    superType = typeFromJSONAndFileContext(superJSON, fileContext);
-
-    type = new Type(name, superType);
-  }
-
-  return type;
-}