occam-verify-cli 1.0.448 → 1.0.472

package/src/context/file.js

@@ -1,9 +1,11 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
+import { contextUtilities } from "occam-furtle";
 
 import elements from "../elements";
 
+import { LEVELS } from "../constants";
 import { verifyFile } from "../process/verify";
 import { baseTypeFromNothing } from "../types";
 import { nodeAsString, nodesAsString } from "../utilities/node";
@@ -32,11 +34,13 @@ import { typesFromJSON,
          metatheoremsToMetatheoremsJSON,
          metavariablesToMetavariablesJSON } from "../utilities/json";
 
-const { push, filter } = arrayUtilities;
+const { push, filter } = arrayUtilities,
+      { chainContext, lineIndexFromNodeAndTokens } = contextUtilities,
+      [ TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL ] = LEVELS;
 
 export default class FileContext {
-  constructor(releaseContext, filePath, lineIndex, tokens, node, types, rules, axioms, lemmas, theorems, variables, metaLemmas, conjectures, combinators, typePrefixes, constructors, metatheorems, metavariables) {
-    this.releaseContext = releaseContext;
+  constructor(context, filePath, lineIndex, tokens, node, types, rules, axioms, lemmas, theorems, variables, metaLemmas, conjectures, combinators, typePrefixes, constructors, metatheorems, metavariables) {
+    this.context = context;
     this.filePath = filePath;
     this.lineIndex = lineIndex;
     this.tokens = tokens;
@@ -54,10 +58,12 @@ export default class FileContext {
     this.constructors = constructors;
     this.metatheorems = metatheorems;
     this.metavariables = metavariables;
+
+    return chainContext(this);
   }
 
-  getReleaseContext() {
-    return this.releaseContext;
+  getContext() {
+    return this.context;
   }
 
   getFilePath() {
@@ -76,14 +82,6 @@ export default class FileContext {
     return this.node;
   }
 
-  getLexer() { return this.releaseContext.getLexer(); }
-
-  getParser() { return this.releaseContext.getParser(); }
-
-  getMetaTypes() { return this.releaseContext.getMetaTypes(); }
-
-  getTypePrefix() { return this.releaseContext.getTypePrefix(); }
-
   getJudgements() {
     const judgements = [];
 
@@ -92,7 +90,7 @@ export default class FileContext {
 
   getEquivalences() {
     const { Equivalences } = elements,
-          equivalences = Equivalences.fromNothing();
+          equivalences = Equivalences.fromNothing(context);
 
     return equivalences;
   }
@@ -107,7 +105,7 @@ export default class FileContext {
     const labels = [];
 
     if (includeRelease) {
-      const releaseContextLabels = this.releaseContext.getLabels();
+      const releaseContextLabels = this.context.getLabels();
 
       push(labels, releaseContextLabels);
     } else {
@@ -153,7 +151,7 @@ export default class FileContext {
 
   getTypes(includeRelease = true, includeDependencies = true) {
     const types = includeRelease ?
-                    this.releaseContext.getTypes(includeDependencies) :
+                    this.context.getTypes(includeDependencies) :
                       this.types;
 
     return types;
@@ -161,7 +159,7 @@ export default class FileContext {
 
   getRules(includeRelease = true) {
     const rules = includeRelease ?
-                    this.releaseContext.getRules() :
+                    this.context.getRules() :
                       this.rules;
 
     return rules;
@@ -169,7 +167,7 @@ export default class FileContext {
 
   getAxioms(includeRelease = true) {
     const axioms = includeRelease ?
-                     this.releaseContext.getAxioms() :
+                     this.context.getAxioms() :
                        this.axioms;
 
     return axioms;
@@ -177,7 +175,7 @@ export default class FileContext {
 
   getLemmas(includeRelease = true) {
     const lemmas = includeRelease ?
-                     this.releaseContext.getLemmas() :
+                     this.context.getLemmas() :
                        this.lemmas;
 
     return lemmas;
@@ -185,7 +183,7 @@ export default class FileContext {
 
   getTheorems(includeRelease = true) {
     const theorems = includeRelease ?
-                       this.releaseContext.getTheorems() :
+                       this.context.getTheorems() :
                          this.theorems;
 
     return theorems;
@@ -197,7 +195,7 @@ export default class FileContext {
 
   getProcedures(includeRelease = true) {
     const procedures = includeRelease ?
-                         this.releaseContext.getProcedures() :
+                         this.context.getProcedures() :
                            null;  ///
 
     return procedures;
@@ -205,7 +203,7 @@ export default class FileContext {
 
   getMetaLemmas(includeRelease = true) {
     const metaLemmas = includeRelease ?
-                         this.releaseContext.getMetaLemmas() :
+                         this.context.getMetaLemmas() :
                            this.metaLemmas;
 
     return metaLemmas;
@@ -213,7 +211,7 @@ export default class FileContext {
 
   getConjectures(includeRelease = true) {
     const conjectures = includeRelease ?
-                          this.releaseContext.getConjectures() :
+                          this.context.getConjectures() :
                             this.conjectures;
 
     return conjectures;
@@ -221,7 +219,7 @@ export default class FileContext {
 
   getCombinators(includeRelease = true) {
     const combinators = includeRelease ?
-                          this.releaseContext.getCombinators() :
+                          this.context.getCombinators() :
                             this.combinators;
 
     return combinators;
@@ -229,7 +227,7 @@ export default class FileContext {
 
   getTypePrefixes(includeRelease = true) {
     const typePrefixes = includeRelease ?
-                           this.releaseContext.getTypePrefixes() :
+                           this.context.getTypePrefixes() :
                              this.typePrefixes;
 
     return typePrefixes;
@@ -237,7 +235,7 @@ export default class FileContext {
 
   getConstructors(includeRelease = true) {
     const constructors = includeRelease ?
-                           this.releaseContext.getConstructors() :
+                           this.context.getConstructors() :
                              this.constructors;
 
     return constructors;
@@ -245,7 +243,7 @@ export default class FileContext {
 
   getMetatheorems(includeRelease = true) {
     const metatheorems = includeRelease ?
-                           this.releaseContext.getMetatheorems() :
+                           this.context.getMetatheorems() :
                              this.metatheorems;
 
     return metatheorems;
@@ -255,12 +253,6 @@ export default class FileContext {
     return this.metavariables;
   }
 
-  getFileContext() {
-    const fileContext = this; ///
-
-    return fileContext;
-  }
-
   addType(type) {
     this.types.push(type);
   }
@@ -440,10 +432,10 @@ export default class FileContext {
 
     filter(metaLemmas, (metaLemma) => {
       const context = this, ///
-            metaLemmaMetaTheorem = metaLemma, ///
-            metaLemmaMetatheoremUnifies = reference.unifyMetaLemmaMetatheorem(metaLemmaMetaTheorem, context);
+            topLevelMetaAssertion = metaLemma, ///
+            topLevelMetaAssertionUnifies = reference.unifyTopLevelMetaAssertion(topLevelMetaAssertion, context);
 
-      if (metaLemmaMetatheoremUnifies) {
+      if (topLevelMetaAssertionUnifies) {
         return true;
       }
     });
@@ -456,10 +448,10 @@ export default class FileContext {
 
     filter(metatheorems, (metatheorem) => {
       const context = this, ///
-            metaLemmaMetaTheorem = metatheorem, ///
-            metaLemmaMetatheoremUnifies = reference.unifyMetaLemmaMetatheorem(metaLemmaMetaTheorem, context);
+            topLevelMetaAssertion = metatheorem, ///
+            topLevelMetaAssertionUnifies = reference.unifyTopLevelMetaAssertion(topLevelMetaAssertion, context);
 
-      if (metaLemmaMetatheoremUnifies) {
+      if (topLevelMetaAssertionUnifies) {
         return true;
       }
     });
@@ -467,33 +459,33 @@ export default class FileContext {
     return metatheorems;
   }
 
-  findMetaLemmaMetatheoremByReference(reference) {
+  findTopLevelMetaAssertionByReference(reference) {
     const metaLemma = this.findMetaLemmaByReference(reference),
           metatheorem = this.findMetatheoremByReference(reference),
-          metaLemmaMetatheorem = (metaLemma || metatheorem);  ///
+          topLevelMetaAssertion = (metaLemma || metatheorem);  ///
 
-    return metaLemmaMetatheorem;
+    return topLevelMetaAssertion;
   }
 
-  findMetaLemmaMetatheoremsByReference(reference) {
+  findTopLevelMetaAssertionsByReference(reference) {
     const metaLemmas = this.findMetaLemmasByReference(reference),
           metatheorems = this.findMetatheoremsByReference(reference),
-          metaLemmaMetatheorems = [
+          topLevelMetaAssertions = [
             ...metaLemmas,
             ...metatheorems
           ];
 
-    return metaLemmaMetatheorems;
+    return topLevelMetaAssertions;
   }
 
-  findAxiomLemmaTheoremOrConjectureByReference(reference) {
+  findTopLevelAssertionByReference(reference) {
     const axiom = this.findAxiomByReference(reference),
           lemma = this.findLemmaByReference(reference),
           theorem = this.findTheoremByReference(reference),
           conjecture = this.findConjectureByReference(reference),
-          axiomLemmaTheoremOrConjecture = (axiom || lemma || theorem || conjecture);
+          topLevelAssertion = (axiom || lemma || theorem || conjecture);
 
-    return axiomLemmaTheoremOrConjecture;
+    return topLevelAssertion;
   }
 
   findMetavariable(metavariable) {
@@ -501,12 +493,9 @@ export default class FileContext {
           specificMetavariable = metavariable;  ///
 
     metavariable = metavariables.find((metavariable) => {
-      const generalMetavariable = metavariable; ///
-
-      metavariable = specificMetavariable;  ///
-
       const context = this, ///
-            metavariableUnifies = generalMetavariable.unifyMetavariable(metavariable, context);
+            generalMetavariable = metavariable, ///
+            metavariableUnifies = generalMetavariable.unifyMetavariable(specificMetavariable, context);
 
       if (metavariableUnifies) {
         return true;
@@ -742,10 +731,8 @@ export default class FileContext {
   isLabelPresentByReference(reference) {
     const labels = this.getLabels(),
           labelPresent = labels.some((label) => {
-            const { Substitutions } = elements,
-                  context = this, ///
-                  substitutions = Substitutions.fromNothing(),
-                  labelUnifies = reference.unifyLabel(label, substitutions, context);
+            const context = this, ///
+                  labelUnifies = reference.unifyLabel(label, context);
 
             if (labelUnifies) {
               return true;
@@ -776,11 +763,25 @@ export default class FileContext {
     return metavariablePresent;
   }
 
-  isMetaLemmaMetatheoremPresentByReference(reference) {
-    const metaLemmaMetatheorem = this.findMetaLemmaMetatheoremByReference(reference),
-          metaLemmaMetatheoremPresent = (metaLemmaMetatheorem !== null);
+  isTopLevelMetaAssertionPresentByReference(reference) {
+    const topLevelMetaAssertion = this.findTopLevelMetaAssertionByReference(reference),
+          topLevelMetaAssertionPresent = (topLevelMetaAssertion !== null);
 
-    return metaLemmaMetatheoremPresent;
+    return topLevelMetaAssertionPresent;
+  }
+
+  getFileContext() {
+    const fileContext = this; ///
+
+    return fileContext;
+  }
+
+  getDepth() {
+    let depth = this.context.getDepth();
+
+    depth++;
+
+    return depth;
   }
 
   nodeAsString(node) {
@@ -795,36 +796,45 @@ export default class FileContext {
     return string;
   }
 
-  findFile(filePath) { return this.releaseContext.findFile(filePath); }
-
   trace(message, node = null) {
-    this.lineIndex = lineIndexFromNodeAndTokens(node, this.tokens, this.lineIndex);
+    const level = TRACE_LEVEL;
 
-    this.releaseContext.trace(message, this.filePath, this.lineIndex);
+    this.writeToLog(level, message, node);
   }
 
   debug(message, node = null) {
-    this.lineIndex = lineIndexFromNodeAndTokens(node, this.tokens, this.lineIndex);
+    const level = DEBUG_LEVEL;
 
-    this.releaseContext.debug(message, this.filePath, this.lineIndex);
+    this.writeToLog(level, message, node);
   }
 
   info(message, node = null) {
-    this.lineIndex = lineIndexFromNodeAndTokens(node, this.tokens, this.lineIndex);
+    const level = INFO_LEVEL;
 
-    this.releaseContext.info(message, this.filePath, this.lineIndex);
+    this.writeToLog(level, message, node);
   }
 
   warning(message, node = null) {
-    this.lineIndex = lineIndexFromNodeAndTokens(node, this.tokens, this.lineIndex);
+    const level = WARNING_LEVEL;
 
-    this.releaseContext.warning(message, this.filePath, this.lineIndex);
+    this.writeToLog(level, message, node);
   }
 
   error(message, node = null) {
-    this.lineIndex = lineIndexFromNodeAndTokens(node, this.tokens, this.lineIndex);
+    const level = ERROR_LEVEL;
+
+    this.writeToLog(level, message, node);
+  }
+
+  writeToLog(level, message, node) {
+    const lineIndex = lineIndexFromNodeAndTokens(node, this.tokens, this.lineIndex),
+          filePath = (lineIndex === null) ?
+                        this.filePath :
+                          null;
 
-    this.releaseContext.error(message, this.filePath, this.lineIndex);
+    this.context.writeToLog(level, message, filePath, lineIndex);
+
+    this.lineIndex = lineIndex;
   }
 
   verify() {
@@ -842,9 +852,9 @@ export default class FileContext {
 
       verifies = verifyFile(fileNode, context);
 
-      if (!verifies) {
-        this.clear();
-      }
+      verifies ?
+        this.complete() :
+          this.clear();
 
       if (verifies) {
         this.info(`...verified the '${this.filePath}' file.`);
@@ -854,7 +864,24 @@ export default class FileContext {
     return verifies;
   }
 
+  prepare() {
+    if (this.tokens !== null) {
+      return;
+    }
+
+    const file = this.findFile(this.filePath),
+          lexer = this.getLexer(),
+          parser = this.getParser(),
+          content = file.getContent();
+
+    this.tokens = lexer.tokenise(content);
+
+    this.node = parser.parse(this.tokens);
+  }
+
   clear() {
+    this.lineIndex = null;
+
     this.types = [];
     this.rules = [];
     this.axioms = [];
@@ -870,21 +897,8 @@ export default class FileContext {
     this.metavariables = [];
   }
 
-  prepare() {
+  complete() {
     this.lineIndex = null;
-
-    if (this.tokens !== null) {
-      return;
-    }
-
-    const file = this.findFile(this.filePath),
-          lexer = this.getLexer(),
-          parser = this.getParser(),
-          content = file.getContent();
-
-    this.tokens = lexer.tokenise(content);
-
-    this.node = parser.parse(this.tokens);
   }
 
   initialise(json) {
@@ -961,7 +975,7 @@ export default class FileContext {
     return json;
   }
 
-  static fromFile(file, releaseContext) {
+  static fromFile(file, context) {
     const filePath = file.getPath(),
           lineIndex = null,
           tokens = null,
@@ -979,12 +993,12 @@ export default class FileContext {
           constructors = [],
           metatheorems = [],
           metavariables = [],
-          fileContext = new FileContext(releaseContext, filePath, lineIndex, tokens, node, types, rules, axioms, lemmas, theorems, variables, metaLemmas, conjectures, combinators, typePrefixes, constructors, metatheorems, metavariables);
+          fileContext = new FileContext(context, filePath, lineIndex, tokens, node, types, rules, axioms, lemmas, theorems, variables, metaLemmas, conjectures, combinators, typePrefixes, constructors, metatheorems, metavariables);
 
     return fileContext;
   }
 
-  static fromFilePath(filePath, releaseContext) {
+  static fromFilePath(filePath, context) {
     const lineIndex = null,
           tokens = null,
           node = null,
@@ -1001,30 +1015,8 @@ export default class FileContext {
           constructors = null,
           metatheorems = null,
           metavariables = null,
-          fileContext = new FileContext(releaseContext, filePath, lineIndex, tokens, node, types, rules, axioms, lemmas, theorems, variables, metaLemmas, conjectures, combinators, typePrefixes, constructors, metatheorems, metavariables);
+          fileContext = new FileContext(context, filePath, lineIndex, tokens, node, types, rules, axioms, lemmas, theorems, variables, metaLemmas, conjectures, combinators, typePrefixes, constructors, metatheorems, metavariables);
 
     return fileContext;
   }
 }
-
-function lineIndexFromNodeAndTokens(node, tokens, lineIndex) {
-  if (node !== null) {
-    lineIndex = 0;
-
-    const firstSignificantTokenIndex = node.getFirstSignificantTokenIndex(tokens);
-
-    tokens.some((token, tokenIndex) => {
-      const tokenEndOfLineToken = token.isEndOfLineToken();
-
-      if (tokenEndOfLineToken) {
-        lineIndex += 1;
-      }
-
-      if (tokenIndex === firstSignificantTokenIndex) {
-        return true;
-      }
-    });
-  }
-
-  return lineIndex;
-}

package/src/context/liminal.js

@@ -0,0 +1,67 @@
+"use strict";
+
+import { arrayUtilities } from "necessary";
+import { contextUtilities } from "occam-furtle";
+
+const { extract } = arrayUtilities,
+      { chainContext } = contextUtilities;
+
+export default class LiminalContext {
+  constructor(context, substitutions) {
+    this.context = context;
+    this.substitutions = substitutions;
+
+    return chainContext(this);
+  }
+
+  getContext() {
+    return this.context;
+  }
+
+  getSubstitutions() {
+    let substitutions = this.context.getSubstitutions();
+
+    substitutions = [ ///
+      ...this.substitutions,
+      ...substitutions
+    ]
+
+    return substitutions;
+  }
+
+  addSubstitution(substitution) {
+    const context = this, ///
+          substitutionA = substitution, ///
+          substitutionString = substitution.getString();
+
+    extract(this.substitutions, (substitution) => {
+      const substitutionB = substitution, ///
+            substitutionAEqualToAssertionB = substitutionA.isEqualTo(substitutionB);
+
+      if (substitutionAEqualToAssertionB) {
+        return true;
+      }
+    });
+
+    context.trace(`Added the '${substitutionString}' substitution to the context.`);
+
+    this.substitutions.push(substitution);
+  }
+
+  getFileContext() { return this.context.getFileContext(); }
+
+  getDepth() {
+    let depth = this.context.getDepth();
+
+    depth++;
+
+    return depth;
+  }
+
+  static fromNothing(context) {
+    const substitutions = [],
+          emphemeralContext = new LiminalContext(context, substitutions);
+
+    return emphemeralContext;
+  }
+}

package/src/context/literal.js

@@ -0,0 +1,51 @@
+"use strict";
+
+import { contextUtilities } from "occam-furtle";
+
+import { nodeAsString } from "../utilities/node";
+
+const { chainContext } = contextUtilities;
+
+export default class LiteralContext {
+  constructor(context, tokens) {
+    this.context = context;
+    this.tokens = tokens;
+
+    return chainContext(this);
+  }
+
+  getContext() {
+    return this.context;
+  }
+
+  getTokens() {
+    return this.tokens;
+  }
+
+  setTokens(tokens) {
+    this.tokens = tokens;
+  }
+
+  nodeAsString(node) {
+    const string = nodeAsString(node, this.tokens);
+
+    return string;
+  }
+
+  getFileContext() { return this.context.getFileContext(); }
+
+  getDepth() {
+    let depth = this.context.getDepth();
+
+    depth++;
+
+    return depth;
+  }
+
+  static fromNothing(context) {
+    const tokens = null,
+          literalContext = new LiteralContext(context, tokens);
+
+    return literalContext;
+  }
+}

package/src/context/nominal.js

@@ -16,6 +16,18 @@ class NominalContext {
     return this.parser;
   }
 
+  getFileContext() {
+    const fileContext = null;
+
+    return fileContext;
+  }
+
+  getDepth() {
+    const depth = -1;
+
+    return depth;
+  }
+
   static fromNothing() {
     const lexer = nominalLexer, ///
           parser = nominalParser, ///