occam-verify-cli 0.0.455 → 0.0.457

package/src/verify/statement/unqualified.js

@@ -14,25 +14,31 @@ export default function verifyUnqualifiedStatement(unqualifiedStatementNode, pro
 
   proofContext.begin(unqualifiedStatementNode);
 
+  const unqualifiedStatementString = nodeAsString(unqualifiedStatementNode);
+
+  proofContext.debug(`Verifying the '${unqualifiedStatementString}' unqualified statement...`);
+
   const statementNode = statementNodeQuery(unqualifiedStatementNode);
 
   if (statementNode !== null) {
-    const derived = proofContext.isDerived();
+    const statementVerified = verifyStatement(statementNode, proofContext);
 
-    if (derived) {
-      const assertion = Assertion.fromStatementNode(statementNode),
-            assertionMatches = proofContext.matchAssertion(assertion);
+    if (statementVerified) {
+      const derived = proofContext.isDerived();
 
-      unqualifiedStatementVerified = assertionMatches;  ///
-    } else {
-      unqualifiedStatementVerified = true;
+      if (derived) {
+        const assertion = Assertion.fromStatementNode(statementNode),
+              assertionMatches = proofContext.matchAssertion(assertion);
+
+        unqualifiedStatementVerified = assertionMatches;  ///
+      } else {
+        unqualifiedStatementVerified = true;
+      }
     }
   }
 
   if (unqualifiedStatementVerified) {
-    const statementString = nodeAsString(statementNode);
-
-    proofContext.debug(`Verified the '${statementString}' unqualified statement.`);
+    proofContext.info(`Verified the '${unqualifiedStatementString}' unqualified statement.`);
   }
 
   unqualifiedStatementVerified ?

package/src/verify/statement.js

@@ -20,19 +20,16 @@ export default function verifyStatement(statementNode, proofContext) {
 
   proofContext.debug(`Verifying the '${statementString}' statement...`);
 
-  if (false) {
-    ///
-  } else if (equalityNode !== null) {
+  if (equalityNode !== null) {
     const equalityVerified = verifyEquality(equalityNode, proofContext);
 
     statementVerified = equalityVerified; ///
-  } else if (typeAssertionNode !== null) {
-    const types = [],
-          typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, types, proofContext);
+  }
+
+  if (typeAssertionNode !== null) {
+    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, proofContext);
 
     statementVerified = typeAssertionVerified; ///
-  } else {
-    debugger
   }
 
   statementVerified ?

package/src/verify/statementAsCombinator.js

@@ -11,6 +11,10 @@ export default function verifyStatementAsCombinator(statementNode, fileContext)
 
   fileContext.begin(statementNode);
 
+  const statementString = nodeAsString(statementNode);
+
+  fileContext.debug(`Verifying the '${statementString}' combinator....`);
+
   const nonTerminalNode = statementNode,  ///
         childNodes = nonTerminalNode.getChildNodes(),
         childNodesVerified = verifyChildNodes(childNodes, fileContext);
@@ -24,8 +28,6 @@ export default function verifyStatementAsCombinator(statementNode, fileContext)
   }
 
   if (statementVerifiedAsCombinator) {
-    const statementString = nodeAsString(statementNode);
-
     fileContext.info(`Verified the '${statementString}' combinator.`);
   }
 

package/src/verify/term.js

@@ -14,6 +14,10 @@ export default function verifyTerm(termNode, types, context) {
 
   context.begin(termNode);
 
+  const termString = nodeAsString(termNode);
+
+  context.debug(`Verifying the '${termString}' term...`);
+
   const variables = [],
         termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context);
 
@@ -33,6 +37,10 @@ export default function verifyTerm(termNode, types, context) {
     }
   }
 
+  if (termVerified) {
+    context.info(`Verified the '${termString}' term.`);
+  }
+
   termVerified ?
     context.complete(termNode) :
       context.halt(termNode);

package/src/verify/termAsConstructor.js

@@ -18,7 +18,11 @@ export default function verifyTermAsConstructor(termNode, typeNode, fileContext)
   let type = null;
 
   const nonTerminalNode = termNode,  ///
