occam-verify-cli 0.0.982 → 0.0.984

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/statement[-1]/metavariable!");
+      metavariableNodeQuery = nodeQuery("/definedAssertion/frame/statement!/metavariable!");
 
 const verifyDefinedAssertionFunctions = [
   verifyDerivedDefinedAssertion,
@@ -57,41 +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),
-            metavariable = localContext.findMetavariableByMetavariableName(metavariableName),
-            metavariableDefined = localContext.isMetavariableDefined(metavariable);
+    if (metavariableNode !== null) {
+      const assertionNegated = isAssertionNegated(definedAssertionNode),
+        variableNode = variableNodeQuery(definedAssertionNode);
 
-      if (!assertionNegated) {
-        if (metavariableDefined) {
-          derivedDefinedAssertionVerified = true;
-        }
-      }
+      if (false) {
+        ///
+      } else if (metavariableNode !== null) {
+        const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
+              metavariableDefinedByMetavariableName = localContext.isMetavariableDefinedByMetavariableName(metavariableName);
 
-      if (assertionNegated) {
-        if (!metavariableDefined) {
-          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;
+          }
         }
       }
     }
@@ -121,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/declaration.js

@@ -47,9 +47,8 @@ function verifyDerivedDeclaration(declarationNode, declarations, stated, localCo
     localContext.trace(`Verifying the '${declarationString}' derived declaration...`, declarationNode);
 
     const metaType = referenceMetaType, ///
-          metavariables = [],
           metavariableNode = metavariableNodeQuery(declarationNode),
-          metavariableVerifiedGivenMetaType = verifyMetavariableGivenMetaType(metavariableNode, metaType, metavariables, localContext);
+          metavariableVerifiedGivenMetaType = verifyMetavariableGivenMetaType(metavariableNode, metaType, localContext);
 
     if (metavariableVerifiedGivenMetaType) {
       const { verifyStatement } = shim,
@@ -60,7 +59,7 @@ function verifyDerivedDeclaration(declarationNode, declarations, stated, localCo
 
       if (statementVerified) {
         const reference = Reference.fromMetavariableNode(metavariableNode),
-          declaration = Declaration.fromReferenceAndStatementNode(reference, statementNode);
+              declaration = Declaration.fromReferenceAndStatementNode(reference, statementNode);
 
         declarations.push(declaration);
 
@@ -85,16 +84,15 @@ function verifyStatedDeclaration(declarationNode, declarations, stated, localCon
     localContext.trace(`Verifying the '${declarationString}' stated declaration...`, declarationNode);
 
     const metaType = referenceMetaType, ///
-          metavariables = [],
           metavariableNode = metavariableNodeQuery(declarationNode),
-          metavariableVerifiedGivenMetaType = verifyMetavariableGivenMetaType(metavariableNode, metaType, metavariables, localContext);
+          metavariableVerifiedGivenMetaType = verifyMetavariableGivenMetaType(metavariableNode, metaType, localContext);
 
     if (metavariableVerifiedGivenMetaType) {
-        const { verifyStatement } = shim,
-              stated = true,
-              assignments = null,
-              statementNode = statementNodeQuery(declarationNode),
-              statementVerified = verifyStatement(statementNode, assignments, stated, localContext);
+      const { verifyStatement } = shim,
+            stated = true,
+            assignments = null,
+            statementNode = statementNodeQuery(declarationNode),
+            statementVerified = verifyStatement(statementNode, assignments, stated, localContext);
 
       if (statementVerified) {
         const reference = Reference.fromMetavariableNode(metavariableNode),

package/src/verify/frame.js

@@ -6,10 +6,12 @@ import verifyDeclaration from "../verify/declaration";
 import verifyMetavariableGivenMetaType from "./metavariableGivenMetaType";
 
 import { first } from "../utilities/array";
-import { nodesQuery } from "../utilities/query";
+import { nodeQuery, nodesQuery } from "../utilities/query";
+import { metavariableNameFromMetavariableNode } from "../utilities/name";
 
 const declarationNodesQuery = nodesQuery("/frame/declaration"),
-      metavariableNodesQuery = nodesQuery("/frame/metavariable");
+      metavariableNodeQuery = nodeQuery("/frame/statement!/metavariable"),
+      metavariableNodesQuery = nodesQuery("/frame/statement/metavariable");
 
 const verifyFrameFunctions = [
   verifyDerivedFrame,
@@ -95,21 +97,14 @@ function verifyStatedFrame(frameNode, frames, stated, localContext) {
           declarationNodesLength = declarationNodes.length;
 
     if (declarationNodesLength === 0) {
-      const metavariableNodes = metavariableNodesQuery(frameNode),
-            metavariableNodesLength = metavariableNodes.length;
+      const metavariableNode = metavariableNodeQuery(frameNode);
 
-      if (metavariableNodesLength === 1) {
-        const firstMetavariableNode = first(metavariableNodes),
-              metavariableNode = firstMetavariableNode,
-              metaType = frameMetaType, ///
-              metavariables = [],
-              metavariableVerifiedGivenMetaType = verifyMetavariableGivenMetaType(metavariableNode, metaType, metavariables, localContext);
+      if (metavariableNode !== null) {
+        const metaType = frameMetaType, ///
+              metavariableVerifiedGivenMetaType = verifyMetavariableGivenMetaType(metavariableNode, metaType, localContext);
 
         if (metavariableVerifiedGivenMetaType) {
-          const firstMetavariable = first(metavariables),
-                metavariable = firstMetavariable,
-
-          frame = Frame.fromMetavariable(metavariable);
+          const frame = Frame.fromMetavariableNode(metavariableNode);
 
           frames.push(frame);
 
@@ -138,13 +133,10 @@ function verifyMetavariable(metavariableNode, declarations, localContext) {
   localContext.trace(`Verifying the '${metavariableString}' metavariable...`, metavariableNode);
 
   const metaType = frameMetaType, ///
-        metavariables = [],
-        metavariableVerifiedGivenMetaType = verifyMetavariableGivenMetaType(metavariableNode, metaType, metavariables, localContext);
+        metavariableVerifiedGivenMetaType = verifyMetavariableGivenMetaType(metavariableNode, metaType, localContext);
 
   if (metavariableVerifiedGivenMetaType) {
-    const firstMetavariable = first(metavariables),
-          metavariable = firstMetavariable, ///
-          metavariableName = metavariable.getName(),
+    const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
           judgement = localContext.findJudgementByMetavariableName(metavariableName);
 
     if (judgement !== null) {

package/src/verify/judgement.js

@@ -95,33 +95,24 @@ function verifyStatedJudgement(judgementNode, assignments, stated, localContext)
           frameVerified = verifyFrame(frameNode, frames, stated, localContext);
 
     if (frameVerified) {
-      const firstFrame = first(frames),
-            frame = firstFrame, ///
-            metavariable = frame.getMetavariable(),
-            metavariableNode = metavariable.getNode(),
-            metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
-            judgementPresent = localContext.isJudgementPresentByMetavariableName(metavariableName);
-
-      if (!judgementPresent) {
-        const declarations = [],
-              declarationNode = declarationNodeQuery(judgementNode),
-              declarationVerified = verifyDeclaration(declarationNode, declarations, stated, localContext);
-
-        if (declarationVerified) {
-          if (assignments !== null) {
-            const firstDeclaration = first(declarations),
-                  declaration = firstDeclaration, ///
-                  judgement = Judgement.fromJudgementNodeFrameAndDeclaration(judgementNode, frame, declaration),
-                  judgementAssignment = JudgementAssignment.fromJudgement(judgement),
-                  assignment = judgementAssignment;
-
-            assignments.push(assignment);
-          }
-
-          statedJudgementVerified = true;
+      const declarations = [],
+            declarationNode = declarationNodeQuery(judgementNode),
+            declarationVerified = verifyDeclaration(declarationNode, declarations, stated, localContext);
+
+      if (declarationVerified) {
+        if (assignments !== null) {
+          const firstDeclaration = first(declarations),
+                firstFrame = first(frames),
+                frame = firstFrame,
+                declaration = firstDeclaration, ///
+                judgement = Judgement.fromJudgementNodeFrameAndDeclaration(judgementNode, frame, declaration),
+                judgementAssignment = JudgementAssignment.fromJudgement(judgement),
+                assignment = judgementAssignment;
+
+          assignments.push(assignment);
         }
-      } else {
-        localContext.trace(`There is already a judgement for the '${metavariableName}' metavariable.`, judgementNode);
+
+        statedJudgementVerified = true;
       }
     }
 

package/src/verify/metavariableGivenMetaType.js

@@ -4,7 +4,7 @@ import metavariableUnifier from "../unifier/metavariable";
 
 import { metavariableNameFromMetavariableNode } from "../utilities/name";
 
-export default function verifyMetavariableGivenMetaType(metavariableNode, metaType, metavariables, localContext) {
+export default function verifyMetavariableGivenMetaType(metavariableNode, metaType, localContext) {
   let metavariableVerifiedGivenMetaType = false;
 
   const metaTypeName = metaType.getName(),
@@ -27,11 +27,7 @@ export default function verifyMetavariableGivenMetaType(metavariableNode, metaTy
 
       const unified = metavariableUnifier.unify(metavariableNodeA, metavariableNodeB, localContext);
 
-      if (unified) {
-        metavariables.push(metavariable);
-
-        metavariableVerifiedGivenMetaType = true;
-      }
+      metavariableVerifiedGivenMetaType = unified;  ///
     } else {
       const metavariableMetaTypeName = metavariableMetaType.getName();
 

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;