occam-verify-cli 1.0.876 → 1.0.878

package/src/context/phaneric.js

@@ -0,0 +1,43 @@
+"use strict";
+
+import { arrayUtilities } from "necessary";
+
+import Context from "../context";
+
+import { EMPTY_STRING } from "../constants";
+
+const { last } = arrayUtilities;
+
+export default class PhanericContext extends Context {
+  constructor(context, contexts) {
+    super(context);
+
+    this.contexts = contexts;
+  }
+
+  getContexts() {
+    return this.contexts;
+  }
+
+  nodeAsString(node) {
+    let string = EMPTY_STRING;
+
+    this.contexts.some((context) => {
+      string = context.nodeAsString(node);
+
+      if (string !== EMPTY_STRING) {
+        return true;
+      }
+    });
+
+    return string;
+  }
+
+  static fromContexts(contexts) {
+    const lastContext = last(contexts),
+          context = lastContext,  ///
+          phanericContext = new PhanericContext(context, contexts);
+
+    return phanericContext;
+  }
+}

package/src/context/synoptic.js

@@ -15,31 +15,23 @@ import { compressTerms,
          compressMetavariables,
          compressSubstitutions,} from "../utilities/synoptic";
 
-const { push } = arrayUtilities;
+const { last } = arrayUtilities;
 
 export default class SynopticContext extends Context {
-  constructor(context, terms, frames, equalities, judgements, assertions, statements, references, assumptions, metavariables, substitutions, derivedSubstitutions) {
+  constructor(context, contexts) {
     super(context);
 
-    this.terms = terms;
-    this.frames = frames;
-    this.equalities = equalities;
-    this.judgements = judgements;
-    this.assertions = assertions;
-    this.statements = statements;
-    this.references = references;
-    this.assumptions = assumptions;
-    this.metavariables = metavariables;
-    this.substitutions = substitutions;
-    this.derivedSubstitutions = derivedSubstitutions;
+    this.contexts = contexts;
   }
 
-  getTerms(terms = []) {
-    const context = this.getContext();
-
-    push(terms, this.terms);
+  getContexts() {
+    return this.contexts;
+  }
 
-    context.getTerms(terms);
+  getTerms(terms = []) {
+    this.contexts.forEach((context) => {
+      context.getTerms(terms);
+    });
 
     compressTerms(terms);
 
@@ -47,11 +39,9 @@ export default class SynopticContext extends Context {
   }
 
   getFrames(frames = []) {
-    const context = this.getContext();
-
-    push(frames, this.frames);
-
-    context.getFrames(frames);
+    this.contexts.forEach((context) => {
+      context.getFrames(frames);
+    });
 
     compressFrames(frames);
 
@@ -59,11 +49,9 @@ export default class SynopticContext extends Context {
   }
 
   getEqualities(equalities = []) {
-    const context = this.getContext();
-
-    push(equalities, this.equalities);
-
-    context.getEqualities(equalities);
+    this.contexts.forEach((context) => {
+      context.getEqualities(equalities);
+    });
 
     compressEqualities(equalities);
 
@@ -71,11 +59,9 @@ export default class SynopticContext extends Context {
   }
 
   getJudgements(judgements = []) {
-    const context = this.getContext();
-
-    push(judgements, this.judgements);
-
-    context.getJudgements(judgements);
+    this.contexts.forEach((context) => {
+      context.getJudgements(judgements);
+    });
 
     compressJudgements(judgements);
 
@@ -83,11 +69,9 @@ export default class SynopticContext extends Context {
   }
 
   getStatements(statements = []) {
-    const context = this.getContext();
-
-    push(statements, this.statements);
-
-    context.getStatements(statements);
+    this.contexts.forEach((context) => {
+      context.getStatements(statements);
+    });
 
     compressStatements(statements);
 
@@ -95,11 +79,9 @@ export default class SynopticContext extends Context {
   }
 
   getAssertions(assertions = []) {
-    const context = this.getContext();
-
-    push(assertions, this.assertions);
-
-    context.getAssertions(assertions);
+    this.contexts.forEach((context) => {
+      context.getAssertions(assertions);
+    });
 
     compressAssertions(assertions);
 
@@ -107,11 +89,9 @@ export default class SynopticContext extends Context {
   }
 
   getReferences(references = []) {
-    const context = this.getContext();
-
-    push(references, this.references);
-
-    context.getReferences(references);
+    this.contexts.forEach((context) => {
+      context.getReferences(references);
+    });
 
     compressReferences(references);
 
@@ -119,11 +99,9 @@ export default class SynopticContext extends Context {
   }
 
   getAssumptions(assumptions = []) {
-    const context = this.getContext();
-
-    push(assumptions, this.assumptions);
-
-    context.getAssumptions(assumptions);
+    this.contexts.forEach((context) => {
+      context.getAssumptions(assumptions);
+    });
 
     compressAssumptions(assumptions);
 
@@ -131,11 +109,9 @@ export default class SynopticContext extends Context {
   }
 
   getMetavariables(metavariables = []) {
-    const context = this.getContext();
-
-    push(metavariables, this.metavariables);
-
-    context.getMetavariables(metavariables);
+    this.contexts.forEach((context) => {
+      context.getMetavariables(metavariables);
+    });
 
     compressMetavariables(metavariables);
 
@@ -143,11 +119,9 @@ export default class SynopticContext extends Context {
   }
 
   getSubstitutions(substitutions = []) {
-    const context = this.getContext();
-
-    push(substitutions, this.substitutions);
-
-    context.getSubstitutions(substitutions);
+    this.contexts.forEach((context) => {
+      context.getSubstitutions(substitutions);
+    });
 
     compressSubstitutions(substitutions);
 
@@ -155,11 +129,9 @@ export default class SynopticContext extends Context {
   }
 
   getDerivedSubstitutions(derivedSubstitutions = []) {
-    const context = this.getContext();
-
-    push(derivedSubstitutions, this.derivedSubstitutions);
-
-    context.getDerivedSubstitutions(derivedSubstitutions);
+    this.contexts.forEach((context) => {
+      context.getDerivedSubstitutions(derivedSubstitutions);
+    });
 
     return derivedSubstitutions;
   }
@@ -307,155 +279,11 @@ export default class SynopticContext extends Context {
     return substitution;
   }
 
-  static fromContexts(...contexts) {
-    contexts = [  ///
-      ...contexts
-    ];
-
-    const context = contexts.pop(),  ///
-          terms = termsFromContexts(contexts),
-          frames = framesFromContexts(contexts),
-          equalities = equalitiesFromContexts(contexts),
-          judgements = judgementsFromContexts(contexts),
-          assertions = assertionsFromContexts(contexts),
-          statements = statementsFromContexts(contexts),
-          references = referencesFromContexts(contexts),
-          assumptions = assumptionsFromContexts(contexts),
-          metavariables = metavariablesFromContexts(contexts),
-          substitutions = substitutionsFromContexts(contexts),
-          derivedSubstitutions = derivedSubstitutionsFromContexts(contexts),
-          synopticContext = new SynopticContext(context, terms, frames, equalities, judgements, assertions, statements, references, assumptions, metavariables, substitutions, derivedSubstitutions);
+  static fromContexts(contexts) {
+    const lastContext = last(contexts),
+          context = lastContext,  ///
+          synopticContext = new SynopticContext(context, contexts);
 
     return synopticContext;
   }
 }
-
-function termsFromContexts(contexts) {
-  const terms = [];
-
-  contexts.forEach((context) => {
-    context.getTerms(terms);
-  });
-
-  compressTerms(terms);
-
-  return terms;
-}
-
-function framesFromContexts(contexts) {
-  const frames = [];
-
-  contexts.forEach((context) => {
-    context.getFrames(frames);
-  });
-
-  compressFrames(frames);
-
-  return frames;
-}
-
-function equalitiesFromContexts(contexts) {
-  const equalities = [];
-
-  contexts.forEach((context) => {
-    context.getEqualities(equalities);
-  });
-
-  compressEqualities(equalities);
-
-  return equalities;
-}
-
-function judgementsFromContexts(contexts) {
-  const judgements = [];
-
-  contexts.forEach((context) => {
-    context.getJudgements(judgements);
-  });
-
-  compressJudgements(judgements);
-
-  return judgements;
-}
-
-function assertionsFromContexts(contexts) {
-  const assertions = [];
-
-  contexts.forEach((context) => {
-    context.getAssertions(assertions);
-  });
-
-  compressAssertions(assertions);
-
-  return assertions;
-}
-
-function statementsFromContexts(contexts) {
-  const statements = [];
-
-  contexts.forEach((context) => {
-    context.getStatements(statements);
-  });
-
-  compressStatements(statements);
-
-  return statements;
-}
-
-function referencesFromContexts(contexts) {
-  const references = [];
-
-  contexts.forEach((context) => {
-    context.getReferences(references);
-  });
-
-  compressReferences(references);
-
-  return references;
-}
-
-function assumptionsFromContexts(contexts) {
-  const assumptions = [];
-
-  contexts.forEach((context) => {
-    context.getAssumptions(assumptions);
-  });
-
-  compressAssumptions(assumptions);
-
-  return assumptions;
-}
-
-function metavariablesFromContexts(contexts) {
-  const metavariables = [];
-
-  contexts.forEach((context) => {
-    context.getMetavariables(metavariables);
-  });
-
-  compressMetavariables(metavariables);
-
-  return metavariables;
-}
-
-function substitutionsFromContexts(contexts) {
-  const substitutions = [];
-
-  contexts.forEach((context) => {
-    context.getSubstitutions(substitutions);
-  });
-
-  compressSubstitutions(substitutions);
-
-  return substitutions;
-}
-
-function derivedSubstitutionsFromContexts(contexts) {
-  const derivedSubstitutions = [];
-
-  contexts.forEach((context) => {
-    context.getDerivedSubstitutions(derivedSubstitutions);
-  });
-
-  return derivedSubstitutions;
-}

package/src/element/substitution/frame.js

@@ -6,7 +6,7 @@ import { define } from "../../elements";
 import { instantiateFrameSubstitution } from "../../process/instantiate";
 import { frameSubstitutionFromFrameSubstitutionNode } from "../../utilities/element";
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
-import { ablate, ablates, attempts, descend, instantiate, unserialises } from "../../utilities/context";
+import { ablate, ablates, manifest, attempts, descend, instantiate, unserialises } from "../../utilities/context";
 
 export default define(class FrameSubstitution extends Substitution {
   constructor(contexts, string, node, lineIndex, targetFrame, replacementFrame) {
@@ -130,15 +130,17 @@ export default define(class FrameSubstitution extends Substitution {
     const targetFrameSingular = this.targetFrame.isSingular();
 
     if (targetFrameSingular) {
-      descend((context) => {
-        const tragetFrame = this.targetFrame.validate(context);
+      manifest((context) => {
+        descend((context) => {
+          const tragetFrame = this.targetFrame.validate(context);
 
-        if (tragetFrame !== null) {
-          this.targetFrame = tragetFrame;
+          if (tragetFrame !== null) {
+            this.targetFrame = tragetFrame;
 
-          targetFrameValidates = true;
-        }
-      }, context);
+            targetFrameValidates = true;
+          }
+        }, context);
+      }, specificContext, context);
     } else {
       const targetFrameString = this.targetFrame.getString();
 

package/src/element/substitution/reference.js

@@ -5,8 +5,8 @@ import Substitution from "../substitution";
 import { define } from "../../elements";
 import { instantiateReferenceSubstitution } from "../../process/instantiate";
 import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilities/element";
-import { ablates, attempts, descend, instantiate, unserialises } from "../../utilities/context";
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
+import { ablates, manifest, attempts, descend, instantiate, unserialises } from "../../utilities/context";
 
 export default define(class ReferenceSubstitution extends Substitution {
   constructor(context, string, node, lineIndex, targetReference, replacementReference) {
@@ -144,13 +144,15 @@ export default define(class ReferenceSubstitution extends Substitution {
 
     context.trace(`Validating the '${referenceSubstitutionString}' reference substitution's target reference...`);
 
-    descend((context) => {
-      const targetReference = this.targetReference.validate(context);
+    manifest((context) => {
+      descend((context) => {
+        const targetReference = this.targetReference.validate(context);
 
-      if (targetReference !== null) {
-        targetReferenceValidates = true;
-      }
-    }, context);
+        if (targetReference !== null) {
+          targetReferenceValidates = true;
+        }
+      }, context);
+    }, specificContext, context);
 
     if (targetReferenceValidates) {
       context.debug(`...validated the '${referenceSubstitutionString}' reference substitution's target reference...`);

package/src/element/substitution/statement.js

@@ -7,7 +7,7 @@ import { unifySubstitution } from "../../process/unify";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
 import { instantiateStatementSubstitution } from "../../process/instantiate";
 import { statementSubstitutionFromStatementSubstitutionNode } from "../../utilities/element";
-import { join, ablate, ablates, attempts, descend, reconcile, instantiate, unserialises } from "../../utilities/context";
+import { join, ablates, manifest, attempts, descend, reconcile, instantiate, unserialises } from "../../utilities/context";
 import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
 
 export default define(class StatementSubstitution extends Substitution {
@@ -168,13 +168,15 @@ export default define(class StatementSubstitution extends Substitution {
     const targetStatementSingular = this.targetStatement.isSingular();
 
     if (targetStatementSingular) {
-      descend((context) => {
-        const targetStatement = this.targetStatement.validate(context);
+      manifest((context) => {
+        descend((context) => {
+          const targetStatement = this.targetStatement.validate(context);
 
-        if (targetStatement !== null) {
-          targetStatementValidates = true;
-        }
-      }, context);
+          if (targetStatement !== null) {
+            targetStatementValidates = true;
+          }
+        }, context);
+      }, specificContext, context);
     } else {
       const targetStatementString = this.targetStatement.getString();
 
@@ -403,7 +405,9 @@ export default define(class StatementSubstitution extends Substitution {
 
     let statementSubstitution;
 
-    ablate((context) => {
+    ablates((generalContext, specificContext) => {
+      const context = specificContext;  ///
+
       instantiate((context) => {
         const specificContext = context,  ///
               statementSubstitutionString = statementSubstitutionStringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution),
@@ -412,7 +416,7 @@ export default define(class StatementSubstitution extends Substitution {
 
         statementSubstitution = statementSubstitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext);
       }, context);
-    }, context);
+    }, generalContext, specificContext);
 
     return statementSubstitution;
   }

package/src/element/substitution/term.js

@@ -7,7 +7,7 @@ import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionFromTermSubstitutionNode } from "../../utilities/element";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
-import { ablate, ablates, attempts, descend, instantiate, unserialises } from "../../utilities/context";
+import { ablate, ablates, manifest, attempts, descend, instantiate, unserialises } from "../../utilities/context";
 
 export default define(class TermSubstitution extends Substitution {
   constructor(context, string, node, lineIndex, targetTerm, replacementTerm) {
@@ -133,19 +133,21 @@ export default define(class TermSubstitution extends Substitution {
     const targetTermSingular = this.targetTerm.isSingular();
 
     if (targetTermSingular) {
-      descend((context) => {
-        const targetTerm = this.targetTerm.validate(context, (targetTerm) => {
-          const validatesForwards = true;
+      manifest((context) => {
+        descend((context) => {
+          const targetTerm = this.targetTerm.validate(context, (targetTerm) => {
+            const validatesForwards = true;
 
-          return validatesForwards;
-        });
+            return validatesForwards;
+          });
 
-        if (targetTerm !== null) {
-          this.targetTerm = targetTerm;
+          if (targetTerm !== null) {
+            this.targetTerm = targetTerm;
 
-          targetTermValidates = true;
-        }
-      }, context);
+            targetTermValidates = true;
+          }
+        }, context);
+      }, specificContext, context);
     } else {
       const targetTermString = this.targetTerm.getString();
 

package/src/utilities/context.js

@@ -7,6 +7,7 @@ import BoundedContext from "../context/bounded";
 import NominalContext from "../context/nominal";
 import LiteralContext from "../context/literal";
 import LiminalContext from "../context/liminal";
+import PhanericContext from "../context/phaneric";
 import SynopticContext from "../context/synoptic";
 import IllativeContext from "../context/illative";
 import BranchingContext from "../context/branching";
@@ -15,7 +16,7 @@ import NominalFileContext from "../context/file/nominal";
 import { mnemicContextFromJSON, mnemicContextsFromJSON, mnemicContextToMnemicContextJSON, mnemicContextsToMnemicContextsJSON } from "../utilities/json";
 
 export function join(innerFunction, ...contexts) {
-  const synopticContext = SynopticContext.fromContexts(...contexts),
+  const synopticContext = SynopticContext.fromContexts(contexts),
         context = synopticContext;  ///
 
   return innerFunction(context);
@@ -109,10 +110,11 @@ export function enclose(innerFunction, metaLevelAssumptions, context) {
   return innerFunction(context);
 }
 
-export function evaluate(procedure, terms) {
-  const context = procedure.getContext();
+export function manifest(innerFunction, ...contexts) {
+  const phanericContext = PhanericContext.fromContexts(contexts),
+        context = phanericContext;  ///
 
-  return procedure.call(terms, context);
+  return innerFunction(context);
 }
 
 export function reconcile(innerFunction, context) {
@@ -201,3 +203,9 @@ export function unserialises(innerFunction, json, context) {
 
   return innerFunction(json, ...contexts);
 }
+
+export function evaluate(procedure, terms) {
+  const context = procedure.getContext();
+
+  return procedure.call(terms, context);
+}