occam-verify-cli 1.0.421 → 1.0.427

package/src/utilities/brackets.js

@@ -1,19 +1,16 @@
 "use strict";
 
-import ontology from "../ontology";
-import combinatorBracketedContext from "../context/bracketed/combinator";
-import constructorBracketedContext from "../context/bracketed/constructor";
-
-import { contextFromStatement } from "../utilities/context";
+import elements from "../elements";
 
 import { BRACKETED_TERM_DEPTH, BRACKETED_STATEMENT_DEPTH } from "../constants";
+import { instantiateBracketedCombinatorStatement, instantiateBracketedConstructorTerm } from "../process/instantiate";
 
 export function stripBracketsFromTerm(term, context) {
   const termNode = term.getNode(),
         bracketedTermChildNode = bracketedTermChildNodeFromTermNode(termNode);
 
   if (bracketedTermChildNode !== null) {
-    const { Term } = ontology,
+    const { Term } = elements,
           termNode = bracketedTermChildNode;  ///
 
     term = Term.fromTermNode(termNode, context);
@@ -27,9 +24,7 @@ export function stripBracketsFromStatement(statement, context) {
         bracketedStatementChildNode = bracketedStatementChildNodeFromStatementNode(statementNode);
 
   if (bracketedStatementChildNode !== null) {
-    context = contextFromStatement(statement, context); ///
-
-    const { Statement } = ontology,
+    const { Statement } = elements,
           statementNode = bracketedStatementChildNode;  ///
 
     statement = Statement.fromStatementNode(statementNode, context);
@@ -58,14 +53,14 @@ export function stripBracketsFromStatementNode(statementNode) {
   return statementNode;
 }
 
-export function bracketedTermChildNodeFromTermNode(termNode) {
+function bracketedTermChildNodeFromTermNode(termNode) {
   let bracketedTermChildNode = null;
 
   const depth = BRACKETED_TERM_DEPTH,
-        bracketedTermNode = constructorBracketedContext.getBracketedTermNode(),
-        termNodeMatchBracketedTermNode = termNode.match(bracketedTermNode, depth);
+        bracketedConstructorTermNode = instantiateBracketedConstructorTerm(),
+        termNodeMatchBracketedConstructorTermNode = termNode.match(bracketedConstructorTermNode, depth);
 
-  if (termNodeMatchBracketedTermNode) {
+  if (termNodeMatchBracketedConstructorTermNode) {
     const singularTermNode = termNode.getSingularTermNode();
 
     bracketedTermChildNode = singularTermNode;  ///
@@ -74,14 +69,14 @@ export function bracketedTermChildNodeFromTermNode(termNode) {
   return bracketedTermChildNode;
 }
 
-export function bracketedStatementChildNodeFromStatementNode(statementNode) {
+function bracketedStatementChildNodeFromStatementNode(statementNode) {
   let bracketedStatementChildNode = null;
 
   const depth = BRACKETED_STATEMENT_DEPTH,
-        bracketedStatementNode = combinatorBracketedContext.getBracketedStatementNode(),
-        statementNodeMatchBracketedStatementNode = statementNode.match(bracketedStatementNode, depth);
+        bracketedCombinatorStatementNode = instantiateBracketedCombinatorStatement(),
+        statementNodeMatchBracketedCombinatorStatementNode = statementNode.match(bracketedCombinatorStatementNode, depth);
 
-  if (statementNodeMatchBracketedStatementNode) {
+  if (statementNodeMatchBracketedCombinatorStatementNode) {
     const singularStatementNode = statementNode.getSingularStatementNode();
 
     bracketedStatementChildNode = singularStatementNode;  ///

package/src/utilities/customGrammar.js

@@ -21,10 +21,10 @@ export function combinedCustomGrammarFromNothing() {
 
 export function combinedCustomGrammarFromReleaseContexts(releaseContexts) {
   const customGrammars = releaseContexts.map((releaseContext) => {
-          const customGrammar = releaseContext.getCustomGrammar();
+    const customGrammar = releaseContext.getCustomGrammar();
 
-          return customGrammar;
-        });
+    return customGrammar;
+  });
 
   customGrammars.reverse(); ///