occam-verify-cli 0.0.981 → 0.0.983

package/src/substitution/statementForMetavariable.js

@@ -2,6 +2,7 @@
 
 import Substitution from "../substitution";
 import TermForVariableSubstitution from "../substitution/termForVariable";
+import FrameForMetavariableSubstitution from "../substitution/frameForMetavariable";
 
 import { nodeQuery } from "../utilities/query";
 import { stripBracketsFromStatement } from "../utilities/brackets";
@@ -98,22 +99,22 @@ export default class StatementForMetavariableSubstitution extends Substitution {
     return string;
   }
 
-  static fromSubstitutionNode(substitutionNode) {
-    let statementForMetavariableSubstitution = null;
-
-    let statementNode = statementNodeQuery(substitutionNode),
-        metavariableNode = metavariableNodeQuery(substitutionNode);
-
-    if (statementNode !== null) {
-      statementNode = stripBracketsFromStatement(statementNode); ///
-
-      const substitution = null;
-
-      statementForMetavariableSubstitution = new StatementForMetavariableSubstitution(statementNode, metavariableNode, substitution);
-    }
-
-    return statementForMetavariableSubstitution;
-  }
+  // static fromSubstitutionNode(substitutionNode) {
+  //   let statementForMetavariableSubstitution = null;
+  //
+  //   let statementNode = statementNodeQuery(substitutionNode),
+  //       metavariableNode = metavariableNodeQuery(substitutionNode);
+  //
+  //   if (statementNode !== null) {
+  //     statementNode = stripBracketsFromStatement(statementNode); ///
+  //
+  //     const substitution = null;
+  //
+  //     statementForMetavariableSubstitution = new StatementForMetavariableSubstitution(statementNode, metavariableNode, substitution);
+  //   }
+  //
+  //   return statementForMetavariableSubstitution;
+  // }
 
   static fromStatementNodeAndMetavariableNode(statementNode, metavariableNode) {
     statementNode = stripBracketsFromStatement(statementNode); ///
@@ -146,10 +147,10 @@ function substitutionFromSubstitutionNode(substitutionNode) {
   }
 
   if (substitution === null) {
-    const statementForMetavariableSubstitution = StatementForMetavariableSubstitution.fromSubstitutionNode(substitutionNode);
+    const frameForMetavariableSubstitution = FrameForMetavariableSubstitution.fromSubstitutionNode(substitutionNode);
 
-    if (statementForMetavariableSubstitution !== null) {
-      substitution = statementForMetavariableSubstitution;  ///
+    if (frameForMetavariableSubstitution !== null) {
+      substitution = frameForMetavariableSubstitution;  ///
     }
   }
 

package/src/verify/assertion/contained.js

@@ -6,7 +6,7 @@ import { isAssertionNegated } from "../../utilities/assertion";
 import { nodeQuery, nodesQuery } from "../../utilities/query";
 
 const variableNodeQuery = nodeQuery("/containedAssertion/term/variable!"),
-      metavariableNodeQuery = nodeQuery("/containedAssertion/statement[0]/metavariable"),
+      metavariableNodeQuery = nodeQuery("/containedAssertion/frame[0]/metavariable"),
       statementVariableNodesQuery = nodesQuery("/containedAssertion/statement[-1]//variable"),
       statementMetavariableNodesQuery = nodesQuery("/containedAssertion/statement[-1]//metavariable");
 

package/src/verify/assertion/defined.js

@@ -9,7 +9,7 @@ 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[-1]/metavariable!");
 
 const verifyDefinedAssertionFunctions = [
   verifyDerivedDefinedAssertion,
@@ -65,17 +65,16 @@ function verifyDerivedDefinedAssertion(definedAssertionNode, assignments, stated
       ///
     } else if (metavariableNode !== null) {
       const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
-            metavariable = localContext.findMetavariableByMetavariableName(metavariableName),
-            metavariableDefined = localContext.isMetavariableDefined(metavariable);
+            metavariableDefinedByMetavariableName = localContext.isMetavariableDefinedByMetavariableName(metavariableName);
 
       if (!assertionNegated) {
-        if (metavariableDefined) {
+        if (metavariableDefinedByMetavariableName) {
           derivedDefinedAssertionVerified = true;
         }
       }
 
       if (assertionNegated) {
-        if (!metavariableDefined) {
+        if (!metavariableDefinedByMetavariableName) {
           derivedDefinedAssertionVerified = true;
         }
       }

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();