occam-verify-cli 0.0.1119 → 0.0.1121

package/src/unifier/metaLevel.js

@@ -9,9 +9,11 @@ import { nodeQuery } from "../utilities/query";
 
 const termNodeQuery = nodeQuery("/term"),
       frameNodeQuery = nodeQuery("/frame"),
+      referenceNodeQuery = nodeQuery("/reference"),
       statementNodeQuery = nodeQuery("/statement"),
       termVariableNodeQuery = nodeQuery("/term/variable!"),
       frameMetavariableNodeQuery = nodeQuery("/frame/metavariable!"),
+      referenceMetavariableNodeQuery = nodeQuery("/reference/metavariable!"),
       statementMetavariableNodeQuery = nodeQuery("/statement/metavariable!");
 
 class MetaLevelUnifier extends Unifier {
@@ -68,6 +70,31 @@ class MetaLevelUnifier extends Unifier {
         return statementUnified;
       }
     },
+    {
+      generalNodeQuery: referenceMetavariableNodeQuery,
+      specificNodeQuery: referenceNodeQuery,
+      unify: (generalReferenceMetavariableNode, specificReferenceNode, substitutions, generalContext, specificContext) => {
+        let referenceUnified;
+
+        const { Reference, Metavariable } = dom,
+              referenceNode = specificReferenceNode, ///
+              metavariableNode = generalReferenceMetavariableNode;  ///
+
+        let context;
+
+        context = generalContext; ///
+
+        const metavariable = Metavariable.fromMetavariableNode(metavariableNode, context);
+
+        context = specificContext;  ///
+
+        const reference = Reference.fromReferenceNode(referenceNode, context);
+
+        referenceUnified = metavariable.unifyReference(reference, substitutions, generalContext, specificContext);
+
+        return referenceUnified;
+      }
+    },
     {
       generalNodeQuery: frameMetavariableNodeQuery,
       specificNodeQuery: frameNodeQuery,

package/src/unifier/metavariable.js

@@ -34,7 +34,7 @@ class MetavariableUnifier extends Unifier {
               termNode = specificTermNode, ///
               typeName = typeNameFromTypeNode(typeNode),
               type = generalContext.findTypeByTypeName(typeName),
-              context = generalContext, ///
+              context = specificContext, ///
               term = Term.fromTermNode(termNode, context),
               termVerifiedGivenType = term.verifyGivenType(type, generalContext, specificContext);
 

package/src/utilities/brackets.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import dom from "../dom";
+import LocalContext from "../context/local";
 import combinatorBracketedContext from "../context/bracketed/combinator";
 import constructorBracketedContext from "../context/bracketed/constructor";
 
@@ -9,6 +11,36 @@ import { BRACKETED_TERM_DEPTH, BRACKETED_STATEMENT_DEPTH } from "../constants";
 const bracketedTermChildNodeQuery = nodeQuery("/term/argument/term"),
       bracketedStatementChildNodeQuery = nodeQuery("/statement/metaArgument/statement");
 
+export function stripBracketsFromTerm(term, context) {
+  const termNode = term.getNode(),
+        bracketedTermChildNode = bracketedTermChildNodeFromTermNode(termNode);
+
+  if (bracketedTermChildNode !== null) {
+    const { Term } = dom,
+          termNode = bracketedTermChildNode;  ///
+
+    term = Term.fromStatementNode(termNode, context);
+  }
+
+  return term;
+}
+
+export function stripBracketsFromStatement(statement, context) {
+  const statementNode = statement.getNode(),
+        bracketedStatementChildNode = bracketedStatementChildNodeFromStatementNode(statementNode);
+
+  if (bracketedStatementChildNode !== null) {
+    context = contextFromStatement(statement, context); ///
+
+    const { Statement } = dom,
+          statementNode = bracketedStatementChildNode;  ///
+
+    statement = Statement.fromStatementNode(statementNode, context);
+  }
+
+  return statement;
+}
+
 export function stripBracketsFromTermNode(termNode) {
   const bracketedTermChildNode = bracketedTermChildNodeFromTermNode(termNode);
 
@@ -56,3 +88,13 @@ export function bracketedStatementChildNodeFromStatementNode(statementNode) {
 
   return bracketedStatementChildNode;
 }
+
+function contextFromStatement(statement, context) {
+  const statementTokens = statement.getTokens(),
+    tokens = statementTokens, ///
+    localContext = LocalContext.fromContextAndTokens(context, tokens);
+
+  context = localContext; ///
+
+  return context;
+}

package/src/utilities/unification.js

@@ -5,6 +5,7 @@ import labelUnifier from "../unifier/label";
 import equalityUnifier from "../unifier/equality";
 import metaLevelUnifier from "../unifier/metaLevel";
 import metavariableUnifier from "../unifier/metavariable";
+import intrinsicLevelUnifier from "../unifier/intrinsicLevel";
 import termWithConstructorUnifier from "../unifier/termWithConstructor";
 import statementWithCombinatorUnifier from "../unifier/statementWithCombinator";
 
@@ -134,6 +135,23 @@ export function unifyStatementWithCombinator(statement, combinator, assignments,
   return statementUnifiedWithCombinator;
 }
 
+export function unifyMetavariableIntrinsically(generalMetavariable, specificMetavariable, substitutions, generalContext, specificContext) {
+  let metavariableUnifiedIntrinsically;
+
+  const generalMetavariableNode = generalMetavariable.getNode(),
+        specificMetavariableNode = specificMetavariable.getNode(),
+        generalMetavariableTokens = generalMetavariable.getTokens(),
+        specificMetavariableTokens = specificMetavariable.getTokens();
+
+  generalContext = contextFromTokens(generalMetavariableTokens, generalContext); ///
+
+  specificContext = contextFromTokens(specificMetavariableTokens, specificContext); ///
+
+  metavariableUnifiedIntrinsically = intrinsicLevelUnifier.unify(generalMetavariableNode, specificMetavariableNode, substitutions, generalContext, specificContext);
+
+  return metavariableUnifiedIntrinsically;
+}
+
 function contextFromTokens(tokens, context) {
   const localContext = LocalContext.fromContextAndTokens(context, tokens);
 

package/src/utilities/verification.js

@@ -3,38 +3,24 @@
 import dom from "../dom";
 import LocalContext from "../context/local";
 
-import { bracketedTermChildNodeFromTermNode, bracketedStatementChildNodeFromStatementNode } from "../utilities/brackets";
+export function metavariableFromFrame(frame, context) {
+  context = contextFromFrame(frame, context); ///
 
-export function stripBracketsFromTerm(term, context) {
-  const termNode = term.getNode(),
-        bracketedTermChildNode = bracketedTermChildNodeFromTermNode(termNode);
-
-  if (bracketedTermChildNode !== null) {
-    context = contextFromTerm(term, context); ///
-
-    const { Term } = dom,
-          termNode = bracketedTermChildNode;  ///
-
-    term = Term.fromStatementNode(termNode, context);
-  }
+  const { Metavariable } = dom,
+        frameNode = frame.getNode(),
+        metavariable = Metavariable.fromFrameNode(frameNode, context);
 
-  return term;
+  return metavariable;
 }
 
-export function stripBracketsFromStatement(statement, context) {
-  const statementNode = statement.getNode(),
-        bracketedStatementChildNode = bracketedStatementChildNodeFromStatementNode(statementNode);
-
-  if (bracketedStatementChildNode !== null) {
-    context = contextFromStatement(statement, context); ///
+export function metavariableFromReference(reference, context) {
+  context = contextFromReference(reference, context); ///
 
-    const { Statement } = dom,
-          statementNode = bracketedStatementChildNode;  ///
-
-    statement = Statement.fromStatementNode(statementNode, context);
-  }
+  const { Metavariable } = dom,
+    referenceNode = reference.getNode(),
+    metavariable = Metavariable.fromReferenceNode(referenceNode, context);
 
-  return statement;
+  return metavariable;
 }
 
 export function equalityFromStatement(statement, context) {
@@ -107,6 +93,26 @@ export function containedAssertionFromStatement(statement, context) {
   return containedAssertion;
 }
 
+function contextFromFrame(frame, context) {
+  const frameTokens = frame.getTokens(),
+        tokens = frameTokens, ///
+        localContext = LocalContext.fromContextAndTokens(context, tokens);
+
+  context = localContext; ///
+
+  return context;
+}
+
+function contextFromReference(reference, context) {
+  const referenceTokens = reference.getTokens(),
+        tokens = referenceTokens, ///
+        localContext = LocalContext.fromContextAndTokens(context, tokens);
+
+  context = localContext; ///
+
+  return context;
+}
+
 function contextFromStatement(statement, context) {
   const statementTokens = statement.getTokens(),
         tokens = statementTokens, ///
@@ -115,4 +121,4 @@ function contextFromStatement(statement, context) {
   context = localContext; ///
 
   return context;
-}
+}