occam-verify-cli 0.0.983 → 0.0.985

package/src/verify/assertion/defined.js

@@ -1,15 +1,13 @@
 "use strict";
 
-import verifyTerm from "../../verify/term";
 import metaLevelVerifier from "../../verifier/metaLevel";
 
-import { first } from "../../utilities/array";
 import { nodeQuery } from "../../utilities/query";
 import { isAssertionNegated } from "../../utilities/assertion";
 import { metavariableNameFromMetavariableNode } from "../../utilities/name";
 
 const variableNodeQuery = nodeQuery("/definedAssertion/term/variable!"),
-      metavariableNodeQuery = nodeQuery("/definedAssertion/frame[-1]/metavariable!");
+      metavariableNodeQuery = nodeQuery("/definedAssertion/frame/metavariable!");
 
 const verifyDefinedAssertionFunctions = [
   verifyDerivedDefinedAssertion,
@@ -57,40 +55,43 @@ function verifyDerivedDefinedAssertion(definedAssertionNode, assignments, stated
 
     localContext.trace(`Verifying the '${definedAssertionString}' derived defined assertion...`, definedAssertionNode);
 
-    const assertionNegated = isAssertionNegated(definedAssertionNode),
-          metavariableNode = metavariableNodeQuery(definedAssertionNode),
-          variableNode = variableNodeQuery(definedAssertionNode);
+    const metavariableNode = metavariableNodeQuery(definedAssertionNode);
 
-    if (false) {
-      ///
-    } else if (metavariableNode !== null) {
-      const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
-            metavariableDefinedByMetavariableName = localContext.isMetavariableDefinedByMetavariableName(metavariableName);
+    if (metavariableNode !== null) {
+      const assertionNegated = isAssertionNegated(definedAssertionNode),
+        variableNode = variableNodeQuery(definedAssertionNode);
 
-      if (!assertionNegated) {
-        if (metavariableDefinedByMetavariableName) {
-          derivedDefinedAssertionVerified = true;
-        }
-      }
+      if (false) {
+        ///
+      } else if (metavariableNode !== null) {
+        const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
+              metavariableDefinedByMetavariableName = localContext.isMetavariableDefinedByMetavariableName(metavariableName);
 
-      if (assertionNegated) {
-        if (!metavariableDefinedByMetavariableName) {
-          derivedDefinedAssertionVerified = true;
+        if (!assertionNegated) {
+          if (metavariableDefinedByMetavariableName) {
+            derivedDefinedAssertionVerified = true;
+          }
         }
-      }
-    } else if (variableNode !== null) {
-      const variable = localContext.findVariableByVariableNode(variableNode),
-            variableDefined = localContext.isVariableDefined(variable);
 
-      if (!assertionNegated) {
-        if (variableDefined) {
-          derivedDefinedAssertionVerified = true;
+        if (assertionNegated) {
+          if (!metavariableDefinedByMetavariableName) {
+            derivedDefinedAssertionVerified = true;
+          }
+        }
+      } else if (variableNode !== null) {
+        const variable = localContext.findVariableByVariableNode(variableNode),
+              variableDefined = localContext.isVariableDefined(variable);
+
+        if (!assertionNegated) {
+          if (variableDefined) {
+            derivedDefinedAssertionVerified = true;
+          }
         }
-      }
 
-      if (assertionNegated) {
-        if (!variableDefined) {
-          derivedDefinedAssertionVerified = true;
+        if (assertionNegated) {
+          if (!variableDefined) {
+            derivedDefinedAssertionVerified = true;
+          }
         }
       }
     }
@@ -120,18 +121,3 @@ function verifyStatedDefinedAssertion(definedAssertionNode, assignments, stated,
 
   return statedDefinedAssertionVerified;
 }
-
-function termFromTermNode(termNode, localContext) {
-  const terms = [];
-
-  verifyTerm(termNode, terms, localContext, () => {
-    const verifiedAhead = true;
-
-    return verifiedAhead;
-  });
-
-  const firstTerm = first(terms),
-        term = firstTerm; ///
-
-  return term;
-}

package/src/verify/frame.js

@@ -5,13 +5,12 @@ import frameMetaType from "../metaType/frame";
 import verifyDeclaration from "../verify/declaration";
 import verifyMetavariableGivenMetaType from "./metavariableGivenMetaType";
 
-import { first } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 import { metavariableNameFromMetavariableNode } from "../utilities/name";
 
-const declarationNodesQuery = nodesQuery("/frame/declaration"),
-      metavariableNodeQuery = nodeQuery("/frame/statement!/metavariable"),
-      metavariableNodesQuery = nodesQuery("/frame/statement/metavariable");
+const metavariableNodeQuery = nodeQuery("/frame/metavariable"),
+      declarationNodesQuery = nodesQuery("/frame/declaration"),
+      metavariableNodesQuery = nodesQuery("/frame/metavariable");
 
 const verifyFrameFunctions = [
   verifyDerivedFrame,

package/lib/tokens/constructorDeclaration/bracketed.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-var _typeNames = require("../../typeNames");
-var _tokens = require("../../utilities/tokens");
-var bracketedConstructorTermString = "(".concat(_typeNames.OBJECT_TYPE_NAME, "):").concat(_typeNames.OBJECT_TYPE_NAME);
-var bracketedConstructorDeclarationTokens = (0, _tokens.constructorDeclarationTokensFromTermString)(bracketedConstructorTermString);
-var _default = bracketedConstructorDeclarationTokens;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90b2tlbnMvY29uc3RydWN0b3JEZWNsYXJhdGlvbi9icmFja2V0ZWQuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IE9CSkVDVF9UWVBFX05BTUUgfSBmcm9tIFwiLi4vLi4vdHlwZU5hbWVzXCI7XG5pbXBvcnQgeyBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zRnJvbVRlcm1TdHJpbmcgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL3Rva2Vuc1wiO1xuXG5jb25zdCBicmFja2V0ZWRDb25zdHJ1Y3RvclRlcm1TdHJpbmcgPSBgKCR7T0JKRUNUX1RZUEVfTkFNRX0pOiR7T0JKRUNUX1RZUEVfTkFNRX1gO1xuXG5jb25zdCBicmFja2V0ZWRDb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zID0gY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2Vuc0Zyb21UZXJtU3RyaW5nKGJyYWNrZXRlZENvbnN0cnVjdG9yVGVybVN0cmluZylcblxuZXhwb3J0IGRlZmF1bHQgYnJhY2tldGVkQ29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucztcbiJdLCJuYW1lcyI6WyJicmFja2V0ZWRDb25zdHJ1Y3RvclRlcm1TdHJpbmciLCJPQkpFQ1RfVFlQRV9OQU1FIiwiYnJhY2tldGVkQ29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyIsImNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnNGcm9tVGVybVN0cmluZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBU0E7OztlQUFBOzs7eUJBUGlDO3NCQUMwQjtBQUUzRCxJQUFNQSxpQ0FBaUMsQUFBQyxJQUF3QkMsT0FBckJBLDJCQUFnQixFQUFDLE1BQXFCLE9BQWpCQSwyQkFBZ0I7QUFFaEYsSUFBTUMsd0NBQXdDQyxJQUFBQSxrREFBMEMsRUFBQ0g7SUFFekYsV0FBZUUifQ==

package/lib/tokens/unqualifiedStatement/combinator/bracketed.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-var _metaTypeNames = require("../../../metaTypeNames");
-var _tokens = require("../../../utilities/tokens");
-var bracketedCombinatorStatementString = "(".concat(_metaTypeNames.STATEMENT_META_TYPE_NAME, ")");
-var bracketedCombinatorUnqualifiedStatementTokens = (0, _tokens.unqualifiedStatementTokensFromStatementString)(bracketedCombinatorStatementString);
-var _default = bracketedCombinatorUnqualifiedStatementTokens;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy90b2tlbnMvdW5xdWFsaWZpZWRTdGF0ZW1lbnQvY29tYmluYXRvci9icmFja2V0ZWQuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFNUQVRFTUVOVF9NRVRBX1RZUEVfTkFNRSB9IGZyb20gXCIuLi8uLi8uLi9tZXRhVHlwZU5hbWVzXCI7XG5pbXBvcnQgeyB1bnF1YWxpZmllZFN0YXRlbWVudFRva2Vuc0Zyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi4vLi4vLi4vdXRpbGl0aWVzL3Rva2Vuc1wiO1xuXG5jb25zdCBicmFja2V0ZWRDb21iaW5hdG9yU3RhdGVtZW50U3RyaW5nID0gYCgke1NUQVRFTUVOVF9NRVRBX1RZUEVfTkFNRX0pYDtcblxuY29uc3QgYnJhY2tldGVkQ29tYmluYXRvclVucXVhbGlmaWVkU3RhdGVtZW50VG9rZW5zID0gdW5xdWFsaWZpZWRTdGF0ZW1lbnRUb2tlbnNGcm9tU3RhdGVtZW50U3RyaW5nKGJyYWNrZXRlZENvbWJpbmF0b3JTdGF0ZW1lbnRTdHJpbmcpXG5cbmV4cG9ydCBkZWZhdWx0IGJyYWNrZXRlZENvbWJpbmF0b3JVbnF1YWxpZmllZFN0YXRlbWVudFRva2VucztcbiJdLCJuYW1lcyI6WyJicmFja2V0ZWRDb21iaW5hdG9yU3RhdGVtZW50U3RyaW5nIiwiU1RBVEVNRU5UX01FVEFfVFlQRV9OQU1FIiwiYnJhY2tldGVkQ29tYmluYXRvclVucXVhbGlmaWVkU3RhdGVtZW50VG9rZW5zIiwidW5xdWFsaWZpZWRTdGF0ZW1lbnRUb2tlbnNGcm9tU3RhdGVtZW50U3RyaW5nIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFTQTs7O2VBQUE7Ozs2QkFQeUM7c0JBQ3FCO0FBRTlELElBQU1BLHFDQUFxQyxBQUFDLElBQTRCLE9BQXpCQyx1Q0FBd0IsRUFBQztBQUV4RSxJQUFNQyxnREFBZ0RDLElBQUFBLHFEQUE2QyxFQUFDSDtJQUVwRyxXQUFlRSJ9

package/src/tokens/constructorDeclaration/bracketed.js

@@ -1,10 +0,0 @@
-"use strict";
-
-import { OBJECT_TYPE_NAME } from "../../typeNames";
-import { constructorDeclarationTokensFromTermString } from "../../utilities/tokens";
-
-const bracketedConstructorTermString = `(${OBJECT_TYPE_NAME}):${OBJECT_TYPE_NAME}`;
-
-const bracketedConstructorDeclarationTokens = constructorDeclarationTokensFromTermString(bracketedConstructorTermString)
-
-export default bracketedConstructorDeclarationTokens;

package/src/tokens/unqualifiedStatement/combinator/bracketed.js

@@ -1,10 +0,0 @@
-"use strict";
-
-import { STATEMENT_META_TYPE_NAME } from "../../../metaTypeNames";
-import { unqualifiedStatementTokensFromStatementString } from "../../../utilities/tokens";
-
-const bracketedCombinatorStatementString = `(${STATEMENT_META_TYPE_NAME})`;
-
-const bracketedCombinatorUnqualifiedStatementTokens = unqualifiedStatementTokensFromStatementString(bracketedCombinatorStatementString)
-
-export default bracketedCombinatorUnqualifiedStatementTokens;