occam-verify-cli 1.0.448 → 1.0.472

package/src/process/unify.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { nodeQuery } from "../utilities/query";
+import { findMetaTypeByMetaTypeName } from "../metaTypes";
 import { termFromTermNode, frameFromFrameNode, statementFromStatementNode } from "../utilities/element";
 import { terminalNodeMapFromNodes, areTerminalNodeMapsEqual, isLastRemainingArgumentFunction } from "../utilities/pass";
 
@@ -344,7 +345,7 @@ class CombinatorPass extends Pass {
         context = generalContext; ///
 
         const metaTypeName = metaTypeNode.getMetaTypeName(),
-              metaType = context.findMetaTypeByMetaTypeName(metaTypeName);
+              metaType = findMetaTypeByMetaTypeName(metaTypeName);
 
         context = specificContext;  ///
 
@@ -372,7 +373,7 @@ class CombinatorPass extends Pass {
         context = generalContext; ///
 
         const metaTypeName = metaTypeNode.getMetaTypeName(),
-              metaType = context.findMetaTypeByMetaTypeName(metaTypeName);
+              metaType = findMetaTypeByMetaTypeName(metaTypeName);
 
         context = specificContext;  ///
 
@@ -406,7 +407,7 @@ class CombinatorPass extends Pass {
           context = specificContext;  ///
 
           const term = termFromTermNode(termNode, context),
-                termValidatesGivenType = term.validateGivenType(type, generalContext, specificContext);
+                termValidatesGivenType = term.validateGivenType(type, context);
 
           if (termValidatesGivenType) {
             success = true;
@@ -441,7 +442,7 @@ class ConstructorPass extends Pass {
           context = specificContext;  ///
 
           const term = termFromTermNode(termNode, context),
-                termValidatesGivenType = term.validateGivenType(type, generalContext, specificContext);
+                termValidatesGivenType = term.validateGivenType(type, context);
 
           if (termValidatesGivenType) {
             success = true;
@@ -468,7 +469,7 @@ class MetavariablePass extends Pass {
               type = generalContext.findTypeByNominalTypeName(nominalTypeName),
               context = specificContext, ///
               term = context.findTermByTermNode(termNode),
-              termValidatesGivenType = term.validateGivenType(type, generalContext, specificContext);
+              termValidatesGivenType = term.validateGivenType(type, context);
 
         if (termValidatesGivenType) {
           success = true;
@@ -485,7 +486,7 @@ class IntrinsicLevelPass extends Pass {
     {
       generalNodeQuery: termVariableNodeQuery,
       specificNodeQuery: termNodeQuery,
-      run: (generalTermVariableNode, specificTermNode, substitutions, generalContext, specificContext) => {
+      run: (generalTermVariableNode, specificTermNode, generalContext, specificContext) => {
         let success = false;
 
         const termNode = specificTermNode, ///
@@ -501,7 +502,7 @@ class IntrinsicLevelPass extends Pass {
         context = specificContext;  ///
 
         const term = context.findTermByTermNode(termNode),
-              termUnifies = variable.unifyTerm(term, substitutions, generalContext, specificContext);
+              termUnifies = variable.unifyTerm(term, generalContext, specificContext);
 
         if (termUnifies) {
           success = true;
@@ -611,14 +612,14 @@ export function unifyStatementWithCombinator(statement, combinator, assignments,
   return statementUnifiesWithCombinator;
 }
 
-export function unifyMetavariableIntrinsically(generalMetavariable, specificMetavariable, substitutions, generalContext, specificContext) {
+export function unifyMetavariableIntrinsically(generalMetavariable, specificMetavariable, generalContext, specificContext) {
   let metavariableUnifiesIntrinsically = false;
 
   const generalMetavariableNode = generalMetavariable.getNode(),
         specificMetavariableNode = specificMetavariable.getNode(),
         generalNode = generalMetavariableNode, ///
         specificNode = specificMetavariableNode, ///
-        success = intrinsicLevelPass.run(generalNode, specificNode, substitutions, generalContext, specificContext);
+        success = intrinsicLevelPass.run(generalNode, specificNode, generalContext, specificContext);
 
   if (success) {
     metavariableUnifiesIntrinsically = true;

package/src/tokenTypes.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export const NAME_TOKEN_TYPE = "name";
+export const IDENTIFIER_TOKEN_TYPE = "identifier";

package/src/types.js

@@ -9,9 +9,11 @@ let baseType = null;
 export function baseTypeFromNothing() {
   if (baseType === null) {
     const { Type } = elements,
-          name = BASE_TYPE_SYMBOL;  ///
+          name = BASE_TYPE_SYMBOL,  ///
+          context = null,
+          provisional = false;
 
-    baseType = Type.fromName(name);
+    baseType = Type.fromNameAndProvisional(name, provisional, context);
   }
 
   return baseType;

package/src/utilities/bnf.js

@@ -9,8 +9,9 @@ const { first } = arrayUtilities;
 const bnfLexer = BNFLexer.fromNothing(),
       bnfParser = BNFParser.fromNothing();
 
-export function ruleFromBNF(bnf) {
-  const tokens = bnfLexer.tokensFromBNF(bnf),
+export function ruleFromRuleName(ruleName) {
+  const bnf = ` _ ::= ${ruleName}... <END_OF_LINE> ; `,
+        tokens = bnfLexer.tokensFromBNF(bnf),
         rules = bnfParser.rulesFromTokens(tokens),
         firstRule = first(rules),
         rule = firstRule; ///

package/src/utilities/context.js

@@ -0,0 +1,46 @@
+"use strict";
+
+import ScopedContext from "../context/scoped";
+import LiminalContext from "../context/liminal";
+import LiteralContext from "../context/literal";
+import EphemeralContext from "../context/ephemeral";
+import SyntheticContext from "../context/synthetic";
+
+export function scope(innerFunction, context) {
+  const scopedContext = ScopedContext.fromNothing(context);
+
+  context = scopedContext;  ///
+
+  return innerFunction(context);
+}
+
+export function attempt(innerFunction, context) {
+  const ephemeralContext = EphemeralContext.fromNothing(context);
+
+  context = ephemeralContext;  ///
+
+  return innerFunction(context);
+}
+
+export function liminally(innerFunction, context) {
+  const liminalContext = LiminalContext.fromNothing(context);
+
+  context = liminalContext;  ///
+
+  return innerFunction(context);
+}
+
+export function literally(innerFunction, context) {
+  const literalContext = LiteralContext.fromNothing(context);
+
+  context = literalContext;  ///
+
+  return innerFunction(context);
+}
+
+export function synthetically(innerFunction, generalContext, specificContext) {
+  const syntheticContext = SyntheticContext.fromNothing(generalContext, specificContext),
+        context = syntheticContext;  ///
+
+  return innerFunction(context);
+}