occam-verify-cli 0.0.1036 → 0.0.1038

package/lib/variable.js

@@ -41,14 +41,21 @@ function _interop_require_default(obj) {
 }
 var typeNodeQuery = (0, _query.nodeQuery)("/variableDeclaration/type"), variableNodeQuery = (0, _query.nodeQuery)("/variableDeclaration/variable"), termVariableNodeQuery = (0, _query.nodeQuery)("/term/variable");
 var Variable = /*#__PURE__*/ function() {
-    function Variable(string, node, name, type) {
+    function Variable(localContext, string, node, name, type) {
         _class_call_check(this, Variable);
+        this.localContext = localContext; ///
         this.string = string;
         this.node = node;
         this.name = name;
         this.type = type;
     }
     _create_class(Variable, [
+        {
+            key: "getLocalContext",
+            value: function getLocalContext() {
+                return this.localContext;
+            }
+        },
         {
             key: "getString",
             value: function getString() {
@@ -197,7 +204,7 @@ var Variable = /*#__PURE__*/ function() {
         {
             key: "fromJSON",
             value: function fromJSON(json, fileContext) {
-                var string = json.string, lexer = fileContext.getLexer(), parser = fileContext.getParser(), variableString = string, variableNode = (0, _node.variableNodeFromVariableString)(variableString, lexer, parser), variableName = (0, _name.variableNameFromVariableNode)(variableNode), node = variableNode, name = variableName, type = typeFromJSON(json, fileContext), variable = new Variable(string, node, name, type);
+                var string = json.string, lexer = fileContext.getLexer(), parser = fileContext.getParser(), variableString = string, variableNode = (0, _node.variableNodeFromVariableString)(variableString, lexer, parser), variableName = (0, _name.variableNameFromVariableNode)(variableNode), localContext = _local.default.fromFileContext(fileContext), node = variableNode, name = variableName, type = typeFromJSON(json, fileContext), variable = new Variable(localContext, string, node, name, type);
                 return variable;
             }
         },
@@ -207,7 +214,7 @@ var Variable = /*#__PURE__*/ function() {
                 var variable = null;
                 if (variableNode !== null) {
                     var node = variableNode, variableName = (0, _name.variableNameFromVariableNode)(variableNode), string = localContext.nodeAsString(node), name = variableName, type = null;
-                    variable = new Variable(string, node, name, type);
+                    variable = new Variable(localContext, string, node, name, type);
                 }
                 return variable;
             }
@@ -215,14 +222,14 @@ var Variable = /*#__PURE__*/ function() {
         {
             key: "fromVariableNodeAndType",
             value: function fromVariableNodeAndType(variableNode, type, localContext) {
-                var node = variableNode, variableName = (0, _name.variableNameFromVariableNode)(variableNode), string = localContext.nodeAsString(node), name = variableName, variable = new Variable(string, node, name, type);
+                var node = variableNode, variableName = (0, _name.variableNameFromVariableNode)(variableNode), string = localContext.nodeAsString(node), name = variableName, variable = new Variable(localContext, string, node, name, type);
                 return variable;
             }
         },
         {
             key: "fromVariableDeclarationNode",
             value: function fromVariableDeclarationNode(variableDeclarationNode, fileContext) {
-                var Type = _shim.default.Type, typeNode = typeNodeQuery(variableDeclarationNode), variableNode = variableNodeQuery(variableDeclarationNode), variableName = (0, _name.variableNameFromVariableNode)(variableNode), localContext = _local.default.fromFileContext(fileContext), variableString = fileContext.nodeAsString(variableNode), string = variableString, node = variableNode, name = variableName, type = Type.fromTypeNode(typeNode, localContext), variable = new Variable(string, node, name, type);
+                var Type = _shim.default.Type, typeNode = typeNodeQuery(variableDeclarationNode), variableNode = variableNodeQuery(variableDeclarationNode), variableName = (0, _name.variableNameFromVariableNode)(variableNode), localContext = _local.default.fromFileContext(fileContext), variableString = fileContext.nodeAsString(variableNode), string = variableString, node = variableNode, name = variableName, type = Type.fromTypeNode(typeNode, localContext), variable = new Variable(localContext, string, node, name, type);
                 return variable;
             }
         }
@@ -245,4 +252,4 @@ function termVariableFromTermNode(termNode, localContext) {
     return termVariable;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/variable.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\nimport TermForVariableSubstitution from \"./substitution/termForVariable\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { objectType } from \"./type\";\nimport { variableNameFromVariableNode} from \"./utilities/name\";\nimport { variableNodeFromVariableString } from \"./utilities/node\";\n\nconst typeNodeQuery = nodeQuery(\"/variableDeclaration/type\"),\n      variableNodeQuery = nodeQuery(\"/variableDeclaration/variable\"),\n      termVariableNodeQuery = nodeQuery(\"/term/variable\");\n\nexport default class Variable {\n  constructor(string, node, name, type) {\n    this.string = string;\n    this.node = node;\n    this.name = name;\n    this.type = type;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  matchNode(node) {\n    const nodeMatches = this.node.match(node);\n\n    return nodeMatches;\n  }\n\n  matchName(name) {\n    const nameMatches = (this.name === name);\n\n    return nameMatches;\n  }\n\n  verify(localContext) {\n    let verified;\n\n    const variableString = this.string; ///\n\n    localContext.trace(`Verifying the '${variableString}' variable...`);\n\n    const variableNode = this.node, ///\n          variableName = variableNameFromVariableNode(variableNode),\n          variable = localContext.findVariableByVariableName(variableName);\n\n    if (variable === null) {\n      localContext.debug(`The '${variableString}' variable is not present.`);\n    } else {\n      const type = variable.getType();\n\n      this.type = type;\n\n      verified = true;\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${variableString}' variable.`);\n    }\n\n    return verified;\n  }\n\n  verifyType(fileContext) {\n    let typeVerified;\n\n    if (this.type === objectType) {\n      typeVerified = true;\n    } else {\n      const typeName = this.type.getName();\n\n      fileContext.trace(`Verifying the '${typeName}' type...`);\n\n      const type = fileContext.findTypeByTypeName(typeName);\n\n      if (type === null) {\n        fileContext.debug(`The '${typeName}' type is missing.`);\n      } else {\n        this.type = type; ///\n\n        typeVerified = true;\n      }\n\n      if (typeVerified) {\n        fileContext.debug(`...verified the '${typeName}' type.`);\n      }\n    }\n\n    return typeVerified;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel;\n\n    const variableString = this.string; ///\n\n    fileContext.trace(`Verifying the '${variableString}' variable at top level...`);\n\n    const variableNode = this.node, ///\n          variableName = variableNameFromVariableNode(variableNode),\n          variablePresent = fileContext.isVariablePresentByVariableName(variableName);\n\n    if (variablePresent) {\n      fileContext.debug(`The '${variableString}' variable is already present.`);\n    } else {\n      const typeVerified = this.verifyType(fileContext);\n\n      verifiedAtTopLevel = typeVerified;  ///\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${variableString}' variable at top level.`);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  unifyTerm(term, substitutions, localContext) {\n    let termUnified = false;\n\n    const termString = term.getString(),\n          variableString = this.string; ///\n\n    localContext.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);\n\n    const termNode = term.getNode(),\n          variableNode = this.node, ///\n          substitution = substitutions.findSubstitutionByVariableNode(variableNode);\n\n    if (substitution !== null) {\n      const termNodeMatches = substitution.matchTermNode(termNode);\n\n      if (termNodeMatches) {\n        termUnified = true;\n      }\n    } else {\n      const variable = this,  ///\n            termVariable = termVariableFromTermNode(termNode, localContext);\n\n      if (termVariable === variable) {\n        termUnified = true;\n      } else {\n        const termForVariableSubstitution = TermForVariableSubstitution.fromTernAndVariable(term, variable, localContext),\n              substitution = termForVariableSubstitution;  ///\n\n        substitutions.addSubstitution(substitution, localContext);\n\n        termUnified = true;\n      }\n    }\n\n    if (termUnified) {\n      localContext.trace(`...unified the '${termString}' term with the '${variableString}' variable.`);\n    }\n\n    return termUnified;\n  }\n\n  toJSON() {\n    const typeJSON = this.type.toJSON(),\n          string = this.string,\n          type = typeJSON,  ///\n          json = {\n            string,\n            type\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          lexer  = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          variableString = string,  ///\n          variableNode = variableNodeFromVariableString(variableString, lexer, parser),\n          variableName = variableNameFromVariableNode(variableNode),\n          node = variableNode,\n          name = variableName,  ///\n          type = typeFromJSON(json, fileContext),\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableNode(variableNode, localContext) {\n    let variable = null;\n\n    if (variableNode !== null) {\n      const node = variableNode,  ///\n            variableName = variableNameFromVariableNode(variableNode),\n            string = localContext.nodeAsString(node),\n            name = variableName,  ///\n            type = null;\n\n      variable = new Variable(string, node, name, type);\n    }\n\n    return variable;\n  }\n\n  static fromVariableNodeAndType(variableNode, type, localContext) {\n    const node = variableNode,  ///\n          variableName = variableNameFromVariableNode(variableNode),\n          string = localContext.nodeAsString(node),\n          name = variableName,  ///\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableDeclarationNode(variableDeclarationNode, fileContext) {\n    const { Type } = shim,\n          typeNode = typeNodeQuery(variableDeclarationNode),\n          variableNode = variableNodeQuery(variableDeclarationNode),\n          variableName = variableNameFromVariableNode(variableNode),\n          localContext = LocalContext.fromFileContext(fileContext),\n          variableString = fileContext.nodeAsString(variableNode),\n          string = variableString,  ///\n          node = variableNode,  ///\n          name = variableName,  ///\n          type = Type.fromTypeNode(typeNode, localContext),\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n}\n\nfunction typeFromJSON(json, fileContext) {\n  let { type } = json;\n\n  const { name } = type,\n        typeName = name;  ///\n\n  type = fileContext.findTypeByTypeName(typeName);\n\n  return type;\n}\n\nfunction termVariableFromTermNode(termNode, localContext) {\n  let termVariable = null;\n\n  const termVariableNode = termVariableNodeQuery(termNode);\n\n  if (termVariableNode !== null) {\n    const termVariableName = variableNameFromVariableNode(termVariableNode);\n\n    termVariable = localContext.findVariableByVariableName(termVariableName);\n  }\n\n  return termVariable;\n}"],"names":["Variable","typeNodeQuery","nodeQuery","variableNodeQuery","termVariableNodeQuery","string","node","name","type","getString","getNode","getName","getType","setType","matchNode","nodeMatches","match","matchName","nameMatches","verify","localContext","verified","variableString","trace","variableNode","variableName","variableNameFromVariableNode","variable","findVariableByVariableName","debug","verifyType","fileContext","typeVerified","objectType","typeName","findTypeByTypeName","verifyAtTopLevel","verifiedAtTopLevel","variablePresent","isVariablePresentByVariableName","unifyTerm","term","substitutions","termUnified","termString","termNode","substitution","findSubstitutionByVariableNode","termNodeMatches","matchTermNode","termVariable","termVariableFromTermNode","termForVariableSubstitution","TermForVariableSubstitution","fromTernAndVariable","addSubstitution","toJSON","typeJSON","json","fromJSON","lexer","getLexer","parser","getParser","variableNodeFromVariableString","typeFromJSON","fromVariableNode","nodeAsString","fromVariableNodeAndType","fromVariableDeclarationNode","variableDeclarationNode","Type","shim","typeNode","LocalContext","fromFileContext","fromTypeNode","termVariableNode","termVariableName"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/variable.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\nimport TermForVariableSubstitution from \"./substitution/termForVariable\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { objectType } from \"./type\";\nimport { variableNameFromVariableNode} from \"./utilities/name\";\nimport { variableNodeFromVariableString } from \"./utilities/node\";\nimport local from \"./context/local\";\n\nconst typeNodeQuery = nodeQuery(\"/variableDeclaration/type\"),\n      variableNodeQuery = nodeQuery(\"/variableDeclaration/variable\"),\n      termVariableNodeQuery = nodeQuery(\"/term/variable\");\n\nexport default class Variable {\n  constructor(localContext, string, node, name, type) {\n    this.localContext = localContext; ///\n    this.string = string;\n    this.node = node;\n    this.name = name;\n    this.type = type;\n  }\n\n  getLocalContext() {\n    return this.localContext;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  matchNode(node) {\n    const nodeMatches = this.node.match(node);\n\n    return nodeMatches;\n  }\n\n  matchName(name) {\n    const nameMatches = (this.name === name);\n\n    return nameMatches;\n  }\n\n  verify(localContext) {\n    let verified;\n\n    const variableString = this.string; ///\n\n    localContext.trace(`Verifying the '${variableString}' variable...`);\n\n    const variableNode = this.node, ///\n          variableName = variableNameFromVariableNode(variableNode),\n          variable = localContext.findVariableByVariableName(variableName);\n\n    if (variable === null) {\n      localContext.debug(`The '${variableString}' variable is not present.`);\n    } else {\n      const type = variable.getType();\n\n      this.type = type;\n\n      verified = true;\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${variableString}' variable.`);\n    }\n\n    return verified;\n  }\n\n  verifyType(fileContext) {\n    let typeVerified;\n\n    if (this.type === objectType) {\n      typeVerified = true;\n    } else {\n      const typeName = this.type.getName();\n\n      fileContext.trace(`Verifying the '${typeName}' type...`);\n\n      const type = fileContext.findTypeByTypeName(typeName);\n\n      if (type === null) {\n        fileContext.debug(`The '${typeName}' type is missing.`);\n      } else {\n        this.type = type; ///\n\n        typeVerified = true;\n      }\n\n      if (typeVerified) {\n        fileContext.debug(`...verified the '${typeName}' type.`);\n      }\n    }\n\n    return typeVerified;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel;\n\n    const variableString = this.string; ///\n\n    fileContext.trace(`Verifying the '${variableString}' variable at top level...`);\n\n    const variableNode = this.node, ///\n          variableName = variableNameFromVariableNode(variableNode),\n          variablePresent = fileContext.isVariablePresentByVariableName(variableName);\n\n    if (variablePresent) {\n      fileContext.debug(`The '${variableString}' variable is already present.`);\n    } else {\n      const typeVerified = this.verifyType(fileContext);\n\n      verifiedAtTopLevel = typeVerified;  ///\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${variableString}' variable at top level.`);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  unifyTerm(term, substitutions, localContext) {\n    let termUnified = false;\n\n    const termString = term.getString(),\n          variableString = this.string; ///\n\n    localContext.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);\n\n    const termNode = term.getNode(),\n          variableNode = this.node, ///\n          substitution = substitutions.findSubstitutionByVariableNode(variableNode);\n\n    if (substitution !== null) {\n      const termNodeMatches = substitution.matchTermNode(termNode);\n\n      if (termNodeMatches) {\n        termUnified = true;\n      }\n    } else {\n      const variable = this,  ///\n            termVariable = termVariableFromTermNode(termNode, localContext);\n\n      if (termVariable === variable) {\n        termUnified = true;\n      } else {\n        const termForVariableSubstitution = TermForVariableSubstitution.fromTernAndVariable(term, variable, localContext),\n              substitution = termForVariableSubstitution;  ///\n\n        substitutions.addSubstitution(substitution, localContext);\n\n        termUnified = true;\n      }\n    }\n\n    if (termUnified) {\n      localContext.trace(`...unified the '${termString}' term with the '${variableString}' variable.`);\n    }\n\n    return termUnified;\n  }\n\n  toJSON() {\n    const typeJSON = this.type.toJSON(),\n          string = this.string,\n          type = typeJSON,  ///\n          json = {\n            string,\n            type\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          lexer  = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          variableString = string,  ///\n          variableNode = variableNodeFromVariableString(variableString, lexer, parser),\n          variableName = variableNameFromVariableNode(variableNode),\n          localContext = LocalContext.fromFileContext(fileContext),\n          node = variableNode,\n          name = variableName,  ///\n          type = typeFromJSON(json, fileContext),\n          variable = new Variable(localContext, string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableNode(variableNode, localContext) {\n    let variable = null;\n\n    if (variableNode !== null) {\n      const node = variableNode,  ///\n            variableName = variableNameFromVariableNode(variableNode),\n            string = localContext.nodeAsString(node),\n            name = variableName,  ///\n            type = null;\n\n      variable = new Variable(localContext, string, node, name, type);\n    }\n\n    return variable;\n  }\n\n  static fromVariableNodeAndType(variableNode, type, localContext) {\n    const node = variableNode,  ///\n          variableName = variableNameFromVariableNode(variableNode),\n          string = localContext.nodeAsString(node),\n          name = variableName,  ///\n          variable = new Variable(localContext, string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableDeclarationNode(variableDeclarationNode, fileContext) {\n    const { Type } = shim,\n          typeNode = typeNodeQuery(variableDeclarationNode),\n          variableNode = variableNodeQuery(variableDeclarationNode),\n          variableName = variableNameFromVariableNode(variableNode),\n          localContext = LocalContext.fromFileContext(fileContext),\n          variableString = fileContext.nodeAsString(variableNode),\n          string = variableString,  ///\n          node = variableNode,  ///\n          name = variableName,  ///\n          type = Type.fromTypeNode(typeNode, localContext),\n          variable = new Variable(localContext, string, node, name, type);\n\n    return variable;\n  }\n}\n\nfunction typeFromJSON(json, fileContext) {\n  let { type } = json;\n\n  const { name } = type,\n        typeName = name;  ///\n\n  type = fileContext.findTypeByTypeName(typeName);\n\n  return type;\n}\n\nfunction termVariableFromTermNode(termNode, localContext) {\n  let termVariable = null;\n\n  const termVariableNode = termVariableNodeQuery(termNode);\n\n  if (termVariableNode !== null) {\n    const termVariableName = variableNameFromVariableNode(termVariableNode);\n\n    termVariable = localContext.findVariableByVariableName(termVariableName);\n  }\n\n  return termVariable;\n}"],"names":["Variable","typeNodeQuery","nodeQuery","variableNodeQuery","termVariableNodeQuery","localContext","string","node","name","type","getLocalContext","getString","getNode","getName","getType","setType","matchNode","nodeMatches","match","matchName","nameMatches","verify","verified","variableString","trace","variableNode","variableName","variableNameFromVariableNode","variable","findVariableByVariableName","debug","verifyType","fileContext","typeVerified","objectType","typeName","findTypeByTypeName","verifyAtTopLevel","verifiedAtTopLevel","variablePresent","isVariablePresentByVariableName","unifyTerm","term","substitutions","termUnified","termString","termNode","substitution","findSubstitutionByVariableNode","termNodeMatches","matchTermNode","termVariable","termVariableFromTermNode","termForVariableSubstitution","TermForVariableSubstitution","fromTernAndVariable","addSubstitution","toJSON","typeJSON","json","fromJSON","lexer","getLexer","parser","getParser","variableNodeFromVariableString","LocalContext","fromFileContext","typeFromJSON","fromVariableNode","nodeAsString","fromVariableNodeAndType","fromVariableDeclarationNode","variableDeclarationNode","Type","shim","typeNode","fromTypeNode","termVariableNode","termVariableName"],"mappings":"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"}

package/lib/verifier/intrinsicLevel.js

@@ -126,7 +126,7 @@ _define_property(IntrinsicLevelVerifier, "maps", [
     {
         nodeQuery: termNodeQuery,
         verify: function(termNode, localContext) {
-            var verifyTerm = _shim.default.verifyTerm, terms = [], termVerified = verifyTerm(termNode, terms, localContext, function() {
+            var Term = _shim.default.Term, term = Term.fromTermNode(termNode, localContext), termVerified = term.verify(localContext, function() {
                 var verifiedAhead = true;
                 return verifiedAhead;
             });
@@ -137,4 +137,4 @@ _define_property(IntrinsicLevelVerifier, "maps", [
 var intrinsicLevelVerifier = new IntrinsicLevelVerifier();
 var _default = intrinsicLevelVerifier;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9pbnRyaW5zaWNMZXZlbC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXJcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm0hXCIpO1xuXG5jbGFzcyBJbnRyaW5zaWNMZXZlbFZlcmlmaWVyIGV4dGVuZHMgVmVyaWZpZXIge1xuICB2ZXJpZnkobm9kZSwgbG9jYWxDb250ZXh0KSB7XG4gICAgbGV0IHZlcmlmaWVkO1xuXG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlID0gbm9kZSwgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlVmVyaWZpZWQgPSB0aGlzLnZlcmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGUsIGxvY2FsQ29udGV4dCk7XG5cbiAgICB2ZXJpZmllZCA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHRlcm1Ob2RlUXVlcnksXG4gICAgICB2ZXJpZnk6ICh0ZXJtTm9kZSwgbG9jYWxDb250ZXh0KSA9PiB7XG4gICAgICAgIGNvbnN0IHsgdmVyaWZ5VGVybSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgdGVybXMgPSBbXSxcbiAgICAgICAgICAgICAgdGVybVZlcmlmaWVkID0gdmVyaWZ5VGVybSh0ZXJtTm9kZSwgdGVybXMsIGxvY2FsQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgICAgICAgIH0pO1xuXG4gICAgICAgIHJldHVybiB0ZXJtVmVyaWZpZWQ7XG4gICAgICB9XG4gICAgfVxuICBdO1xufVxuXG5jb25zdCBpbnRyaW5zaWNMZXZlbFZlcmlmaWVyID0gbmV3IEludHJpbnNpY0xldmVsVmVyaWZpZXIoKTtcblxuZXhwb3J0IGRlZmF1bHQgaW50cmluc2ljTGV2ZWxWZXJpZmllcjtcbiJdLCJuYW1lcyI6WyJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiSW50cmluc2ljTGV2ZWxWZXJpZmllciIsInZlcmlmeSIsIm5vZGUiLCJsb2NhbENvbnRleHQiLCJ2ZXJpZmllZCIsIm5vblRlcm1pbmFsTm9kZSIsIm5vblRlcm1pbmFsTm9kZVZlcmlmaWVkIiwidmVyaWZ5Tm9uVGVybWluYWxOb2RlIiwiVmVyaWZpZXIiLCJtYXBzIiwidGVybU5vZGUiLCJ2ZXJpZnlUZXJtIiwic2hpbSIsInRlcm1zIiwidGVybVZlcmlmaWVkIiwidmVyaWZpZWRBaGVhZCIsImludHJpbnNpY0xldmVsVmVyaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXlDQTs7O2VBQUE7OzsyREF2Q2lCOytEQUNJO3FCQUVLOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQixJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUM7QUFFaEMsSUFBQSxBQUFNQyx1Q0FBTjtjQUFNQTthQUFBQTtnQ0FBQUE7aUNBQUFBOztrQkFBQUE7O1lBQ0pDLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPQyxJQUFJLEVBQUVDLFlBQVk7Z0JBQ3ZCLElBQUlDO2dCQUVKLElBQU1DLGtCQUFrQkgsTUFDbEJJLDBCQUEwQixJQUFJLENBQUNDLHFCQUFxQixDQUFDRixpQkFBaUJGO2dCQUU1RUMsV0FBV0UseUJBQTBCLEdBQUc7Z0JBRXhDLE9BQU9GO1lBQ1Q7OztXQVZJSjtFQUErQlEsaUJBQVE7QUFZM0MsaUJBWklSLHdCQVlHUyxRQUFPO0lBQ1o7UUFDRVYsV0FBV0Q7UUFDWEcsUUFBUSxTQUFDUyxVQUFVUDtZQUNqQixJQUFNLEFBQUVRLGFBQWVDLGFBQUksQ0FBbkJELFlBQ0ZFLFFBQVEsRUFBRSxFQUNWQyxlQUFlSCxXQUFXRCxVQUFVRyxPQUFPVixjQUFjO2dCQUN2RCxJQUFNWSxnQkFBZ0I7Z0JBRXRCLE9BQU9BO1lBQ1Q7WUFFTixPQUFPRDtRQUNUO0lBQ0Y7Q0FDRDtBQUdILElBQU1FLHlCQUF5QixJQUFJaEI7SUFFbkMsV0FBZWdCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9pbnRyaW5zaWNMZXZlbC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXJcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm0hXCIpO1xuXG5jbGFzcyBJbnRyaW5zaWNMZXZlbFZlcmlmaWVyIGV4dGVuZHMgVmVyaWZpZXIge1xuICB2ZXJpZnkobm9kZSwgbG9jYWxDb250ZXh0KSB7XG4gICAgbGV0IHZlcmlmaWVkO1xuXG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlID0gbm9kZSwgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlVmVyaWZpZWQgPSB0aGlzLnZlcmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGUsIGxvY2FsQ29udGV4dCk7XG5cbiAgICB2ZXJpZmllZCA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHRlcm1Ob2RlUXVlcnksXG4gICAgICB2ZXJpZnk6ICh0ZXJtTm9kZSwgbG9jYWxDb250ZXh0KSA9PiB7XG4gICAgICAgIGNvbnN0IHsgVGVybSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgdGVybSA9IFRlcm0uZnJvbVRlcm1Ob2RlKHRlcm1Ob2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgICAgICB0ZXJtVmVyaWZpZWQgPSB0ZXJtLnZlcmlmeShsb2NhbENvbnRleHQsICgpID0+IHtcbiAgICAgICAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICAgICAgICB9KTtcblxuICAgICAgICByZXR1cm4gdGVybVZlcmlmaWVkO1xuICAgICAgfVxuICAgIH1cbiAgXTtcbn1cblxuY29uc3QgaW50cmluc2ljTGV2ZWxWZXJpZmllciA9IG5ldyBJbnRyaW5zaWNMZXZlbFZlcmlmaWVyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IGludHJpbnNpY0xldmVsVmVyaWZpZXI7XG4iXSwibmFtZXMiOlsidGVybU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsIkludHJpbnNpY0xldmVsVmVyaWZpZXIiLCJ2ZXJpZnkiLCJub2RlIiwibG9jYWxDb250ZXh0IiwidmVyaWZpZWQiLCJub25UZXJtaW5hbE5vZGUiLCJub25UZXJtaW5hbE5vZGVWZXJpZmllZCIsInZlcmlmeU5vblRlcm1pbmFsTm9kZSIsIlZlcmlmaWVyIiwibWFwcyIsInRlcm1Ob2RlIiwiVGVybSIsInNoaW0iLCJ0ZXJtIiwiZnJvbVRlcm1Ob2RlIiwidGVybVZlcmlmaWVkIiwidmVyaWZpZWRBaGVhZCIsImludHJpbnNpY0xldmVsVmVyaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXlDQTs7O2VBQUE7OzsyREF2Q2lCOytEQUNJO3FCQUVLOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQixJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUM7QUFFaEMsSUFBQSxBQUFNQyx1Q0FBTjtjQUFNQTthQUFBQTtnQ0FBQUE7aUNBQUFBOztrQkFBQUE7O1lBQ0pDLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPQyxJQUFJLEVBQUVDLFlBQVk7Z0JBQ3ZCLElBQUlDO2dCQUVKLElBQU1DLGtCQUFrQkgsTUFDbEJJLDBCQUEwQixJQUFJLENBQUNDLHFCQUFxQixDQUFDRixpQkFBaUJGO2dCQUU1RUMsV0FBV0UseUJBQTBCLEdBQUc7Z0JBRXhDLE9BQU9GO1lBQ1Q7OztXQVZJSjtFQUErQlEsaUJBQVE7QUFZM0MsaUJBWklSLHdCQVlHUyxRQUFPO0lBQ1o7UUFDRVYsV0FBV0Q7UUFDWEcsUUFBUSxTQUFDUyxVQUFVUDtZQUNqQixJQUFNLEFBQUVRLE9BQVNDLGFBQUksQ0FBYkQsTUFDRkUsT0FBT0YsS0FBS0csWUFBWSxDQUFDSixVQUFVUCxlQUNuQ1ksZUFBZUYsS0FBS1osTUFBTSxDQUFDRSxjQUFjO2dCQUN2QyxJQUFNYSxnQkFBZ0I7Z0JBRXRCLE9BQU9BO1lBQ1Q7WUFFTixPQUFPRDtRQUNUO0lBQ0Y7Q0FDRDtBQUdILElBQU1FLHlCQUF5QixJQUFJakI7SUFFbkMsV0FBZWlCIn0=

package/lib/verifier/metaLevel.js

@@ -133,7 +133,7 @@ _define_property(MetaLevelVerifier, "maps", [
     {
         nodeQuery: termNodeQuery,
         verify: function(termNode, assignments, stated, localContext) {
-            var verifyTerm = _shim.default.verifyTerm, terms = [], termVerified = verifyTerm(termNode, terms, localContext, function() {
+            var Term = _shim.default.Term, term = Term.fromTermNode(termNode, localContext), termVerified = term.verify(localContext, function() {
                 var verifiedAhead = true;
                 return verifiedAhead;
             });
@@ -144,4 +144,4 @@ _define_property(MetaLevelVerifier, "maps", [
 var metaLevelVerifier = new MetaLevelVerifier();
 var _default = metaLevelVerifier;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9tZXRhTGV2ZWwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVmVyaWZpZXIgZnJvbSBcIi4uL3ZlcmlmaWVyXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdGVybU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90ZXJtIVwiKSxcbiAgICAgIHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQhXCIpO1xuXG5jbGFzcyBNZXRhTGV2ZWxWZXJpZmllciBleHRlbmRzIFZlcmlmaWVyIHtcbiAgdmVyaWZ5KG5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkge1xuICAgIGxldCB2ZXJpZmllZDtcblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IG5vZGUsIC8vL1xuICAgICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gdGhpcy52ZXJpZnlDaGlsZE5vZGVzKGNoaWxkTm9kZXMsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCk7XG5cbiAgICB2ZXJpZmllZCA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHN0YXRlbWVudE5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHN0YXRlbWVudE5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkgPT4ge1xuICAgICAgICBjb25zdCB7IFN0YXRlbWVudCB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgc3RhdGVtZW50ID0gU3RhdGVtZW50LmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHN0YXRlbWVudFZlcmlmaWVkID0gc3RhdGVtZW50LnZlcmlmeShhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogdGVybU5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHRlcm1Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3QgeyB2ZXJpZnlUZXJtIH0gPSBzaGltLFxuICAgICAgICAgICAgICB0ZXJtcyA9IFtdLFxuICAgICAgICAgICAgICB0ZXJtVmVyaWZpZWQgPSB2ZXJpZnlUZXJtKHRlcm1Ob2RlLCB0ZXJtcywgbG9jYWxDb250ZXh0LCAoKSA9PiB7XG4gICAgICAgICAgICAgICAgY29uc3QgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG5cbiAgICAgICAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgICAgICAgfSk7XG5cbiAgICAgICAgcmV0dXJuIHRlcm1WZXJpZmllZDtcbiAgICAgIH1cbiAgICB9XG4gIF07XG59XG5cbmNvbnN0IG1ldGFMZXZlbFZlcmlmaWVyID0gbmV3IE1ldGFMZXZlbFZlcmlmaWVyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IG1ldGFMZXZlbFZlcmlmaWVyO1xuIl0sIm5hbWVzIjpbInRlcm1Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJzdGF0ZW1lbnROb2RlUXVlcnkiLCJNZXRhTGV2ZWxWZXJpZmllciIsInZlcmlmeSIsIm5vZGUiLCJhc3NpZ25tZW50cyIsInN0YXRlZCIsImxvY2FsQ29udGV4dCIsInZlcmlmaWVkIiwibm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJub25UZXJtaW5hbE5vZGVWZXJpZmllZCIsInZlcmlmeUNoaWxkTm9kZXMiLCJWZXJpZmllciIsIm1hcHMiLCJzdGF0ZW1lbnROb2RlIiwiU3RhdGVtZW50Iiwic2hpbSIsInN0YXRlbWVudCIsImZyb21TdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50VmVyaWZpZWQiLCJ0ZXJtTm9kZSIsInZlcmlmeVRlcm0iLCJ0ZXJtcyIsInRlcm1WZXJpZmllZCIsInZlcmlmaWVkQWhlYWQiLCJtZXRhTGV2ZWxWZXJpZmllciJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBcURBOzs7ZUFBQTs7OzJEQW5EaUI7K0RBQ0k7cUJBRUs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTFCLElBQU1BLGdCQUFnQkMsSUFBQUEsZ0JBQVMsRUFBQyxXQUMxQkMscUJBQXFCRCxJQUFBQSxnQkFBUyxFQUFDO0FBRXJDLElBQUEsQUFBTUUsa0NBQU47Y0FBTUE7YUFBQUE7Z0NBQUFBO2lDQUFBQTs7a0JBQUFBOztZQUNKQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsSUFBSSxFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtnQkFDNUMsSUFBSUM7Z0JBRUosSUFBTUMsa0JBQWtCTCxNQUNsQk0sYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQywwQkFBMEIsSUFBSSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsWUFBWUwsYUFBYUMsUUFBUUM7Z0JBRXZGQyxXQUFXSSx5QkFBMEIsR0FBRztnQkFFeEMsT0FBT0o7WUFDVDs7O1dBWElOO0VBQTBCWSxpQkFBUTtBQWF0QyxpQkFiSVosbUJBYUdhLFFBQU87SUFDWjtRQUNFZixXQUFXQztRQUNYRSxRQUFRLFNBQUNhLGVBQWVYLGFBQWFDLFFBQVFDO1lBQzNDLElBQU0sQUFBRVUsWUFBY0MsYUFBSSxDQUFsQkQsV0FDRkUsWUFBWUYsVUFBVUcsaUJBQWlCLENBQUNKLGVBQWVULGVBQ3ZEYyxvQkFBb0JGLFVBQVVoQixNQUFNLENBQUNFLGFBQWFDLFFBQVFDO1lBRWhFLE9BQU9jO1FBQ1Q7SUFDRjtJQUNBO1FBQ0VyQixXQUFXRDtRQUNYSSxRQUFRLFNBQUNtQixVQUFVakIsYUFBYUMsUUFBUUM7WUFDdEMsSUFBTSxBQUFFZ0IsYUFBZUwsYUFBSSxDQUFuQkssWUFDRkMsUUFBUSxFQUFFLEVBQ1ZDLGVBQWVGLFdBQVdELFVBQVVFLE9BQU9qQixjQUFjO2dCQUN2RCxJQUFNbUIsZ0JBQWdCO2dCQUV0QixPQUFPQTtZQUNUO1lBRU4sT0FBT0Q7UUFDVDtJQUNGO0NBQ0Q7QUFHSCxJQUFNRSxvQkFBb0IsSUFBSXpCO0lBRTlCLFdBQWV5QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9tZXRhTGV2ZWwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVmVyaWZpZXIgZnJvbSBcIi4uL3ZlcmlmaWVyXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdGVybU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90ZXJtIVwiKSxcbiAgICAgIHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQhXCIpO1xuXG5jbGFzcyBNZXRhTGV2ZWxWZXJpZmllciBleHRlbmRzIFZlcmlmaWVyIHtcbiAgdmVyaWZ5KG5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkge1xuICAgIGxldCB2ZXJpZmllZDtcblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IG5vZGUsIC8vL1xuICAgICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gdGhpcy52ZXJpZnlDaGlsZE5vZGVzKGNoaWxkTm9kZXMsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCk7XG5cbiAgICB2ZXJpZmllZCA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHN0YXRlbWVudE5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHN0YXRlbWVudE5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkgPT4ge1xuICAgICAgICBjb25zdCB7IFN0YXRlbWVudCB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgc3RhdGVtZW50ID0gU3RhdGVtZW50LmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHN0YXRlbWVudFZlcmlmaWVkID0gc3RhdGVtZW50LnZlcmlmeShhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogdGVybU5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHRlcm1Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3QgeyBUZXJtIH0gPSBzaGltLFxuICAgICAgICAgICAgICB0ZXJtID0gVGVybS5mcm9tVGVybU5vZGUodGVybU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHRlcm1WZXJpZmllZCA9IHRlcm0udmVyaWZ5KGxvY2FsQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgICAgICAgIH0pO1xuXG4gICAgICAgIHJldHVybiB0ZXJtVmVyaWZpZWQ7XG4gICAgICB9XG4gICAgfVxuICBdO1xufVxuXG5jb25zdCBtZXRhTGV2ZWxWZXJpZmllciA9IG5ldyBNZXRhTGV2ZWxWZXJpZmllcigpO1xuXG5leHBvcnQgZGVmYXVsdCBtZXRhTGV2ZWxWZXJpZmllcjtcbiJdLCJuYW1lcyI6WyJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3RhdGVtZW50Tm9kZVF1ZXJ5IiwiTWV0YUxldmVsVmVyaWZpZXIiLCJ2ZXJpZnkiLCJub2RlIiwiYXNzaWdubWVudHMiLCJzdGF0ZWQiLCJsb2NhbENvbnRleHQiLCJ2ZXJpZmllZCIsIm5vblRlcm1pbmFsTm9kZSIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwibm9uVGVybWluYWxOb2RlVmVyaWZpZWQiLCJ2ZXJpZnlDaGlsZE5vZGVzIiwiVmVyaWZpZXIiLCJtYXBzIiwic3RhdGVtZW50Tm9kZSIsIlN0YXRlbWVudCIsInNoaW0iLCJzdGF0ZW1lbnQiLCJmcm9tU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudFZlcmlmaWVkIiwidGVybU5vZGUiLCJUZXJtIiwidGVybSIsImZyb21UZXJtTm9kZSIsInRlcm1WZXJpZmllZCIsInZlcmlmaWVkQWhlYWQiLCJtZXRhTGV2ZWxWZXJpZmllciJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBcURBOzs7ZUFBQTs7OzJEQW5EaUI7K0RBQ0k7cUJBRUs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTFCLElBQU1BLGdCQUFnQkMsSUFBQUEsZ0JBQVMsRUFBQyxXQUMxQkMscUJBQXFCRCxJQUFBQSxnQkFBUyxFQUFDO0FBRXJDLElBQUEsQUFBTUUsa0NBQU47Y0FBTUE7YUFBQUE7Z0NBQUFBO2lDQUFBQTs7a0JBQUFBOztZQUNKQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsSUFBSSxFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtnQkFDNUMsSUFBSUM7Z0JBRUosSUFBTUMsa0JBQWtCTCxNQUNsQk0sYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQywwQkFBMEIsSUFBSSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsWUFBWUwsYUFBYUMsUUFBUUM7Z0JBRXZGQyxXQUFXSSx5QkFBMEIsR0FBRztnQkFFeEMsT0FBT0o7WUFDVDs7O1dBWElOO0VBQTBCWSxpQkFBUTtBQWF0QyxpQkFiSVosbUJBYUdhLFFBQU87SUFDWjtRQUNFZixXQUFXQztRQUNYRSxRQUFRLFNBQUNhLGVBQWVYLGFBQWFDLFFBQVFDO1lBQzNDLElBQU0sQUFBRVUsWUFBY0MsYUFBSSxDQUFsQkQsV0FDRkUsWUFBWUYsVUFBVUcsaUJBQWlCLENBQUNKLGVBQWVULGVBQ3ZEYyxvQkFBb0JGLFVBQVVoQixNQUFNLENBQUNFLGFBQWFDLFFBQVFDO1lBRWhFLE9BQU9jO1FBQ1Q7SUFDRjtJQUNBO1FBQ0VyQixXQUFXRDtRQUNYSSxRQUFRLFNBQUNtQixVQUFVakIsYUFBYUMsUUFBUUM7WUFDdEMsSUFBTSxBQUFFZ0IsT0FBU0wsYUFBSSxDQUFiSyxNQUNGQyxPQUFPRCxLQUFLRSxZQUFZLENBQUNILFVBQVVmLGVBQ25DbUIsZUFBZUYsS0FBS3JCLE1BQU0sQ0FBQ0ksY0FBYztnQkFDdkMsSUFBTW9CLGdCQUFnQjtnQkFFdEIsT0FBT0E7WUFDVDtZQUVOLE9BQU9EO1FBQ1Q7SUFDRjtDQUNEO0FBR0gsSUFBTUUsb0JBQW9CLElBQUkxQjtJQUU5QixXQUFlMEIifQ==

package/lib/verify/assertion/subproof.js

@@ -2,12 +2,6 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifySubproofAssertion;
-    }
-});
 var _metaLevel = /*#__PURE__*/ _interop_require_default(require("../../verifier/metaLevel"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -18,47 +12,5 @@ var verifySubproofAssertionFunctions = [
     verifyDerivedSubproofAssertion,
     verifyStatedSubproofAssertion
 ];
-function verifySubproofAssertion(subproofAssertionNode, assignments, stated, localContext) {
-    var subproofAssertionVerified = false;
-    var subproofAssertionString = localContext.nodeAsString(subproofAssertionNode);
-    assignments = null; ///
-    stated = true; ///
-    localContext.trace("Verifying the '".concat(subproofAssertionString, "' subproof assertion..."), subproofAssertionNode);
-    var verified = _metaLevel.default.verify(subproofAssertionNode, assignments, stated, localContext);
-    if (verified) {
-        subproofAssertionVerified = verifySubproofAssertionFunctions.some(function(verifySubproofAssertionFunction) {
-            var subproofAssertionVerified = verifySubproofAssertionFunction(subproofAssertionNode, assignments, stated, localContext);
-            if (subproofAssertionVerified) {
-                return true;
-            }
-        });
-    }
-    if (subproofAssertionVerified) {
-        localContext.debug("...verified the '".concat(subproofAssertionString, "' subproof assertion."), subproofAssertionNode);
-    }
-    return subproofAssertionVerified;
-}
-function verifyDerivedSubproofAssertion(subproofAssertionNode, assignments, stated, localContext) {
-    var derivedSubproofAssertionVerified;
-    if (!stated) {
-        var subproofAssertionString = localContext.nodeAsString(subproofAssertionNode);
-        localContext.trace("Verifying the '".concat(subproofAssertionString, "' derived subproof assertion..."), subproofAssertionNode);
-        derivedSubproofAssertionVerified = false;
-        localContext.debug("The '".concat(subproofAssertionString, "' derived subproof assertion cannot be verified."), subproofAssertionNode);
-    }
-    return derivedSubproofAssertionVerified;
-}
-function verifyStatedSubproofAssertion(subproofAssertionNode, assignments, stated, localContext) {
-    var statedSubproofAssertionVerified;
-    if (stated) {
-        var subproofAssertionString = localContext.nodeAsString(subproofAssertionNode);
-        localContext.trace("Verifying the '".concat(subproofAssertionString, "' stated subproof assertion..."), subproofAssertionNode);
-        statedSubproofAssertionVerified = true;
-        if (statedSubproofAssertionVerified) {
-            localContext.debug("...verified the '".concat(subproofAssertionString, "' stated subproof assertion."), subproofAssertionNode);
-        }
-    }
-    return statedSubproofAssertionVerified;
-}
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvYXNzZXJ0aW9uL3N1YnByb29mLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWV0YUxldmVsVmVyaWZpZXIgZnJvbSBcIi4uLy4uL3ZlcmlmaWVyL21ldGFMZXZlbFwiO1xuXG5jb25zdCB2ZXJpZnlTdWJwcm9vZkFzc2VydGlvbkZ1bmN0aW9ucyA9IFtcbiAgdmVyaWZ5RGVyaXZlZFN1YnByb29mQXNzZXJ0aW9uLFxuICB2ZXJpZnlTdGF0ZWRTdWJwcm9vZkFzc2VydGlvblxuXTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5U3VicHJvb2ZBc3NlcnRpb24oc3VicHJvb2ZBc3NlcnRpb25Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IHN1YnByb29mQXNzZXJ0aW9uVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBzdWJwcm9vZkFzc2VydGlvblN0cmluZyA9IGxvY2FsQ29udGV4dC5ub2RlQXNTdHJpbmcoc3VicHJvb2ZBc3NlcnRpb25Ob2RlKTtcblxuICBhc3NpZ25tZW50cyA9IG51bGw7IC8vL1xuXG4gIHN0YXRlZCA9IHRydWU7ICAvLy9cblxuICBsb2NhbENvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBzdWJwcm9vZiBhc3NlcnRpb24uLi5gLCBzdWJwcm9vZkFzc2VydGlvbk5vZGUpO1xuXG4gIGNvbnN0IHZlcmlmaWVkID0gbWV0YUxldmVsVmVyaWZpZXIudmVyaWZ5KHN1YnByb29mQXNzZXJ0aW9uTm9kZSwgYXNzaWdubWVudHMsIHN0YXRlZCwgbG9jYWxDb250ZXh0KTtcblxuICBpZiAodmVyaWZpZWQpIHtcbiAgICBzdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkID0gdmVyaWZ5U3VicHJvb2ZBc3NlcnRpb25GdW5jdGlvbnMuc29tZSgodmVyaWZ5U3VicHJvb2ZBc3NlcnRpb25GdW5jdGlvbikgPT4ge1xuICAgICAgY29uc3Qgc3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZCA9IHZlcmlmeVN1YnByb29mQXNzZXJ0aW9uRnVuY3Rpb24oc3VicHJvb2ZBc3NlcnRpb25Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICBpZiAoc3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZCkge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgIH1cbiAgICB9KTtcbiAgfVxuXG4gIGlmIChzdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkKSB7XG4gICAgbG9jYWxDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBzdWJwcm9vZiBhc3NlcnRpb24uYCwgc3VicHJvb2ZBc3NlcnRpb25Ob2RlKTtcbiAgfVxuXG4gIHJldHVybiBzdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkO1xufVxuXG5mdW5jdGlvbiB2ZXJpZnlEZXJpdmVkU3VicHJvb2ZBc3NlcnRpb24oc3VicHJvb2ZBc3NlcnRpb25Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IGRlcml2ZWRTdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkO1xuXG4gIGlmICghc3RhdGVkKSB7XG4gICAgY29uc3Qgc3VicHJvb2ZBc3NlcnRpb25TdHJpbmcgPSBsb2NhbENvbnRleHQubm9kZUFzU3RyaW5nKHN1YnByb29mQXNzZXJ0aW9uTm9kZSk7XG5cbiAgICBsb2NhbENvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBkZXJpdmVkIHN1YnByb29mIGFzc2VydGlvbi4uLmAsIHN1YnByb29mQXNzZXJ0aW9uTm9kZSk7XG5cbiAgICBkZXJpdmVkU3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZCA9IGZhbHNlO1xuXG4gICAgbG9jYWxDb250ZXh0LmRlYnVnKGBUaGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBkZXJpdmVkIHN1YnByb29mIGFzc2VydGlvbiBjYW5ub3QgYmUgdmVyaWZpZWQuYCwgc3VicHJvb2ZBc3NlcnRpb25Ob2RlKTtcbiAgfVxuXG4gIHJldHVybiBkZXJpdmVkU3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZDtcbn1cblxuZnVuY3Rpb24gdmVyaWZ5U3RhdGVkU3VicHJvb2ZBc3NlcnRpb24oc3VicHJvb2ZBc3NlcnRpb25Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IHN0YXRlZFN1YnByb29mQXNzZXJ0aW9uVmVyaWZpZWQ7XG5cbiAgaWYgKHN0YXRlZCkge1xuICAgIGNvbnN0IHN1YnByb29mQXNzZXJ0aW9uU3RyaW5nID0gbG9jYWxDb250ZXh0Lm5vZGVBc1N0cmluZyhzdWJwcm9vZkFzc2VydGlvbk5vZGUpO1xuXG4gICAgbG9jYWxDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3N1YnByb29mQXNzZXJ0aW9uU3RyaW5nfScgc3RhdGVkIHN1YnByb29mIGFzc2VydGlvbi4uLmAsIHN1YnByb29mQXNzZXJ0aW9uTm9kZSk7XG5cbiAgICBzdGF0ZWRTdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkID0gdHJ1ZTtcblxuICAgIGlmIChzdGF0ZWRTdWJwcm9vZkFzc2VydGlvblZlcmlmaWVkKSB7XG4gICAgICBsb2NhbENvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHtzdWJwcm9vZkFzc2VydGlvblN0cmluZ30nIHN0YXRlZCBzdWJwcm9vZiBhc3NlcnRpb24uYCwgc3VicHJvb2ZBc3NlcnRpb25Ob2RlKTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gc3RhdGVkU3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdWJwcm9vZkFzc2VydGlvbiIsInZlcmlmeVN1YnByb29mQXNzZXJ0aW9uRnVuY3Rpb25zIiwidmVyaWZ5RGVyaXZlZFN1YnByb29mQXNzZXJ0aW9uIiwidmVyaWZ5U3RhdGVkU3VicHJvb2ZBc3NlcnRpb24iLCJzdWJwcm9vZkFzc2VydGlvbk5vZGUiLCJhc3NpZ25tZW50cyIsInN0YXRlZCIsImxvY2FsQ29udGV4dCIsInN1YnByb29mQXNzZXJ0aW9uVmVyaWZpZWQiLCJzdWJwcm9vZkFzc2VydGlvblN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRyYWNlIiwidmVyaWZpZWQiLCJtZXRhTGV2ZWxWZXJpZmllciIsInZlcmlmeSIsInNvbWUiLCJ2ZXJpZnlTdWJwcm9vZkFzc2VydGlvbkZ1bmN0aW9uIiwiZGVidWciLCJkZXJpdmVkU3VicHJvb2ZBc3NlcnRpb25WZXJpZmllZCIsInN0YXRlZFN1YnByb29mQXNzZXJ0aW9uVmVyaWZpZWQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBd0JBOzs7Z0VBUE07Ozs7OztBQUU5QixJQUFNQyxtQ0FBbUM7SUFDdkNDO0lBQ0FDO0NBQ0Q7QUFFYyxTQUFTSCx3QkFBd0JJLHFCQUFxQixFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtJQUN0RyxJQUFJQyw0QkFBNEI7SUFFaEMsSUFBTUMsMEJBQTBCRixhQUFhRyxZQUFZLENBQUNOO0lBRTFEQyxjQUFjLE1BQU0sR0FBRztJQUV2QkMsU0FBUyxNQUFPLEdBQUc7SUFFbkJDLGFBQWFJLEtBQUssQ0FBQyxBQUFDLGtCQUF5QyxPQUF4QkYseUJBQXdCLDRCQUEwQkw7SUFFdkYsSUFBTVEsV0FBV0Msa0JBQWlCLENBQUNDLE1BQU0sQ0FBQ1YsdUJBQXVCQyxhQUFhQyxRQUFRQztJQUV0RixJQUFJSyxVQUFVO1FBQ1pKLDRCQUE0QlAsaUNBQWlDYyxJQUFJLENBQUMsU0FBQ0M7WUFDakUsSUFBTVIsNEJBQTRCUSxnQ0FBZ0NaLHVCQUF1QkMsYUFBYUMsUUFBUUM7WUFFOUcsSUFBSUMsMkJBQTJCO2dCQUM3QixPQUFPO1lBQ1Q7UUFDRjtJQUNGO0lBRUEsSUFBSUEsMkJBQTJCO1FBQzdCRCxhQUFhVSxLQUFLLENBQUMsQUFBQyxvQkFBMkMsT0FBeEJSLHlCQUF3QiwwQkFBd0JMO0lBQ3pGO0lBRUEsT0FBT0k7QUFDVDtBQUVBLFNBQVNOLCtCQUErQkUscUJBQXFCLEVBQUVDLFdBQVcsRUFBRUMsTUFBTSxFQUFFQyxZQUFZO0lBQzlGLElBQUlXO0lBRUosSUFBSSxDQUFDWixRQUFRO1FBQ1gsSUFBTUcsMEJBQTBCRixhQUFhRyxZQUFZLENBQUNOO1FBRTFERyxhQUFhSSxLQUFLLENBQUMsQUFBQyxrQkFBeUMsT0FBeEJGLHlCQUF3QixvQ0FBa0NMO1FBRS9GYyxtQ0FBbUM7UUFFbkNYLGFBQWFVLEtBQUssQ0FBQyxBQUFDLFFBQStCLE9BQXhCUix5QkFBd0IscURBQW1ETDtJQUN4RztJQUVBLE9BQU9jO0FBQ1Q7QUFFQSxTQUFTZiw4QkFBOEJDLHFCQUFxQixFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtJQUM3RixJQUFJWTtJQUVKLElBQUliLFFBQVE7UUFDVixJQUFNRywwQkFBMEJGLGFBQWFHLFlBQVksQ0FBQ047UUFFMURHLGFBQWFJLEtBQUssQ0FBQyxBQUFDLGtCQUF5QyxPQUF4QkYseUJBQXdCLG1DQUFpQ0w7UUFFOUZlLGtDQUFrQztRQUVsQyxJQUFJQSxpQ0FBaUM7WUFDbkNaLGFBQWFVLEtBQUssQ0FBQyxBQUFDLG9CQUEyQyxPQUF4QlIseUJBQXdCLGlDQUErQkw7UUFDaEc7SUFDRjtJQUVBLE9BQU9lO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvYXNzZXJ0aW9uL3N1YnByb29mLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWV0YUxldmVsVmVyaWZpZXIgZnJvbSBcIi4uLy4uL3ZlcmlmaWVyL21ldGFMZXZlbFwiO1xuXG5jb25zdCB2ZXJpZnlTdWJwcm9vZkFzc2VydGlvbkZ1bmN0aW9ucyA9IFtcbiAgdmVyaWZ5RGVyaXZlZFN1YnByb29mQXNzZXJ0aW9uLFxuICB2ZXJpZnlTdGF0ZWRTdWJwcm9vZkFzc2VydGlvblxuXTtcblxuIl0sIm5hbWVzIjpbInZlcmlmeVN1YnByb29mQXNzZXJ0aW9uRnVuY3Rpb25zIiwidmVyaWZ5RGVyaXZlZFN1YnByb29mQXNzZXJ0aW9uIiwidmVyaWZ5U3RhdGVkU3VicHJvb2ZBc3NlcnRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7O2dFQUU4Qjs7Ozs7O0FBRTlCLElBQU1BLG1DQUFtQztJQUN2Q0M7SUFDQUM7Q0FDRCJ9

package/package.json

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

package/src/assertion/subproof.js

@@ -3,34 +3,97 @@
 import shim from "../shim";
 import LocalContext from "../context/local";
 import metaLevelUnifier from "../unifier/metaLevel";
+import metaLevelVerifier from "../verifier/metaLevel";
 
 import { front, last, match } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
-const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement"),
-      statementNodesQuery = nodesQuery("/subproofAssertion/statement"),
+const statementNodesQuery = nodesQuery("/subproofAssertion/statement"),
       subproofAssertionNodeQuery = nodeQuery("/statement/subproofAssertion");
 
 export default class SubproofAssertion {
-  constructor(fileContext, string, statements) {
-    this.fileContext = fileContext;
+  constructor(string, node, statements) {
     this.string = string;
+    this.node = node;
     this.statements = statements;
   }
 
-  getFileContext() {
-    return this.fileContext;
-  }
-
   getString() {
     return this.string;
   }
 
+  getNode() {
+    return this.node;
+  }
+
   getStatements() {
     return this.statements;
   }
 
-  unifySubproof(subproof, substitutions, localContext) {
+  verify(assignments, stated, localContext) {
+    let verified;
+
+    const subproofAssertionString = this.string;  ///
+
+    localContext.trace(`Verifying the '${subproofAssertionString}' subproof assertion...`);
+
+    let verifiedWhenStated = false,
+        verifiedWhenDerived = false;
+
+    if (stated) {
+      verifiedWhenStated = this.verifyWhenStated(localContext);
+    } else {
+      verifiedWhenDerived = this.verifyWhenDerived(localContext);
+    }
+
+    if (verifiedWhenStated || verifiedWhenDerived) {
+      assignments = null; ///
+
+      stated = true;  ///
+
+      const subproofAssertionNode = this.node;  ///
+
+      verified = metaLevelVerifier.verify(subproofAssertionNode, assignments, stated, localContext);
+    }
+
+    if (verified) {
+      localContext.debug(`...verified the '${subproofAssertionString}' subproof assertion.`);
+    }
+
+    return verified;
+  }
+
+  verifyWhenStated(localContext) {
+    let verifiedWhenStated;
+
+    const subproofAssertionString = this.string;  ///
+
+    localContext.trace(`Verifying the '${subproofAssertionString}' stated subproof assertion...`);
+
+    verifiedWhenStated = true;
+
+    if (verifiedWhenStated) {
+      localContext.debug(`...verified the '${subproofAssertionString}' stated subproof assertion.`);
+    }
+
+    return verifiedWhenStated;
+  }
+
+  verifyWhenDerived(localContext) {
+    let derivedSubproofAssertionVerified;
+
+    const subproofAssertionString = this.string;  ///
+
+    localContext.trace(`Verifying the '${subproofAssertionString}' derived subproof assertion...`);
+
+    derivedSubproofAssertionVerified = false;
+
+    localContext.debug(`The '${subproofAssertionString}' derived subproof assertion cannot be verified.`);
+
+    return derivedSubproofAssertionVerified;
+  }
+
+  unifySubproof(subproof, substitutions, fileContext, localContext) {
     let subproofUnified;
 
     const subproofString = subproof.getString(),
@@ -44,7 +107,7 @@ export default class SubproofAssertion {
             subproofStatementNode = subproofStatement.getNode(),
             nodeA = statementNode,  ///
             nodeB = subproofStatementNode,  ///
-            fileContextA = this.fileContext,  ///
+            fileContextA = fileContext,  ///
             localContextA = LocalContext.fromFileContext(fileContextA),
             localContextB = localContext, ///
             unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
@@ -61,59 +124,42 @@ export default class SubproofAssertion {
     return subproofUnified;
   }
 
-  toJSON() {
-    const statementStings = this.statements.map((statement) => {
-            const statementString = statement.getString();
-
-            return statementString;
-          }),
-          statements = statementStings, ///
-          json = {
-            statements
-          };
-
-    return json;
-  }
-
-  static fromJSON(json, fileContext) {
-    let { statements } = json;
+  static fromStatement(statement, fileContext) {
+    let subproofAssertion = null;
 
-    const statementsJSON = statements;  ///
+    const statementNode = statement.getNode(),
+          subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
 
-    statements = statementsJSON.map((statementJSON) => {
-      const json = statementJSON,
-            statement = Statement.fromJSON(json, fileContext);
+    if (subproofAssertionNode !== null) {
+      const { Statement } = shim,
+            statementNodes = statementNodesQuery(subproofAssertionNode),
+            statementString = statement.getString(),
+            localContext = LocalContext.fromFileContext(fileContext),
+            statements = statementNodes.map((statementNode) => {
+              const statement = Statement.fromStatementNode(statementNode, localContext);
 
-      return statement;
-    });
+              return statement;
+            }),
+            node = subproofAssertionNode, ///
+            string = statementString; ///
 
-    const string = stringFromStatements(statements),
-          subproofAssertion = new SubproofAssertion(fileContext, string, statements);
+      subproofAssertion = new SubproofAssertion(string, node, statements);
+    }
 
     return subproofAssertion;
   }
 
-  static fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext) {
-    let subproofAssertion = null;
-
-    if (unqualifiedStatementNode !== null) {
-      const statementNode = statementNodeQuery(unqualifiedStatementNode),
-            subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
-
-      if (subproofAssertionNode !== null) {
-        const { Statement } = shim,
-              localContext = LocalContext.fromFileContext(fileContext),
-              statementNodes = statementNodesQuery(subproofAssertionNode),
-              statements = statementNodes.map((statementNode) => {
-                const statement = Statement.fromStatementNode(statementNode, localContext);
-
-                return statement;
-              }),
-              string = stringFromStatements(statements);
+  static fromSubproofAssertionNode(subproofAssertionNode, localContext) {
+    const { Statement } = shim,
+          statementNodes = statementNodesQuery(subproofAssertionNode),
+          statements = statementNodes.map((statementNode) => {
+            const statement = Statement.fromStatementNode(statementNode, localContext);
 
-        subproofAssertion = new SubproofAssertion(fileContext, string, statements);
-      }
-    }
+            return statement;
+          }),
+          node = subproofAssertionNode, ///
+          string = stringFromStatements(statements),
+          subproofAssertion = new SubproofAssertion(string, node, statements);
 
     return subproofAssertion;
   }
@@ -122,14 +168,14 @@ export default class SubproofAssertion {
 function stringFromStatements(statements) {
   const frontStatements = front(statements),
         lastStatement = last(statements),
-        frontStatementsString = statementsStringtatements(frontStatements),
+        frontStatementsString = statementsStringFromStatements(frontStatements),
         lastStatementString = lastStatement.getString(),
         string = `[${frontStatementsString}] ... ${lastStatementString}`;
 
   return string;
 }
 
-function statementsStringtatements(statements) {
+function statementsStringFromStatements(statements) {
   const statementsString = statements.reduce((statementsString, statement) => {
     const statementString = statement.getString();
 

package/src/assertion/type.js

@@ -84,7 +84,7 @@ export default class TypeAssertion {
 
     const typeAssertionString = this.string; ///
 
-    localContext.trace(`Verifying the stated '${typeAssertionString}' type assertion...`);
+    localContext.trace(`Verifying the '${typeAssertionString}' stated type assertion...`);
 
     const typeVerified = this.verifyType(localContext);
 
@@ -115,7 +115,7 @@ export default class TypeAssertion {
     }
 
     if (verifiedWhenStated) {
-      localContext.debug(`...verified the stated '${typeAssertionString}' type assertion.`);
+      localContext.debug(`...verified the '${typeAssertionString}' stated type assertion.`);
     }
 
     return verifiedWhenStated;
@@ -126,7 +126,7 @@ export default class TypeAssertion {
 
     const typeAssertionString = this.string; ///
 
-    localContext.trace(`Verifying the derived '${typeAssertionString}' type assertion...`);
+    localContext.trace(`Verifying the '${typeAssertionString}' derived type assertion...`);
 
     const typeVerified = this.verifyType(localContext);
 
@@ -146,7 +146,7 @@ export default class TypeAssertion {
     }
 
     if (verifiedWhenDerived) {
-      localContext.debug(`...verified the derived '${typeAssertionString}' type assertion.`);
+      localContext.debug(`...verified the '${typeAssertionString}' derived type assertion.`);
     }
 
     return verifiedWhenDerived;

package/src/context/file.js

@@ -54,7 +54,7 @@ export default class FileContext {
     return this.node;
   }
 
-  getFile(filePath) { return this.releaseContext.getFile(filePath); }
+  findFile(filePath) { return this.releaseContext.findFile(filePath); }
 
   getLexer() { return this.releaseContext.getLexer(); }
 
@@ -877,28 +877,7 @@ export default class FileContext {
     });
   }
 
-  static fromJSONAndReleaseContext(json, releaseContext) {
-    const { filePath } = json,
-          tokens = null,
-          node = null,
-          types = [],
-          rules = [],
-          axioms = [],
-          lemmas = [],
-          theorems = [],
-          variables = [],
-          metaLemmas = [],
-          conjectures = [],
-          combinators = [],
-          constructors = [],
-          metatheorems = [],
-          metavariables = [],
-          fileContext = new FileContext(releaseContext, filePath, tokens, node, types, rules, axioms, lemmas, variables, metaLemmas, theorems, conjectures, combinators, constructors, metatheorems, metavariables);
-
-    return fileContext;
-  }
-
-  static fromFileAndReleaseContext(file, releaseContext) {
+  static fromFile(file, releaseContext) {
     const lexer = releaseContext.getLexer(),
           parser = releaseContext.getParser(),
           filePath = file.getPath(),
@@ -922,29 +901,4 @@ export default class FileContext {
 
     return fileContext;
   }
-
-  static fromFilePathAndReleaseContext(filePath, releaseContext) {
-    const file = releaseContext.getFile(filePath),
-          lexer = releaseContext.getLexer(),
-          parser = releaseContext.getParser(),
-          fileContent = file.getContent(),
-          content = fileContent,  ////
-          tokens = lexer.tokenise(content),
-          node = parser.parse(tokens),
-          types = [],
-          rules = [],
-          axioms = [],
-          lemmas = [],
-          theorems = [],
-          variables = [],
-          metaLemmas = [],
-          conjectures = [],
-          combinators = [],
-          constructors = [],
-          metatheorems = [],
-          metavariables = [],
-          fileContext = new FileContext(releaseContext, filePath, tokens, node, types, rules, axioms, lemmas, variables, metaLemmas, theorems, conjectures, combinators, constructors, metatheorems, metavariables);
-
-    return fileContext;
-  }
 }