occam-verify-cli 1.0.428 → 1.0.436

package/src/ruleNames.js

@@ -20,7 +20,6 @@ export const PROPERTY_RULE_NAME = "property";
 export const EQUALITY_RULE_NAME = "equality";
 export const VARIABLE_RULE_NAME = "variable";
 export const SUBPROOF_RULE_NAME = "subproof";
-export const NONSENSE_RULE_NAME = "nonsense";
 export const DOCUMENT_RULE_NAME = "document";
 export const RULE_BODY_RULE_NAME = "ruleBody";
 export const META_TYPE_RULE_NAME = "metaType";
@@ -50,6 +49,7 @@ export const AXIOM_HEADER_RULE_NAME = "axiomHeader";
 export const LEMMA_HEADER_RULE_NAME = "lemmaHeader";
 export const THEOREM_BODY_RULE_NAME = "theoremBody";
 export const METAVARIABLE_RULE_NAME = "metavariable";
+export const EQUIVALENCES_RULE_NAME = "equivalences";
 export const META_ARGUMENT_RULE_NAME = "metaArgument";
 export const QUALIFICATION_RULE_NAME = "qualification";
 export const PROCEDURE_CALL_RULE_NAME = "procedureCall";

package/src/utilities/brackets.js

@@ -3,7 +3,7 @@
 import elements from "../elements";
 
 import { BRACKETED_TERM_DEPTH, BRACKETED_STATEMENT_DEPTH } from "../constants";
-import { instantiateBracketedCombinatorStatement, instantiateBracketedConstructorTerm } from "../process/instantiate";
+import { bracketedConstructorTermFromNothing, bracketedCombinatorStatementFromNothing } from "../utilities/instance";
 
 export function stripBracketsFromTerm(term, context) {
   const termNode = term.getNode(),
@@ -19,6 +19,16 @@ export function stripBracketsFromTerm(term, context) {
   return term;
 }
 
+export function stripBracketsFromTermNode(termNode) {
+  const bracketedTermChildNode = bracketedTermChildNodeFromTermNode(termNode);
+
+  if (bracketedTermChildNode !== null) {
+    termNode = bracketedTermChildNode;  ///
+  }
+
+  return termNode;
+}
+
 export function stripBracketsFromStatement(statement, context) {
   const statementNode = statement.getNode(),
         bracketedStatementChildNode = bracketedStatementChildNodeFromStatementNode(statementNode);
@@ -33,16 +43,6 @@ export function stripBracketsFromStatement(statement, context) {
   return statement;
 }
 
-export function stripBracketsFromTermNode(termNode) {
-  const bracketedTermChildNode = bracketedTermChildNodeFromTermNode(termNode);
-
-  if (bracketedTermChildNode !== null) {
-    termNode = bracketedTermChildNode;  ///
-  }
-
-  return termNode;
-}
-
 export function stripBracketsFromStatementNode(statementNode) {
   const bracketedStatementChildNode = bracketedStatementChildNodeFromStatementNode(statementNode);
 
@@ -57,7 +57,7 @@ function bracketedTermChildNodeFromTermNode(termNode) {
   let bracketedTermChildNode = null;
 
   const depth = BRACKETED_TERM_DEPTH,
-        bracketedConstructorTermNode = instantiateBracketedConstructorTerm(),
+        bracketedConstructorTermNode = bracketedConstructorTermFromNothing(),
         termNodeMatchBracketedConstructorTermNode = termNode.match(bracketedConstructorTermNode, depth);
 
   if (termNodeMatchBracketedConstructorTermNode) {
@@ -73,7 +73,7 @@ function bracketedStatementChildNodeFromStatementNode(statementNode) {
   let bracketedStatementChildNode = null;
 
   const depth = BRACKETED_STATEMENT_DEPTH,
-        bracketedCombinatorStatementNode = instantiateBracketedCombinatorStatement(),
+        bracketedCombinatorStatementNode = bracketedCombinatorStatementFromNothing(),
         statementNodeMatchBracketedCombinatorStatementNode = statementNode.match(bracketedCombinatorStatementNode, depth);
 
   if (statementNodeMatchBracketedCombinatorStatementNode) {