occam-verify-cli 1.0.850 → 1.0.851

package/lib/element/substitution/term.js

@@ -143,18 +143,6 @@ const _default = (0, _elements.define)(class TermSubstitution extends _substitut
         return replacementTermValidates;
     }
     static name = "TermSubstitution";
-    toJSON() {
-        const contexts = this.getContexts();
-        return (0, _context.serialise)((...contexts)=>{
-            const { name } = this.constructor, string = this.getString(), lineIndex = this.getLineIndex(), json = {
-                name,
-                contexts,
-                string,
-                lineIndex
-            };
-            return json;
-        }, ...contexts);
-    }
     static fromJSON(json, context) {
         let termSubstitutionn = null;
         const { name } = json;
@@ -200,4 +188,4 @@ function replacementTermFromTermSubstitutionNode(termSubstitutionNode, context)
     return replacementTerm;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/element/substitution/term.js"],"sourcesContent":["\"use strict\";\n\nimport Substitution from \"../substitution\";\n\nimport { define } from \"../../elements\";\nimport { stripBracketsFromTerm } from \"../../utilities/brackets\";\nimport { instantiateTermSubstitution } from \"../../process/instantiate\";\nimport { termSubstitutionFromTermSubstitutionNode } from \"../../utilities/element\";\nimport { termSubstitutionStringFromTermAndVariable } from \"../../utilities/string\";\nimport { join, ablate, descend, attempt, serialise, unserialise, instantiate } from \"../../utilities/context\";\n\nexport default define(class TermSubstitution extends Substitution {\n  constructor(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm) {\n    super(context, string, node, lineIndex, generalContext);\n\n    this.targetTerm = targetTerm;\n    this.replacementTerm = replacementTerm;\n  }\n\n  getTargetTerm() {\n    return this.targetTerm;\n  }\n\n  getReplacementTerm() {\n    return this.replacementTerm;\n  }\n\n  getTermSubstitutionNode() {\n    const node = this.getNode(),\n          termSubstitutionNode = node;  ///\n\n    return termSubstitutionNode;\n  }\n\n  getTargetNode() {\n    const targetTermNode = this.targetTerm.getNode(),\n          tergetNode = targetTermNode; ///\n\n    return tergetNode;\n  }\n\n  getReplacementNode() {\n    const replacementTermNode = this.replacementTerm.getNode(),\n          replacementNode = replacementTermNode; ///\n\n    return replacementNode;\n  }\n\n  getVariableNode() { return this.targetTerm.getVariableNode(); }\n\n  isTrivial() {\n    const targetTermComparesToReplacementTerm = this.targetTerm.compareTerm(this.replacementTerm),\n          trivial = targetTermComparesToReplacementTerm; ///\n\n    return trivial;\n  }\n\n  matchVariableNode(variableNode) { return this.targetTerm.matchVariableNode(variableNode); }\n\n  compareTerm(term, context) {\n    term = stripBracketsFromTerm(term, context); ///\n\n    const replacementTermComparesToTerm = this.replacementTerm.compareTerm(term),\n          comparedToTerm = replacementTermComparesToTerm; ///\n\n    return comparedToTerm;\n  }\n\n  compareParameter(parameter) {\n    const targetTermComparesToParameter = this.targetTerm.compareParameter(parameter),\n          comparesToParameter = targetTermComparesToParameter;  ///\n\n    return comparesToParameter;\n  }\n\n  validate(generalContext, specificContext) {\n    let termSubstitution = null;\n\n    const context = specificContext,  ///\n          termSubstitutionString = this.getString();  ///\n\n    context.trace(`Validating the '${termSubstitutionString}' term substitution...`);\n\n    let validates = false;\n\n    const validSubstitution = this.findValidSubstitution(context);\n\n    if (validSubstitution) {\n      termSubstitution = validSubstitution; ///\n\n      context.debug(`...the '${termSubstitutionString}' term substitution is already valid.`);\n    } else {\n      const context = this.getContext();\n\n      join((generalContext) => {\n        join((specificContext) => {\n          attempt((generalContext, specificContext) => {\n            const targetTermValidates = this.validateTargetTerm(generalContext, specificContext);\n\n            if (targetTermValidates) {\n              const replacementTermValidates = this.validateReplacementTerm(generalContext, specificContext);\n\n              if (replacementTermValidates) {\n                validates = true;\n              }\n            }\n\n            if (validates) {\n              this.setContexts(generalContext, specificContext);\n            }\n          }, generalContext, specificContext);\n        }, specificContext, context);\n      }, generalContext, context);\n    }\n\n    if (validates) {\n      const substitution = this;  ///\n\n      termSubstitution = substitution;  ///\n\n      context.addSubstitution(substitution);\n\n      context.debug(`...validated the '${termSubstitutionString}' term substitution.`);\n    }\n\n    return termSubstitution;\n  }\n\n  validateTargetTerm(generalContext, specificContext) {\n    let targetTermValidates = false;\n\n    const context = generalContext, ///\n          targetTermString = this.targetTerm.getString(),\n          termSubstitutionString = this.getString();  ///\n\n    context.trace(`Validating the '${termSubstitutionString}' term substitution's '${targetTermString}' target term...`);\n\n    const targetTermSingular = this.targetTerm.isSingular();\n\n    if (targetTermSingular) {\n      descend((context) => {\n        const targetTerm = this.targetTerm.validate(context, (targetTerm) => {\n          const validatesForwards = true;\n\n          return validatesForwards;\n        });\n\n        if (targetTerm !== null) {\n          this.targetTerm = targetTerm;\n\n          targetTermValidates = true;\n        }\n      }, context);\n    } else {\n      context.debug(`The '${termSubstitutionString}' term substitution's '${targetTermString}' target term is not singular.`);\n    }\n\n    if (targetTermValidates) {\n      context.debug(`...validated the '${termSubstitutionString}' term substitution's '${targetTermString}' target term...`);\n    }\n\n    return targetTermValidates;\n  }\n\n  validateReplacementTerm(generalContext, specificContext) {\n    let replacementTermValidates = false;\n\n    const context = specificContext,  ///\n          replacementTermString = this.replacementTerm.getString(),\n          termSubstitutionString = this.getString();  ///\n\n    context.trace(`Validating the '${termSubstitutionString}' term substitution's '${replacementTermString}' replacement term...`);\n\n    descend((context) => {\n      const replacementTerm = this.replacementTerm.validate(context, (replacementTerm) => {\n        const validatesForwards = true;\n\n        return validatesForwards;\n      });\n\n      if (replacementTerm !== null) {\n        this.replacementTerm = replacementTerm;\n\n        replacementTermValidates = true;\n      }\n    }, context);\n\n    if (replacementTermValidates) {\n      context.debug(`...validated the '${termSubstitutionString}' term substitution's '${replacementTermString}' replacement term...`);\n    }\n\n    return replacementTermValidates;\n  }\n\n  static name = \"TermSubstitution\";\n\n  toJSON() {\n    const contexts = this.getContexts();\n\n    return serialise((...contexts) => {\n      const { name } = this.constructor,\n            string = this.getString(),\n            lineIndex = this.getLineIndex(),\n            json = {\n              name,\n              contexts,\n              string,\n              lineIndex\n            };\n\n      return json;\n    }, ...contexts);\n  }\n\n  static fromJSON(json, context) {\n    let termSubstitutionn = null;\n\n    const { name } = json;\n\n    if (this.name === name) {\n      unserialise((json, generalContext, specificContext) => {\n        const context = specificContext;  ///\n\n        instantiate((context) => {\n          const { string, lineIndex } = json,\n                termSubstitutionNode = instantiateTermSubstitution(string, context),\n                node = termSubstitutionNode,  ///\n                targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),\n                replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);\n\n          termSubstitutionn = new TermSubstitution(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm);\n        }, context);\n      }, json, context);\n    }\n\n    return termSubstitutionn;\n  }\n\n  static fromStatement(statement, context) {\n    let termSubstitution = null;\n\n    const termSubstitutionNode = statement.getTermSubstitutionNode();\n\n    if (termSubstitutionNode !== null) {\n      ablate((context) => {\n        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);\n      }, context);\n    }\n\n    return termSubstitution;\n  }\n\n  static fromTermAndVariable(term, variable, context) {\n    term = stripBracketsFromTerm(term, context); ///\n\n    let termSubstitution;\n\n    ablate((context) => {\n      instantiate((context) => {\n        const termSubstitutionString = termSubstitutionStringFromTermAndVariable(term, variable),\n              string = termSubstitutionString,  ///\n              termSubstitutionNode = instantiateTermSubstitution(string, context);\n\n        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);\n      }, context);\n    }, context);\n\n    return termSubstitution;\n  }\n});\n\nfunction targetTermFromTermSubstitutionNode(termSubstitutionNode, context) {\n  const targetTermNode = termSubstitutionNode.getTargetTermNode(),\n        targetTerm = context.findTermByTermNode(targetTermNode);\n\n  return targetTerm;\n}\n\nfunction replacementTermFromTermSubstitutionNode(termSubstitutionNode, context) {\n  const replacementTermNode = termSubstitutionNode.getReplacementTermNode(),\n        replacementTerm = context.findTermByTermNode(replacementTermNode);\n\n  return replacementTerm;\n}\n"],"names":["define","TermSubstitution","Substitution","context","string","node","lineIndex","generalContext","targetTerm","replacementTerm","getTargetTerm","getReplacementTerm","getTermSubstitutionNode","getNode","termSubstitutionNode","getTargetNode","targetTermNode","tergetNode","getReplacementNode","replacementTermNode","replacementNode","getVariableNode","isTrivial","targetTermComparesToReplacementTerm","compareTerm","trivial","matchVariableNode","variableNode","term","stripBracketsFromTerm","replacementTermComparesToTerm","comparedToTerm","compareParameter","parameter","targetTermComparesToParameter","comparesToParameter","validate","specificContext","termSubstitution","termSubstitutionString","getString","trace","validates","validSubstitution","findValidSubstitution","debug","getContext","join","attempt","targetTermValidates","validateTargetTerm","replacementTermValidates","validateReplacementTerm","setContexts","substitution","addSubstitution","targetTermString","targetTermSingular","isSingular","descend","validatesForwards","replacementTermString","name","toJSON","contexts","getContexts","serialise","getLineIndex","json","fromJSON","termSubstitutionn","unserialise","instantiate","instantiateTermSubstitution","targetTermFromTermSubstitutionNode","replacementTermFromTermSubstitutionNode","fromStatement","statement","ablate","termSubstitutionFromTermSubstitutionNode","fromTermAndVariable","variable","termSubstitutionStringFromTermAndVariable","getTargetTermNode","findTermByTermNode","getReplacementTermNode"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/element/substitution/term.js"],"sourcesContent":["\"use strict\";\n\nimport Substitution from \"../substitution\";\n\nimport { define } from \"../../elements\";\nimport { stripBracketsFromTerm } from \"../../utilities/brackets\";\nimport { instantiateTermSubstitution } from \"../../process/instantiate\";\nimport { termSubstitutionFromTermSubstitutionNode } from \"../../utilities/element\";\nimport { termSubstitutionStringFromTermAndVariable } from \"../../utilities/string\";\nimport { join, ablate, descend, attempt, unserialise, instantiate } from \"../../utilities/context\";\n\nexport default define(class TermSubstitution extends Substitution {\n  constructor(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm) {\n    super(context, string, node, lineIndex, generalContext);\n\n    this.targetTerm = targetTerm;\n    this.replacementTerm = replacementTerm;\n  }\n\n  getTargetTerm() {\n    return this.targetTerm;\n  }\n\n  getReplacementTerm() {\n    return this.replacementTerm;\n  }\n\n  getTermSubstitutionNode() {\n    const node = this.getNode(),\n          termSubstitutionNode = node;  ///\n\n    return termSubstitutionNode;\n  }\n\n  getTargetNode() {\n    const targetTermNode = this.targetTerm.getNode(),\n          tergetNode = targetTermNode; ///\n\n    return tergetNode;\n  }\n\n  getReplacementNode() {\n    const replacementTermNode = this.replacementTerm.getNode(),\n          replacementNode = replacementTermNode; ///\n\n    return replacementNode;\n  }\n\n  getVariableNode() { return this.targetTerm.getVariableNode(); }\n\n  isTrivial() {\n    const targetTermComparesToReplacementTerm = this.targetTerm.compareTerm(this.replacementTerm),\n          trivial = targetTermComparesToReplacementTerm; ///\n\n    return trivial;\n  }\n\n  matchVariableNode(variableNode) { return this.targetTerm.matchVariableNode(variableNode); }\n\n  compareTerm(term, context) {\n    term = stripBracketsFromTerm(term, context); ///\n\n    const replacementTermComparesToTerm = this.replacementTerm.compareTerm(term),\n          comparedToTerm = replacementTermComparesToTerm; ///\n\n    return comparedToTerm;\n  }\n\n  compareParameter(parameter) {\n    const targetTermComparesToParameter = this.targetTerm.compareParameter(parameter),\n          comparesToParameter = targetTermComparesToParameter;  ///\n\n    return comparesToParameter;\n  }\n\n  validate(generalContext, specificContext) {\n    let termSubstitution = null;\n\n    const context = specificContext,  ///\n          termSubstitutionString = this.getString();  ///\n\n    context.trace(`Validating the '${termSubstitutionString}' term substitution...`);\n\n    let validates = false;\n\n    const validSubstitution = this.findValidSubstitution(context);\n\n    if (validSubstitution) {\n      termSubstitution = validSubstitution; ///\n\n      context.debug(`...the '${termSubstitutionString}' term substitution is already valid.`);\n    } else {\n      const context = this.getContext();\n\n      join((generalContext) => {\n        join((specificContext) => {\n          attempt((generalContext, specificContext) => {\n            const targetTermValidates = this.validateTargetTerm(generalContext, specificContext);\n\n            if (targetTermValidates) {\n              const replacementTermValidates = this.validateReplacementTerm(generalContext, specificContext);\n\n              if (replacementTermValidates) {\n                validates = true;\n              }\n            }\n\n            if (validates) {\n              this.setContexts(generalContext, specificContext);\n            }\n          }, generalContext, specificContext);\n        }, specificContext, context);\n      }, generalContext, context);\n    }\n\n    if (validates) {\n      const substitution = this;  ///\n\n      termSubstitution = substitution;  ///\n\n      context.addSubstitution(substitution);\n\n      context.debug(`...validated the '${termSubstitutionString}' term substitution.`);\n    }\n\n    return termSubstitution;\n  }\n\n  validateTargetTerm(generalContext, specificContext) {\n    let targetTermValidates = false;\n\n    const context = generalContext, ///\n          targetTermString = this.targetTerm.getString(),\n          termSubstitutionString = this.getString();  ///\n\n    context.trace(`Validating the '${termSubstitutionString}' term substitution's '${targetTermString}' target term...`);\n\n    const targetTermSingular = this.targetTerm.isSingular();\n\n    if (targetTermSingular) {\n      descend((context) => {\n        const targetTerm = this.targetTerm.validate(context, (targetTerm) => {\n          const validatesForwards = true;\n\n          return validatesForwards;\n        });\n\n        if (targetTerm !== null) {\n          this.targetTerm = targetTerm;\n\n          targetTermValidates = true;\n        }\n      }, context);\n    } else {\n      context.debug(`The '${termSubstitutionString}' term substitution's '${targetTermString}' target term is not singular.`);\n    }\n\n    if (targetTermValidates) {\n      context.debug(`...validated the '${termSubstitutionString}' term substitution's '${targetTermString}' target term...`);\n    }\n\n    return targetTermValidates;\n  }\n\n  validateReplacementTerm(generalContext, specificContext) {\n    let replacementTermValidates = false;\n\n    const context = specificContext,  ///\n          replacementTermString = this.replacementTerm.getString(),\n          termSubstitutionString = this.getString();  ///\n\n    context.trace(`Validating the '${termSubstitutionString}' term substitution's '${replacementTermString}' replacement term...`);\n\n    descend((context) => {\n      const replacementTerm = this.replacementTerm.validate(context, (replacementTerm) => {\n        const validatesForwards = true;\n\n        return validatesForwards;\n      });\n\n      if (replacementTerm !== null) {\n        this.replacementTerm = replacementTerm;\n\n        replacementTermValidates = true;\n      }\n    }, context);\n\n    if (replacementTermValidates) {\n      context.debug(`...validated the '${termSubstitutionString}' term substitution's '${replacementTermString}' replacement term...`);\n    }\n\n    return replacementTermValidates;\n  }\n\n  static name = \"TermSubstitution\";\n\n  static fromJSON(json, context) {\n    let termSubstitutionn = null;\n\n    const { name } = json;\n\n    if (this.name === name) {\n      unserialise((json, generalContext, specificContext) => {\n        const context = specificContext;  ///\n\n        instantiate((context) => {\n          const { string, lineIndex } = json,\n                termSubstitutionNode = instantiateTermSubstitution(string, context),\n                node = termSubstitutionNode,  ///\n                targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),\n                replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);\n\n          termSubstitutionn = new TermSubstitution(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm);\n        }, context);\n      }, json, context);\n    }\n\n    return termSubstitutionn;\n  }\n\n  static fromStatement(statement, context) {\n    let termSubstitution = null;\n\n    const termSubstitutionNode = statement.getTermSubstitutionNode();\n\n    if (termSubstitutionNode !== null) {\n      ablate((context) => {\n        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);\n      }, context);\n    }\n\n    return termSubstitution;\n  }\n\n  static fromTermAndVariable(term, variable, context) {\n    term = stripBracketsFromTerm(term, context); ///\n\n    let termSubstitution;\n\n    ablate((context) => {\n      instantiate((context) => {\n        const termSubstitutionString = termSubstitutionStringFromTermAndVariable(term, variable),\n              string = termSubstitutionString,  ///\n              termSubstitutionNode = instantiateTermSubstitution(string, context);\n\n        termSubstitution = termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, context);\n      }, context);\n    }, context);\n\n    return termSubstitution;\n  }\n});\n\nfunction targetTermFromTermSubstitutionNode(termSubstitutionNode, context) {\n  const targetTermNode = termSubstitutionNode.getTargetTermNode(),\n        targetTerm = context.findTermByTermNode(targetTermNode);\n\n  return targetTerm;\n}\n\nfunction replacementTermFromTermSubstitutionNode(termSubstitutionNode, context) {\n  const replacementTermNode = termSubstitutionNode.getReplacementTermNode(),\n        replacementTerm = context.findTermByTermNode(replacementTermNode);\n\n  return replacementTerm;\n}\n"],"names":["define","TermSubstitution","Substitution","context","string","node","lineIndex","generalContext","targetTerm","replacementTerm","getTargetTerm","getReplacementTerm","getTermSubstitutionNode","getNode","termSubstitutionNode","getTargetNode","targetTermNode","tergetNode","getReplacementNode","replacementTermNode","replacementNode","getVariableNode","isTrivial","targetTermComparesToReplacementTerm","compareTerm","trivial","matchVariableNode","variableNode","term","stripBracketsFromTerm","replacementTermComparesToTerm","comparedToTerm","compareParameter","parameter","targetTermComparesToParameter","comparesToParameter","validate","specificContext","termSubstitution","termSubstitutionString","getString","trace","validates","validSubstitution","findValidSubstitution","debug","getContext","join","attempt","targetTermValidates","validateTargetTerm","replacementTermValidates","validateReplacementTerm","setContexts","substitution","addSubstitution","targetTermString","targetTermSingular","isSingular","descend","validatesForwards","replacementTermString","name","fromJSON","json","termSubstitutionn","unserialise","instantiate","instantiateTermSubstitution","targetTermFromTermSubstitutionNode","replacementTermFromTermSubstitutionNode","fromStatement","statement","ablate","termSubstitutionFromTermSubstitutionNode","fromTermAndVariable","variable","termSubstitutionStringFromTermAndVariable","getTargetTermNode","findTermByTermNode","getReplacementTermNode"],"mappings":"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"}