-        childNodes = nonTerminalNode.getChildNodes(),
+        termString = nodeAsString(termNode);
+
+  fileContext.debug(`Verifying the '${termString}' constructor...`);
+
+  const childNodes = nonTerminalNode.getChildNodes(),
         childNodesVerified = verifyChildNodes(childNodes, fileContext);
 
   if (childNodesVerified) {
@@ -32,8 +36,6 @@ export default function verifyTermAsConstructor(termNode, typeNode, fileContext)
       if (type !== null) {
         termVerifiedAsConstructor = true;
       } else {
-        const termString = nodeAsString(termNode);
-
         fileContext.error(`The '${termString}' constructor's '${typeName}' type is missing.`);
       }
     }
@@ -46,8 +48,6 @@ export default function verifyTermAsConstructor(termNode, typeNode, fileContext)
   }
 
   if (termVerifiedAsConstructor) {
-    const termString = nodeAsString(termNode);
-
     fileContext.info(`Verified the '${termString}' constructor.`);
   }
 

package/src/verify/theorem.js

@@ -6,13 +6,10 @@ import ProofContext from "../context/proof";
 import verifyUnqualifiedStatement from "../verify/statement/unqualified";
 import verifyIndicativeConditional from "../verify/indicativeConditional";
 
-import { front, last } from "../utilities/array";
 import { nodesAsString } from "../utilities/string";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const labelNodesQuery = nodesQuery("/theorem/label"),
-      statementNodeQuery = nodeQuery("/unqualifiedStatement/statement!"),
-      statementNodesQuery = nodesQuery("/indicativeConditional/unqualifiedStatement/statement!"),
       unqualifiedStatementNodeQuery = nodeQuery("/theorem/unqualifiedStatement!"),
       indicativeConditionalNodeQuery = nodeQuery("/theorem/indicativeConditional!");
 
