occam-verify-cli 1.0.281 → 1.0.285

package/src/dom/theorem.js

@@ -8,10 +8,11 @@ export default domAssigned(class Theorem extends TopLevelAssertion {
   verify() {
     let verifies;
 
-    const context = this.getContext(),
+    const node = this.getNode(),
+          context = this.getContext(),
           theoremString = this.string;  ///
 
-    context.trace(`Verifying the '${theoremString}' theorem...`);
+    context.trace(`Verifying the '${theoremString}' theorem...`, node);
 
     verifies = super.verify();
 
@@ -20,7 +21,7 @@ export default domAssigned(class Theorem extends TopLevelAssertion {
 
       context.addTheorem(theorem);
 
-      context.debug(`...verified the '${theoremString}' theorem.`);
+      context.debug(`...verified the '${theoremString}' theorem.`, node);
     }
 
     return verifies;

package/src/dom/topLevelAssertion.js

@@ -20,8 +20,9 @@ import { labelsFromJSON,
 const { extract, reverse, correlate, backwardsEvery } = arrayUtilities;
 
 export default class TopLevelAssertion {
-  constructor(context, string, labels, suppositions, deduction, proof, signature, hypotheses) {
+  constructor(context, node, string, labels, suppositions, deduction, proof, signature, hypotheses) {
     this.context = context;
+    this.node = node;
     this.string = string;
     this.labels = labels;
     this.suppositions = suppositions;
@@ -35,6 +36,10 @@ export default class TopLevelAssertion {
     return this.context;
   }
 
+  getNode() {
+    return this.node;
+  }
+
   getString() {
     return this.string;
   }
@@ -199,7 +204,7 @@ export default class TopLevelAssertion {
       const steps = context.getSteps(),
             topLevelAssertionString = this.string;  ///
 
-      context.trace(`Correlating the hypotheses of the '${topLevelAssertionString}' axiom, lemma, theorem or conjecture...`);
+      context.trace(`Correlating the hypotheses of the '${topLevelAssertionString}' axiom, lemma, theorem or conjecture...`, this.node);
 
       hypothesesCorrelate = correlate(this.hypotheses, steps, (hypothesis, step) => {
         const hypothesesEqualToStep = hypothesis.isEqualToStep(step, context);
@@ -210,7 +215,7 @@ export default class TopLevelAssertion {
       });
 
       if (hypothesesCorrelate) {
-        context.debug(`...correlated the hypotheses of the '${topLevelAssertionString}' axiom, lemma, theorem or conjecture.`);
+        context.debug(`...correlated the hypotheses of the '${topLevelAssertionString}' axiom, lemma, theorem or conjecture.`, this.node);
       }
     } else {
       hypothesesCorrelate = true
@@ -324,9 +329,10 @@ export default class TopLevelAssertion {
           suppositions = suppositionsFromJSON(json, context),
           signature = signatureFromJSON(json, context),
           hypotheses = hypothesesFromJSON(json, context),
+          node = null,
           proof = null,
           string = stringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction),
-          topLevelAssertion = new Class(context, string, labels, suppositions, deduction, proof, signature, hypotheses);
+          topLevelAssertion = new Class(context, node, string, labels, suppositions, deduction, proof, signature, hypotheses);
 
     return topLevelAssertion;
   }
@@ -345,7 +351,7 @@ export default class TopLevelAssertion {
           signature = signatureFromSignatureNode(signatureNode, context),
           hypotheses = [],
           string = stringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction),
-          topLevelAssertion = new Class(context, string, labels, suppositions, deduction, proof, signature, hypotheses);
+          topLevelAssertion = new Class(context, node, string, labels, suppositions, deduction, proof, signature, hypotheses);
 
     return topLevelAssertion;
   }

package/src/dom/topLevelMetaAssertion.js

@@ -15,8 +15,9 @@ import { labelFromJSON,
          substitutionsToSubstitutionsJSON } from "../utilities/json";
 
 export default class TopLevelMetaAssertion {
-  constructor(context, string, label, suppositions, deduction, proof, substitutions) {
+  constructor(context, node, string, label, suppositions, deduction, proof, substitutions) {
     this.context = context;
+    this.node = node;
     this.string = string;
     this.label = label;
     this.suppositions = suppositions;
@@ -29,6 +30,10 @@ export default class TopLevelMetaAssertion {
     return this.context;
   }
 
+  getNode() {
+    return this.node;
+  }
+
   getString() {
     return this.string;
   }
@@ -155,9 +160,10 @@ export default class TopLevelMetaAssertion {
           deduction = deductionFromJSON(json, context),
           suppositions = suppositionsFromJSON(json, context),
           substitutions = substitutionsFromJSON(json, context),
+          node = null,
           proof = null,
           string = stringFromLabelASuppositionsAndDeduction(label, suppositions, deduction),
-          topLevelMetaAssertion = new Class(context, string, label, suppositions, deduction, proof, substitutions);
+          topLevelMetaAssertion = new Class(context, node, string, label, suppositions, deduction, proof, substitutions);
 
     return topLevelMetaAssertion;
   }
@@ -174,7 +180,7 @@ export default class TopLevelMetaAssertion {
           suppositions = suppositionsFromSuppositionNodes(suppositionNodes, context),
           substitutions = Substitutions.fromNothing(),
           string = stringFromLabelASuppositionsAndDeduction(label, suppositions, deduction),
-          topLevelMetaAssertion = new Class(context, string, label, suppositions, deduction, proof, substitutions);
+          topLevelMetaAssertion = new Class(context, node, string, label, suppositions, deduction, proof, substitutions);
 
     return topLevelMetaAssertion;
   }

package/src/log.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { levels } from "necessary";
+import {EMPTY_STRING} from "./constants";
 
 const { TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL } = levels;
 
@@ -23,37 +24,37 @@ export default class Log {
     return this.follow;
   }
 
-  trace(message, filePath) {
+  trace(message, filePath, lineIndex = null) {
     const level = TRACE_LEVEL;
 
-    this.write(level, message, filePath);
+    this.write(level, message, filePath, lineIndex);
   }
 
-  debug(message, filePath) {
+  debug(message, filePath, lineIndex = null) {
     const level = DEBUG_LEVEL;
 
-    this.write(level, message, filePath);
+    this.write(level, message, filePath, lineIndex);
   }
 
-  info(message, filePath) {
+  info(message, filePath, lineIndex = null) {
     const level = INFO_LEVEL;
 
-    this.write(level, message, filePath);
+    this.write(level, message, filePath, lineIndex);
   }
 
-  warning(message, filePath) {
+  warning(message, filePath, lineIndex = null) {
     const level = WARNING_LEVEL;
 
-    this.write(level, message, filePath);
+    this.write(level, message, filePath, lineIndex);
   }
 
-  error(message, filePath) {
+  error(message, filePath, lineIndex = null) {
     const level = ERROR_LEVEL;
 
-    this.write(level, message, filePath);
+    this.write(level, message, filePath, lineIndex);
   }
 
-  write(level, message, filePath) {
+  write(level, message, filePath, lineIndex) {
     const levels = [
             TRACE_LEVEL,
             DEBUG_LEVEL,
@@ -68,7 +69,7 @@ export default class Log {
       return;
     }
 
-    message = formatMessage(level, message, filePath);  ///
+    message = formatMessage(level, message, filePath, lineIndex);  ///
 
     this.follow ?
       console.log(message) :
@@ -94,12 +95,24 @@ export default class Log {
   }
 }
 
-function formatMessage(level, message, filePath = null) {
+function formatMessage(level, message, filePath = null, lineIndex = null) {
+  let formattedMessage = EMPTY_STRING;
+
   const upperCaseLevel = level.toUpperCase();
 
-  message = (filePath !== null) ?
-            `${upperCaseLevel}: ${filePath} - ${message}`:
-              `${upperCaseLevel}: ${message}`;
+  formattedMessage += `${upperCaseLevel}:`;
+
+  if (filePath !== null) {
+    formattedMessage += ` ${filePath}`;
+  }
+
+  if (lineIndex !== null) {
+    formattedMessage += ` [${lineIndex}]`;
+  }
+
+  formattedMessage += ` - ${message}`;
+
+  message = formattedMessage; ///
 
   return message;
 }