package/lib/element/substitution.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "default", {
     }
 });
 const _occamlanguages = require("occam-languages");
-const _occamfurtle = require("occam-furtle");
 const _context = require("../utilities/context");
+const _occamfurtle = require("occam-furtle");
 const { primitiveFromNode } = _occamfurtle.primitiveUtilities;
 class Substitution extends _occamlanguages.Element {
     constructor(context, string, node, lineIndex, generalContext){
@@ -32,6 +32,10 @@ class Substitution extends _occamlanguages.Element {
         const context = this.getContext(), specificContext = context; ///
         return specificContext;
     }
+    getName() {
+        const { name } = this.constructor;
+        return name;
+    }
     getContexts() {
         const generalContext = this.getGeneralContext(), specificContext = this.getSpecificContext(), contexts = [
             generalContext,
@@ -108,17 +112,17 @@ class Substitution extends _occamlanguages.Element {
         return resolved;
     }
     toJSON() {
-        const context = this.getContext();
-        return (0, _context.serialise)((context)=>{
-            const { name } = this.constructor, string = this.getString(), lineIndex = this.getLineIndex(), json = {
+        const contexts = this.getContexts();
+        return (0, _context.serialise)((...contexts)=>{
+            const name = this.getName(), string = this.getString(), lineIndex = this.getLineIndex(), json = {
                 name,
-                context,
+                contexts,
                 string,
                 lineIndex
             };
             return json;
-        }, context);
+        }, ...contexts);
     }
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/substitution.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\nimport { primitiveUtilities } from \"occam-furtle\";\nimport {serialise} from \"../utilities/context\";\n\nconst { primitiveFromNode } =primitiveUtilities;\n\nexport default class Substitution extends Element {\n  constructor(context, string, node, lineIndex, generalContext) {\n    super(context, string, node, lineIndex);\n\n    this.generalContext = generalContext;\n  }\n\n  getGeneralContext() {\n    return this.generalContext;\n  }\n\n  getPrimitive(context) {\n    const replacementNode = this.getReplacementNode(),\n          node = replacementNode, ///\n          primitive = primitiveFromNode(node, context);\n\n    return primitive;\n  }\n\n  getSubstitutionNode() {\n    const node = this.getNode(),\n          substitutionNode = node; ///\n\n    return substitutionNode;\n  }\n\n  getSpecificContext() {\n    const context = this.getContext(),\n          specificContext = context;  ///\n\n    return specificContext;\n  }\n\n  getContexts() {\n    const generalContext = this.getGeneralContext(),\n          specificContext = this.getSpecificContext(),\n          contexts = [\n            generalContext,\n            specificContext\n          ];\n\n    return contexts;\n  }\n\n  setGeneralContext(generalContext) {\n    this.generalContext = generalContext;\n  }\n\n  setSpecificContext(specifiContext) {\n    const context = specifiContext; ///\n\n    this.setContext(context);\n  }\n\n  setContexts(...contexts) {\n    const [ generalContext, specificContext ] = contexts;\n\n    this.setGeneralContext(generalContext);\n    this.setSpecificContext(specificContext);\n  }\n\n  isEqualTo(substitution) {\n    const substitutionNode = substitution.getNode(),\n          substitutionNodeMatches = this.matchSubstitutionNode(substitutionNode),\n          equalTo = substitutionNodeMatches;  ///\n\n    return equalTo;\n  }\n\n  isComplex() {\n    const simple = this.isSimple(),\n          complex = !simple;\n\n    return complex;\n  }\n\n  isNonTrivial() {\n    const trivial = this.isTrivial(),\n          nonTrivlal = !trivial;\n\n    return nonTrivlal;\n  }\n\n  getVariable() {\n    const variable = null;\n\n    return variable;\n  }\n\n  getMetavariable() {\n    const metavariable = null;\n\n    return metavariable;\n  }\n\n  getSubstitution() {\n    const substitution = null;\n\n    return substitution;\n  }\n\n  getVariableNode() {\n    const variableNode = null;\n\n    return variableNode;\n  }\n\n  getMetavariableNode() {\n    const metavariableNode = null;\n\n    return metavariableNode;\n  }\n\n  isSimple() {\n    const simple = true;\n\n    return simple;\n  }\n\n  matchVariableNode(variableNode) {\n    const variableNodeMatches = false;\n\n    return variableNodeMatches;\n  }\n\n  matchMetavariableNode(metavariableNode) {\n    const metavariableNodeMatches = false;\n\n    return metavariableNodeMatches;\n  }\n\n  matchSubstitutionNode(substitutionNode) {\n    const node = substitutionNode, ///\n          nodeMatches = this.matchNode(node),\n          substitutionNodeMatches = nodeMatches; ///\n\n    return substitutionNodeMatches;\n  }\n\n  findValidSubstitution(context) {\n    const substitutionNode = this.getSubstitutionNode(),\n          substitution = context.findSubstitutionBySubstitutionNode(substitutionNode),\n          validSubstitution = substitution;  ///\n\n    return validSubstitution;\n  }\n\n  resolve(substitutions, generalContext, specificContext) {\n    const resolved = true;\n\n    return resolved;\n  }\n\n  toJSON() {\n    const context = this.getContext();\n\n    return serialise((context) => {\n      const { name } = this.constructor,\n            string = this.getString(),\n            lineIndex = this.getLineIndex(),\n            json = {\n              name,\n              context,\n              string,\n              lineIndex\n            };\n\n      return json;\n    }, context);\n  }\n}\n"],"names":["Substitution","primitiveFromNode","primitiveUtilities","Element","context","string","node","lineIndex","generalContext","getGeneralContext","getPrimitive","replacementNode","getReplacementNode","primitive","getSubstitutionNode","getNode","substitutionNode","getSpecificContext","getContext","specificContext","getContexts","contexts","setGeneralContext","setSpecificContext","specifiContext","setContext","setContexts","isEqualTo","substitution","substitutionNodeMatches","matchSubstitutionNode","equalTo","isComplex","simple","isSimple","complex","isNonTrivial","trivial","isTrivial","nonTrivlal","getVariable","variable","getMetavariable","metavariable","getSubstitution","getVariableNode","variableNode","getMetavariableNode","metavariableNode","matchVariableNode","variableNodeMatches","matchMetavariableNode","metavariableNodeMatches","nodeMatches","matchNode","findValidSubstitution","findSubstitutionBySubstitutionNode","validSubstitution","resolve","substitutions","resolved","toJSON","serialise","name","getString","getLineIndex","json"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/substitution.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\nimport { serialise } from \"../utilities/context\";\nimport { primitiveUtilities } from \"occam-furtle\";\n\nconst { primitiveFromNode } =primitiveUtilities;\n\nexport default class Substitution extends Element {\n  constructor(context, string, node, lineIndex, generalContext) {\n    super(context, string, node, lineIndex);\n\n    this.generalContext = generalContext;\n  }\n\n  getGeneralContext() {\n    return this.generalContext;\n  }\n\n  getPrimitive(context) {\n    const replacementNode = this.getReplacementNode(),\n          node = replacementNode, ///\n          primitive = primitiveFromNode(node, context);\n\n    return primitive;\n  }\n\n  getSubstitutionNode() {\n    const node = this.getNode(),\n          substitutionNode = node; ///\n\n    return substitutionNode;\n  }\n\n  getSpecificContext() {\n    const context = this.getContext(),\n          specificContext = context;  ///\n\n    return specificContext;\n  }\n\n  getName() {\n    const { name } = this.constructor;\n\n    return name;\n  }\n\n  getContexts() {\n    const generalContext = this.getGeneralContext(),\n          specificContext = this.getSpecificContext(),\n          contexts = [\n            generalContext,\n            specificContext\n          ];\n\n    return contexts;\n  }\n\n  setGeneralContext(generalContext) {\n    this.generalContext = generalContext;\n  }\n\n  setSpecificContext(specifiContext) {\n    const context = specifiContext; ///\n\n    this.setContext(context);\n  }\n\n  setContexts(...contexts) {\n    const [ generalContext, specificContext ] = contexts;\n\n    this.setGeneralContext(generalContext);\n    this.setSpecificContext(specificContext);\n  }\n\n  isEqualTo(substitution) {\n    const substitutionNode = substitution.getNode(),\n          substitutionNodeMatches = this.matchSubstitutionNode(substitutionNode),\n          equalTo = substitutionNodeMatches;  ///\n\n    return equalTo;\n  }\n\n  isComplex() {\n    const simple = this.isSimple(),\n          complex = !simple;\n\n    return complex;\n  }\n\n  isNonTrivial() {\n    const trivial = this.isTrivial(),\n          nonTrivlal = !trivial;\n\n    return nonTrivlal;\n  }\n\n  getVariable() {\n    const variable = null;\n\n    return variable;\n  }\n\n  getMetavariable() {\n    const metavariable = null;\n\n    return metavariable;\n  }\n\n  getSubstitution() {\n    const substitution = null;\n\n    return substitution;\n  }\n\n  getVariableNode() {\n    const variableNode = null;\n\n    return variableNode;\n  }\n\n  getMetavariableNode() {\n    const metavariableNode = null;\n\n    return metavariableNode;\n  }\n\n  isSimple() {\n    const simple = true;\n\n    return simple;\n  }\n\n  matchVariableNode(variableNode) {\n    const variableNodeMatches = false;\n\n    return variableNodeMatches;\n  }\n\n  matchMetavariableNode(metavariableNode) {\n    const metavariableNodeMatches = false;\n\n    return metavariableNodeMatches;\n  }\n\n  matchSubstitutionNode(substitutionNode) {\n    const node = substitutionNode, ///\n          nodeMatches = this.matchNode(node),\n          substitutionNodeMatches = nodeMatches; ///\n\n    return substitutionNodeMatches;\n  }\n\n  findValidSubstitution(context) {\n    const substitutionNode = this.getSubstitutionNode(),\n          substitution = context.findSubstitutionBySubstitutionNode(substitutionNode),\n          validSubstitution = substitution;  ///\n\n    return validSubstitution;\n  }\n\n  resolve(substitutions, generalContext, specificContext) {\n    const resolved = true;\n\n    return resolved;\n  }\n\n  toJSON() {\n    const contexts = this.getContexts();\n\n    return serialise((...contexts) => {\n      const name = this.getName(),\n            string = this.getString(),\n            lineIndex = this.getLineIndex(),\n            json = {\n              name,\n              contexts,\n              string,\n              lineIndex\n            };\n\n      return json;\n    }, ...contexts);\n  }\n}\n"],"names":["Substitution","primitiveFromNode","primitiveUtilities","Element","context","string","node","lineIndex","generalContext","getGeneralContext","getPrimitive","replacementNode","getReplacementNode","primitive","getSubstitutionNode","getNode","substitutionNode","getSpecificContext","getContext","specificContext","getName","name","getContexts","contexts","setGeneralContext","setSpecificContext","specifiContext","setContext","setContexts","isEqualTo","substitution","substitutionNodeMatches","matchSubstitutionNode","equalTo","isComplex","simple","isSimple","complex","isNonTrivial","trivial","isTrivial","nonTrivlal","getVariable","variable","getMetavariable","metavariable","getSubstitution","getVariableNode","variableNode","getMetavariableNode","metavariableNode","matchVariableNode","variableNodeMatches","matchMetavariableNode","metavariableNodeMatches","nodeMatches","matchNode","findValidSubstitution","findSubstitutionBySubstitutionNode","validSubstitution","resolve","substitutions","resolved","toJSON","serialise","getString","getLineIndex","json"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.850",
+  "version": "1.0.851",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/element/assertion/contained.js

@@ -245,17 +245,6 @@ export default define(class ContainedAssertion extends Assertion {
 
   static name = "ContainedAssertion";
 
-  toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
-
-    return json;
-  }
-
   static fromJSON(json, context) {
     let containedAssertion = null;
 

package/src/element/assertion/defined.js

@@ -213,17 +213,6 @@ export default define(class DefinedAssertion extends Assertion {
 
   static name = "DefinedAssertion";
 
-  toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
-
-    return json;
-  }
-
   static fromJSON(json, context) {
     let definedAssertion = null;
 

package/src/element/assertion/property.js

@@ -205,17 +205,6 @@ export default define(class PropertyAssertion extends Assertion {
 
   static name = "PropertyAssertion";
 
-  toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
-
-    return json;
-  }
-
   static fromJSON(json, context) {
     let propertyAssertion = null;
 

package/src/element/assertion/satisfies.js

@@ -159,17 +159,6 @@ export default define(class SatisfiesAssertion extends Assertion {
 
   static name = "SatisfiesAssertion";
 
-  toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
-
-    return json;
-  }
-
   static fromJSON(json, context) {
     let satisfiesAssertion = null;
 

package/src/element/assertion/subproof.js

@@ -291,17 +291,6 @@ export default define(class SubproofAssertion extends Assertion {
 
   static name = "SubproofAssertion";
 
-  toJSON() {
-    const string = this.getString(),
-          lineIndex = this.getLineIndex(),
-          json = {
-            string,
-            lineIndex
-          };
-
-    return json;
-  }
-
   static fromJSON(json, context) {
     let subproorAssertion = null;
 

package/src/element/assertion/type.js

@@ -194,10 +194,12 @@ export default define(class TypeAssertion extends Assertion {
 
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
+          name = this.getName(),
           string = this.getString(),
           lineIndex = this.getLineIndex(),
           type = typeJSON,
           json = {
+            name,
             string,
             lineIndex,
             type

package/src/element/assertion.js

@@ -3,6 +3,12 @@
 import { Element } from "occam-languages";
 
 export default class Assertion extends Element {
+  getName() {
+    const { name } = this.constructor;
+
+    return name;
+  }
+
   getAssertionNode() {
     const node = this.getNode(),
           assertionNode = node; ///
@@ -35,7 +41,7 @@ export default class Assertion extends Element {
   }
 
   toJSON() {
-    const { name } = this.constructor,
+    const name = this.getName(),
           string = this.getString(),
           lineIndex = this.getLineIndex(),
           json = {

package/src/element/substitution/frame.js

@@ -6,7 +6,7 @@ import { define } from "../../elements";
 import { instantiateFrameSubstitution } from "../../process/instantiate";
 import { frameSubstitutionFromFrameSubstitutionNode } from "../../utilities/element";
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
-import { join, ablate, descend, attempt, serialise, unserialise, instantiate } from "../../utilities/context";
+import { join, ablate, descend, attempt, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class FrameSubstitution extends Substitution {
   constructor(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame) {
@@ -183,24 +183,6 @@ export default define(class FrameSubstitution extends Substitution {
 
   static name = "FrameSubstitution";
 
-  toJSON() {
-    const contexts = this.getContexts();
-
-    return serialise((...contexts) => {
-      const { name } = this.constructor,
-            string = this.getString(),
-            lineIndex = this.getLineIndex(),
-            json = {
-              name,
-              contexts,
-              string,
-              lineIndex
-            };
-
-      return json;
-    }, ...contexts);
-  }
-
   static fromJSON(json, context) {
     let frameSubstitutionn = null;
 

package/src/element/substitution/reference.js

@@ -6,7 +6,7 @@ import { define } from "../../elements";
 import { instantiateReferenceSubstitution } from "../../process/instantiate";
 import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilities/element";
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
-import { join, ablate, descend, attempt, serialise, unserialise, instantiate } from "../../utilities/context";
+import { join, ablate, descend, attempt, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class ReferenceSubstitution extends Substitution {
   constructor(context, string, node, lineIndex, generalContext, targetReference, replacementReference) {
@@ -190,24 +190,6 @@ export default define(class ReferenceSubstitution extends Substitution {
 
   static name = "ReferenceSubstitution";
 
-  toJSON() {
-    const contexts = this.getContexts();
-
-    return serialise((...contexts) => {
-      const { name } = this.constructor,
-            string = this.getString(),
-            lineIndex = this.getLineIndex(),
-            json = {
-              name,
-              contexts,
-              string,
-              lineIndex
-            };
-
-      return json;
-    }, ...contexts);
-  }
-
   static fromJSON(json, context) {
     let referenceSubstitutionn = null;
 

package/src/element/substitution/statement.js

@@ -7,7 +7,7 @@ import { unifySubstitution } from "../../process/unify";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
 import { instantiateStatementSubstitution } from "../../process/instantiate";
 import { statementSubstitutionFromStatementSubstitutionNode } from "../../utilities/element";
-import { join, ablate, descend, reconcile, attempt, serialise, unserialise, instantiate } from "../../utilities/context";
+import { join, ablate, descend, reconcile, attempt, unserialise, instantiate } from "../../utilities/context";
 import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
 
 export default define(class StatementSubstitution extends Substitution {
@@ -366,24 +366,6 @@ export default define(class StatementSubstitution extends Substitution {
 
   static name = "StatementSubstitution";
 
-  toJSON() {
-    const contexts = this.getContexts();
-
-    return serialise((...contexts) => {
-      const { name } = this.constructor,
-            string = this.getString(),
-            lineIndex = this.getLineIndex(),
-            json = {
-              name,
-              contexts,
-              string,
-              lineIndex
-            };
-
-      return json;
-    }, ...contexts);
-  }
-
   static fromJSON(json, context) {
     let statementSubstitutionn = null;
 
@@ -447,6 +429,19 @@ export default define(class StatementSubstitution extends Substitution {
   }
 });
 
+function resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+  const resolved = true;
+
+  return resolved;
+}
+
+function substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
+  const substitutionNode = statementSubstitutionNode.getSubstitutionNode(),
+        substitution = context.findStatementByStatementNode(substitutionNode);
+
+  return substitution;
+}
+
 function targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context) {
   const targetStatementNode = statementSubstitutionNode.getTargetStatementNode(),
         targetStatement = context.findStatementByStatementNode(targetStatementNode);
@@ -460,16 +455,3 @@ function replacementStatementFromStatementSubstitutionNode(statementSubstitution
 
   return replacementStatement;
 }
-
-function resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context) {
-  const resolved = true;
-
-  return resolved;
-}
-
-function substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context) {
-  const substitutionNode = statementSubstitutionNode.getSubstitutionNode(),
-        substitution = context.findStatementByStatementNode(substitutionNode);
-
-  return substitution;
-}

package/src/element/substitution/term.js

@@ -7,7 +7,7 @@ import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionFromTermSubstitutionNode } from "../../utilities/element";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
-import { join, ablate, descend, attempt, serialise, unserialise, instantiate } from "../../utilities/context";
+import { join, ablate, descend, attempt, unserialise, instantiate } from "../../utilities/context";
 
 export default define(class TermSubstitution extends Substitution {
   constructor(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm) {
@@ -194,24 +194,6 @@ export default define(class TermSubstitution extends Substitution {
 
   static name = "TermSubstitution";
 
-  toJSON() {
-    const contexts = this.getContexts();
-
-    return serialise((...contexts) => {
-      const { name } = this.constructor,
-            string = this.getString(),
-            lineIndex = this.getLineIndex(),
-            json = {
-              name,
-              contexts,
-              string,
-              lineIndex
-            };
-
-      return json;
-    }, ...contexts);
-  }
-
   static fromJSON(json, context) {
     let termSubstitutionn = null;
 

package/src/element/substitution.js

@@ -1,8 +1,8 @@
 "use strict";
 
 import { Element } from "occam-languages";
+import { serialise } from "../utilities/context";
 import { primitiveUtilities } from "occam-furtle";
-import {serialise} from "../utilities/context";
 
 const { primitiveFromNode } =primitiveUtilities;
 
@@ -39,6 +39,12 @@ export default class Substitution extends Element {
     return specificContext;
   }
 
+  getName() {
+    const { name } = this.constructor;
+
+    return name;
+  }
+
   getContexts() {
     const generalContext = this.getGeneralContext(),
           specificContext = this.getSpecificContext(),
@@ -160,20 +166,20 @@ export default class Substitution extends Element {
   }
 
   toJSON() {
-    const context = this.getContext();
+    const contexts = this.getContexts();
 
-    return serialise((context) => {
-      const { name } = this.constructor,
+    return serialise((...contexts) => {
+      const name = this.getName(),
             string = this.getString(),
             lineIndex = this.getLineIndex(),
             json = {
               name,
-              context,
+              contexts,
               string,
               lineIndex
             };
 
       return json;
-    }, context);
+    }, ...contexts);
   }
 }