@@ -28,40 +25,29 @@ export default function verifyTheorem(theoremNode, fileContext) {
   fileContext.debug(`Verifying the '${labelsString}' theorem...`);
 
   const labels = [],
-        labelsVerified = verifyLabels(labelNodes, labels, fileContext);
+    labelsVerified = verifyLabels(labelNodes, labels, fileContext);
 
   if (labelsVerified) {
     const unqualifiedStatementNode = unqualifiedStatementNodeQuery(theoremNode),
           indicativeConditionalNode = indicativeConditionalNodeQuery(theoremNode);
 
-    if (unqualifiedStatementNode !== null) {
-      const unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
-
-      if (unqualifiedStatementVerified) {
-        const statementNode = statementNodeQuery(unqualifiedStatementNode),
-              theorem = Theorem.fromLabelsAndStatementNode(labels, statementNode);
-
-        fileContext.addTheorem(theorem);
+    let unqualifiedStatementVerified = false,
+      indicativeConditionalVerified = false;
 
-        theoremVerified = true;
-      }
+    if (unqualifiedStatementNode !== null) {
+      unqualifiedStatementVerified = verifyUnqualifiedStatement(unqualifiedStatementNode, proofContext);
     }
 
     if (indicativeConditionalNode !== null) {
-      const indicativeConditionalVerified = verifyIndicativeConditional(indicativeConditionalNode, proofContext);
+      indicativeConditionalVerified = verifyIndicativeConditional(indicativeConditionalNode, proofContext);
+    }
 
-      if (indicativeConditionalVerified !== null) {
-        const statementNodes = statementNodesQuery(indicativeConditionalNode),
-              lastStatementNode = last(statementNodes),
-              frontStatementNodes = front(statementNodes),
-              consequentStatementNode = lastStatementNode,  ///
-              suppositionStatementNodes = frontStatementNodes,  ///
-              theorem = Theorem.fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode);
+    if (unqualifiedStatementVerified || indicativeConditionalVerified) {
+      const theorem = Theorem.fromLabelsUnqualifiedStatementNodeAndIndicativeConditionalNode(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
-        fileContext.addTheorem(theorem);
+      fileContext.addTheorem(theorem);
 
-        theoremVerified = true;
-      }
+      theoremVerified = true;
     }
   }
 

package/src/verify/type.js

@@ -10,7 +10,9 @@ export default function verifyType(typeNode, superTypeNode, fileContext) {
 
   fileContext.begin(typeNode);
 
-  let type = null;
+  const typeString = nodeAsString(typeNode);
+
+  fileContext.debug(`Verifying the '${typeString}' type...`);
 
   const typeName = typeNameFromTypeNode(typeNode),
         typePresent = fileContext.isTypePresentByTypeName(typeName);
@@ -18,6 +20,8 @@ export default function verifyType(typeNode, superTypeNode, fileContext) {
   if (typePresent) {
     fileContext.error(`The type '${typeName}' is already present.`);
   } else {
+    let type;
+
     const superTypeName = typeNameFromTypeNode(superTypeNode);
 
     if (superTypeName === null) {
@@ -31,17 +35,15 @@ export default function verifyType(typeNode, superTypeNode, fileContext) {
         type = Type.fromTypeNameAndSuperType(typeName, superType);
       }
     }
-  }
 
-  if (type !== null) {
-    fileContext.addType(type);
+    if (type !== null) {
+      fileContext.addType(type);
 
-    typeVerified = true;
+      typeVerified = true;
+    }
   }
 
   if (typeVerified) {
-    const typeString = nodeAsString(typeNode);
-
     fileContext.info(`Verified the '${typeString}' type.`);
   }
 

package/src/verify/variable.js

@@ -10,7 +10,9 @@ export default function verifyVariable(variableNode, typeNode, fileContext) {
 
   fileContext.begin(variableNode);
 
-  let variable = null;
+  const variableString = nodeAsString(variableNode);
+
+  fileContext.debug(`Verifying the '${variableString}' variable...`);
 
   const variableName = variableNameFromVariableNode(variableNode),
         variablePresent = fileContext.isVariablePresentByVariableName(variableName);
@@ -18,6 +20,8 @@ export default function verifyVariable(variableNode, typeNode, fileContext) {
   if (variablePresent) {
     fileContext.error(`The variable '${variableName}' is already present.`);
   } else {
+    let variable;
+
     const typeName = typeNameFromTypeNode(typeNode);
     
     if (typeName === null) {
@@ -45,8 +49,6 @@ export default function verifyVariable(variableNode, typeNode, fileContext) {
   }
 
   if (variableVerified) {
-    const variableString = nodeAsString(variableNode);
-
     fileContext.info(`Verified the '${variableString}' variable.`);
   }
 

package/lib/utilities/node.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    termNodeFromTermJSON: function() {
-        return termNodeFromTermJSON;
-    },
-    labelNodeFromLabelJSON: function() {
-        return labelNodeFromLabelJSON;
-    },
-    statementNodeFromStatementJSON: function() {
-        return statementNodeFromStatementJSON;
-    },
-    metastatementNodeFromMetastatementJSON: function() {
-        return metastatementNodeFromMetastatementJSON;
-    }
-});
-var _query = require("../utilities/query");
-var _ruleNames = require("../ruleNames");
-var statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement"), metastatementNodeQuery = (0, _query.nodeQuery)("/unqualifiedMetastatement/metastatement");
-function termNodeFromTermJSON(termJSON, releaseContext) {
-    var ruleName = _ruleNames.TERM_RULE_NAME, content = termJSON, node = releaseContext.nodeFromContentAndRuleName(content, ruleName), termNode = node; ///
-    return termNode;
-}
-function labelNodeFromLabelJSON(labelJSON, releaseContext) {
-    var content = labelJSON, ruleName = _ruleNames.LABEL_RULE_NAME, node = releaseContext.nodeFromContentAndRuleName(content, ruleName), labelNode = node; ///
-    return labelNode;
-}
-function statementNodeFromStatementJSON(statementJSON, releaseContext) {
-    var ruleName = _ruleNames.UNQUALIFIED_STATEMENT_RULE_NAME, content = "".concat(statementJSON, "\n"), node = releaseContext.nodeFromContentAndRuleName(content, ruleName), unqualifiedStatementNode = node, statementNode = statementNodeQuery(unqualifiedStatementNode);
-    return statementNode;
-}
-function metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext) {
-    var ruleName = _ruleNames.UNQUALIFIED_METASTATEMENT_RULE_NAME, content = "".concat(metastatementJSON, "\n"), node = releaseContext.nodeFromContentAndRuleName(content, ruleName), unqualifiedMetastatementNode = node, metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
-    return metastatementNode;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbm9kZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgVEVSTV9SVUxFX05BTUUsXG4gICAgICAgICBMQUJFTF9SVUxFX05BTUUsXG4gICAgICAgICBVTlFVQUxJRklFRF9TVEFURU1FTlRfUlVMRV9OQU1FLFxuICAgICAgICAgVU5RVUFMSUZJRURfTUVUQVNUQVRFTUVOVF9SVUxFX05BTUUgfSBmcm9tIFwiLi4vcnVsZU5hbWVzXCI7XG5cbmNvbnN0IHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bnF1YWxpZmllZFN0YXRlbWVudC9zdGF0ZW1lbnRcIiksXG4gICAgICBtZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3VucXVhbGlmaWVkTWV0YXN0YXRlbWVudC9tZXRhc3RhdGVtZW50XCIpO1xuXG5leHBvcnQgZnVuY3Rpb24gdGVybU5vZGVGcm9tVGVybUpTT04odGVybUpTT04sIHJlbGVhc2VDb250ZXh0KSB7XG4gIGNvbnN0IHJ1bGVOYW1lID0gVEVSTV9SVUxFX05BTUUsXG4gICAgICAgIGNvbnRlbnQgPSB0ZXJtSlNPTiwgLy8vXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIHRlcm1Ob2RlID0gbm9kZTsgIC8vL1xuXG4gIHJldHVybiB0ZXJtTm9kZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGxhYmVsTm9kZUZyb21MYWJlbEpTT04obGFiZWxKU09OLCByZWxlYXNlQ29udGV4dCkge1xuICBjb25zdCBjb250ZW50ID0gbGFiZWxKU09OLCAvLy9cbiAgICAgICAgcnVsZU5hbWUgPSBMQUJFTF9SVUxFX05BTUUsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIGxhYmVsTm9kZSA9IG5vZGU7IC8vL1xuXG4gIHJldHVybiBsYWJlbE5vZGU7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudEpTT04oc3RhdGVtZW50SlNPTiwgcmVsZWFzZUNvbnRleHQpIHtcbiAgY29uc3QgcnVsZU5hbWUgPSBVTlFVQUxJRklFRF9TVEFURU1FTlRfUlVMRV9OQU1FLFxuICAgICAgICBjb250ZW50ID0gYCR7c3RhdGVtZW50SlNPTn1cbmAsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSA9IG5vZGUsICAvLy9cbiAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiBzdGF0ZW1lbnROb2RlO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbWV0YXN0YXRlbWVudE5vZGVGcm9tTWV0YXN0YXRlbWVudEpTT04obWV0YXN0YXRlbWVudEpTT04sIHJlbGVhc2VDb250ZXh0KSB7XG4gIGNvbnN0IHJ1bGVOYW1lID0gVU5RVUFMSUZJRURfTUVUQVNUQVRFTUVOVF9SVUxFX05BTUUsXG4gICAgICAgIGNvbnRlbnQgPSBgJHttZXRhc3RhdGVtZW50SlNPTn1cbmAsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUgPSBub2RlLCAgLy8vXG4gICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICByZXR1cm4gbWV0YXN0YXRlbWVudE5vZGU7XG59XG4iXSwibmFtZXMiOlsidGVybU5vZGVGcm9tVGVybUpTT04iLCJsYWJlbE5vZGVGcm9tTGFiZWxKU09OIiwic3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRKU09OIiwibWV0YXN0YXRlbWVudE5vZGVGcm9tTWV0YXN0YXRlbWVudEpTT04iLCJzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJtZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5IiwidGVybUpTT04iLCJyZWxlYXNlQ29udGV4dCIsInJ1bGVOYW1lIiwiVEVSTV9SVUxFX05BTUUiLCJjb250ZW50Iiwibm9kZSIsIm5vZGVGcm9tQ29udGVudEFuZFJ1bGVOYW1lIiwidGVybU5vZGUiLCJsYWJlbEpTT04iLCJMQUJFTF9SVUxFX05BTUUiLCJsYWJlbE5vZGUiLCJzdGF0ZW1lbnRKU09OIiwiVU5RVUFMSUZJRURfU1RBVEVNRU5UX1JVTEVfTkFNRSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJtZXRhc3RhdGVtZW50SlNPTiIsIlVOUVVBTElGSUVEX01FVEFTVEFURU1FTlRfUlVMRV9OQU1FIiwidW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGFzdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFXZ0JBLG9CQUFvQjtlQUFwQkE7O0lBU0FDLHNCQUFzQjtlQUF0QkE7O0lBU0FDLDhCQUE4QjtlQUE5QkE7O0lBV0FDLHNDQUFzQztlQUF0Q0E7OztxQkF0Q1U7eUJBSTBCO0FBRXBELElBQU1DLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQyxvQ0FDL0JDLHlCQUF5QkQsSUFBQUEsZ0JBQVMsRUFBQztBQUVsQyxTQUFTTCxxQkFBcUJPLFFBQVEsRUFBRUMsY0FBYyxFQUFFO0lBQzdELElBQU1DLFdBQVdDLHlCQUFjLEVBQ3pCQyxVQUFVSixVQUNWSyxPQUFPSixlQUFlSywwQkFBMEIsQ0FBQ0YsU0FBU0YsV0FDMURLLFdBQVdGLE1BQU8sR0FBRztJQUUzQixPQUFPRTtBQUNUO0FBRU8sU0FBU2IsdUJBQXVCYyxTQUFTLEVBQUVQLGNBQWMsRUFBRTtJQUNoRSxJQUFNRyxVQUFVSSxXQUNWTixXQUFXTywwQkFBZSxFQUMxQkosT0FBT0osZUFBZUssMEJBQTBCLENBQUNGLFNBQVNGLFdBQzFEUSxZQUFZTCxNQUFNLEdBQUc7SUFFM0IsT0FBT0s7QUFDVDtBQUVPLFNBQVNmLCtCQUErQmdCLGFBQWEsRUFBRVYsY0FBYyxFQUFFO0lBQzVFLElBQU1DLFdBQVdVLDBDQUErQixFQUMxQ1IsVUFBVSxBQUFDLEdBQWdCLE9BQWRPLGVBQWMsT0FFM0JOLE9BQU9KLGVBQWVLLDBCQUEwQixDQUFDRixTQUFTRixXQUMxRFcsMkJBQTJCUixNQUMzQlMsZ0JBQWdCakIsbUJBQW1CZ0I7SUFFekMsT0FBT0M7QUFDVDtBQUVPLFNBQVNsQix1Q0FBdUNtQixpQkFBaUIsRUFBRWQsY0FBYyxFQUFFO0lBQ3hGLElBQU1DLFdBQVdjLDhDQUFtQyxFQUM5Q1osVUFBVSxBQUFDLEdBQW9CLE9BQWxCVyxtQkFBa0IsT0FFL0JWLE9BQU9KLGVBQWVLLDBCQUEwQixDQUFDRixTQUFTRixXQUMxRGUsK0JBQStCWixNQUMvQmEsb0JBQW9CbkIsdUJBQXVCa0I7SUFFakQsT0FBT0M7QUFDVCJ9

package/src/utilities/node.js

@@ -1,50 +0,0 @@
-"use strict";
-
-import { nodeQuery } from "../utilities/query";
-import { TERM_RULE_NAME,
-         LABEL_RULE_NAME,
-         UNQUALIFIED_STATEMENT_RULE_NAME,
-         UNQUALIFIED_METASTATEMENT_RULE_NAME } from "../ruleNames";
-
-const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement"),
-      metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement");
-
-export function termNodeFromTermJSON(termJSON, releaseContext) {
-  const ruleName = TERM_RULE_NAME,
-        content = termJSON, ///
-        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
-        termNode = node;  ///
-
-  return termNode;
-}
-
-export function labelNodeFromLabelJSON(labelJSON, releaseContext) {
-  const content = labelJSON, ///
-        ruleName = LABEL_RULE_NAME,
-        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
-        labelNode = node; ///
-
-  return labelNode;
-}
-
-export function statementNodeFromStatementJSON(statementJSON, releaseContext) {
-  const ruleName = UNQUALIFIED_STATEMENT_RULE_NAME,
-        content = `${statementJSON}
-`,
-        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
-        unqualifiedStatementNode = node,  ///
-        statementNode = statementNodeQuery(unqualifiedStatementNode);
-
-  return statementNode;
-}
-
-export function metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext) {
-  const ruleName = UNQUALIFIED_METASTATEMENT_RULE_NAME,
-        content = `${metastatementJSON}
-`,
-        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
-        unqualifiedMetastatementNode = node,  ///
-        metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
-
-  return metastatementNode;
-}