occam-furtle 2.0.342 → 3.0.2

package/src/context/file.js

@@ -1,164 +1,39 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
+import Context from '../context';
 
-import { LEVELS } from "../constants";
-import { verifyFile } from "../process/verify";
-import { furtleLexer, furtleParser } from "../utilities/furtle";
+import { lineIndexFromNodeAndTokens } from "../utilities/lineIndex";
 import { nodeAsString, nodesAsString } from "../utilities/node";
-import { chainContext, lineIndexFromNodeAndTokens } from "../utilities/context";
 
-const { push } = arrayUtilities,
-      [ TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL ] = LEVELS;
+export default class FileContext extends Context {
+  constructor(context, filePath, tokens, node) {
+    super(context);
 
-export default class FileContext {
-  constructor(context, filePath, lineIndex, node, tokens, procedures) {
-    this.context = context;
     this.filePath = filePath;
-    this.lineIndex = lineIndex;
-    this.node = node;
     this.tokens = tokens;
-    this.procedures = procedures;
-
-    return chainContext(this);
-  }
-
-  getContext() {
-    return this.context;
+    this.node = node;
   }
 
   getFilePath() {
     return this.filePath;
   }
 
-  getLineIndex() {
-    return this.lineIndex;
-  }
-
-  getNode() {
-    return this.node;
-  }
-
   getTokens() {
     return this.tokens;
   }
 
-  getLexer() {
-    const lexer = furtleLexer;  ///
-
-    return lexer;
-  }
-
-  getParser() {
-    const parser = furtleParser;  ///
-
-    return parser;
-  }
-
-  getLabels(includeRelease = true) {
-    const labels = [];
-
-    return labels;
-  }
-
-  getTypes(includeRelease = true) {
-    const types = [];
-
-    return types;
-  }
-
-  getRules(includeRelease = true) {
-    const rules = []
-
-    return rules;
-  }
-
-  getAxioms(includeRelease = true) {
-    const axioms = [];
-
-    return axioms;
-  }
-
-  getLemmas(includeRelease = true) {
-    const lemmas = [];
-
-    return lemmas;
-  }
-
-  getTheorems(includeRelease = true) {
-    const theorems = [];
-
-    return theorems;
-  }
-
-  getProcedures(includeRelease = true) {
-    const procedures = [];
-
-    push(procedures, this.procedures);
-
-    if (includeRelease) {
-      const releaseContextProcedures = this.context.getProcedures();
-
-      push(procedures, releaseContextProcedures);
-    }
-
-    return procedures;
-  }
-
-  getMetaLemmas(includeRelease = true) {
-    const metaLemmas = [];
-
-    return metaLemmas;
-  }
-
-  getConjectures(includeRelease = true) {
-    const conjectures = [];
-
-    return conjectures;
-  }
-
-  getCombinators(includeRelease = true) {
-    const combinators = [];
-
-    return combinators;
-  }
-
-  getTypePrefixes(includeRelease = true) {
-    const typePrefixes = [];
-
-    return typePrefixes;
-  }
-
-  getConstructors(includeRelease = true) {
-    const constructors = [];
-
-    return constructors;
-  }
-
-  getMetatheorems(includeRelease = true) {
-    const metatheorems = [];
-
-    return metatheorems;
+  getNode() {
+    return this.node;
   }
 
-  getMetavariables(includeRelease = true) {
-    const metavariables = [];
+  break(node) {
+    const lineIndex = lineIndexFromNodeAndTokens(node, this.tokens);
 
-    return metavariables;
+    this.context.break(this.filePath, lineIndex);
   }
 
-  addProcedure(procedure) {
-    const procedureString = procedure.getString();
-
-    this.procedures.push(procedure);
-
-    this.debug(`Added the '${procedureString}' procedure to the context.`);
-  }
-
-  getVariables() {
-    const variables = [];
-
-    return variables;
+  writeToLog(level, message) {
+    this.context.writeToLog(level, message, this.filePath);
   }
 
   nodeAsString(node) {
@@ -173,61 +48,6 @@ export default class FileContext {
     return string;
   }
 
-  trace(message, node = null) {
-    const level = TRACE_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  debug(message, node = null) {
-    const level = DEBUG_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  info(message, node = null) {
-    const level = INFO_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  warning(message, node = null) {
-    const level = WARNING_LEVEL;
-
-    this.writeToLog(level, message, node);
-  }
-
-  error(message, node = null) {
-    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.context.writeToLog(level, message, filePath, lineIndex);
-
-    this.lineIndex = lineIndex;
-  }
-
-  getFileContext() {
-    const fileContext = this; ///
-
-    return fileContext;
-  }
-
-  getDepth() {
-    let depth = this.context.getDepth();
-
-    depth++;
-
-    return depth;
-  }
-
   verify() {
     let verifies = false;
 
@@ -238,7 +58,8 @@ export default class FileContext {
     } else {
       this.debug(`Verifying the '${this.filePath}' file...`);
 
-      const context = this, ///
+      const { verifyFile } = this.constrcutor,
+            context = this, ///
             fileNode = this.node; ///
 
       verifies = verifyFile(fileNode, context);
@@ -260,9 +81,8 @@ export default class FileContext {
       return;
     }
 
-    const file = this.findFile(this.filePath),
-          lexer = this.getLexer(),
-          parser = this.getParser(),
+    const { lexer, parser } = this.constructor,
+          file = this.findFile(this.filePath),
           content = file.getContent();
 
     this.tokens = lexer.tokenise(content);
@@ -271,13 +91,11 @@ export default class FileContext {
   }
 
   clear() {
-    this.lineIndex = null;
-
     this.procedures = [];
   }
 
   complete() {
-    this.lineIndex = null;
+    ///
   }
 
   initialise(json) {
@@ -306,23 +124,28 @@ export default class FileContext {
     return json;
   }
 
-  static fromFile(file, context) {
+  static fromFile(Class, file, ...remainingArguments) {
     const filePath = file.getPath(),
-          lineIndex = null,
           tokens = null,
           node = null,
-          procedures = [],
-          fileContext = new FileContext(context, filePath, lineIndex, node, tokens, procedures);
+          context = remainingArguments.pop(), ///
+          fileContext = new Class(context, filePath, tokens, node, ...remainingArguments);
 
     return fileContext;
   }
 
-  static fromFilePath(filePath, context) {
-    const lineIndex = null,
-          tokens = null,
+  static fromFilePath(Class, filePath, ...remainingArguments) {
+    const tokens = null,
           node = null,
-          procedures = null,
-          fileContext = new FileContext(context, filePath, lineIndex, node, tokens, procedures);
+          context = remainingArguments.pop(), ///
+          fileContext = new Class(context, filePath, tokens, node, ...remainingArguments);
+
+    return fileContext;
+  }
+
+  static fromFilePathTokensAndNode(Class, filePath, tokens, node, ...remainingArguments) {
+    const context = remainingArguments.pop(), ///
+          fileContext = new Class(context, filePath, tokens, node, ...remainingArguments);
 
     return fileContext;
   }

package/src/context.js

@@ -0,0 +1,74 @@
+"use strict";
+
+import { LEVELS, DOUBLE_SPACE } from "./constants";
+
+const [ TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL ] = LEVELS;
+
+export default class Context {
+  constructor(context) {
+    this.context = context;
+  }
+
+  getContext() {
+    return this.context;
+  }
+
+  getDepth() {
+    let depth = this.context.getDepth();
+
+    depth++;
+
+    return depth;
+  }
+
+  getReleaseContext() { return this.context.getReleaseContext(); }
+
+  trace(message) {
+    const level = TRACE_LEVEL;
+
+    this.writeToLog(level, message);
+  }
+
+  debug(message) {
+    const level = DEBUG_LEVEL;
+
+    this.writeToLog(level, message);
+  }
+
+  info(message) {
+    const level = INFO_LEVEL;
+
+    this.writeToLog(level, message);
+  }
+
+  warning(message) {
+    const level = WARNING_LEVEL;
+
+    this.writeToLog(level, message);
+  }
+
+  error(message) {
+    const level = ERROR_LEVEL;
+
+    this.writeToLog(level, message);
+  }
+
+  writeToLog(level, message) {
+    const depth = this.getDepth(),
+          indent = DOUBLE_SPACE.repeat(depth);
+
+    message = `${indent}${message}`;  ///
+
+    const releaseContext = this.getReleaseContext();
+
+    releaseContext.writeToLog(level, message);
+  }
+
+  static fromNothing(Class, ...remainingArguments) {
+    let context = remainingArguments.pop();
+
+    context = new Class(context, ...remainingArguments);  ///
+
+    return context;
+  }
+}

package/src/element/assignment/array.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import Element from "../../element";
 import elements from "../../elements";
 import Exception from "../../exception";
 
@@ -7,17 +8,14 @@ import { define } from "../../elements";
 import { termFromNode } from "../../utilities/term";
 import { NODE_TYPE, NODES_TYPE } from "../../types";
 
-export default define(class ArrayAssigment {
-  constructor(string, variable, parameters) {
-    this.string = string;
+export default define(class ArrayAssigment extends Element {
+  constructor(context, string, node, variable, parameters) {
+    super(context, string, node)
+
     this.variable = variable;
     this.parameters = parameters;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getVariable() {
     return this.variable;
   }
@@ -27,7 +25,7 @@ export default define(class ArrayAssigment {
   }
 
   evaluate(context) {
-    const arrayAssignmentString = this.string; ///
+    const arrayAssignmentString = this.getString(); ///
 
     context.trace(`Evaluating the '${arrayAssignmentString}' array assignment...`);
 

package/src/element/assignment/object.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import Element from "../../element";
 import elements from "../../elements";
 import Exception from "../../exception";
 import nodeProperties from "../../nodeProperties";
@@ -10,17 +11,14 @@ import { NODE_TYPE, NODES_TYPE, STRING_TYPE, BOOLEAN_TYPE } from "../../types";
 import { termFromNodes, termFromBoolean, termFromStringLiteral } from "../../utilities/term";
 import { CONTENT_PARAMETER_NAME, TERMINAL_PARAMETER_NAME, CHILD_NODES_PARAMETER_NAME } from "../../parameterNames";
 
-export default define(class ObjectAssigment {
-  constructor(string, variable, namedParameters) {
-    this.string = string;
+export default define(class ObjectAssigment extends Element {
+  constructor(context, string, node, variable, namedParameters) {
+    super(context, string, node)
+
     this.variable = variable;
     this.namedParameters = namedParameters;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getVariable() {
     return this.variable;
   }
@@ -30,7 +28,7 @@ export default define(class ObjectAssigment {
   }
 
   evaluate(context) {
-    const objectAssignmentString = this.string; ///
+    const objectAssignmentString = this.getString(); ///
 
     context.trace(`Evaluating the '${objectAssignmentString}' object assignment...`);
 

package/src/element/assignment/variable.js

@@ -1,18 +1,17 @@
 "use strict";
 
+import Element from "../../element";
+
 import { define } from "../../elements";
 
-export default define(class VariableAssignment {
-  constructor(string, variable, expression) {
-    this.string = string;
+export default define(class VariableAssignment extends Element {
+  constructor(context, string, node, variable, expression) {
+    super(context, string, node)
+
     this.variable = variable;
     this.expression = expression;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getVariable() {
     return this.variable;
   }
@@ -24,7 +23,7 @@ export default define(class VariableAssignment {
   evaluate(context) {
     let term;
 
-    const variableAssignmentString = this.string; ///
+    const variableAssignmentString = this.getString(); ///
 
     context.trace(`Evaluating the '${variableAssignmentString}' variable assignment...`);
 

package/src/element/assignments/variable.js

@@ -2,14 +2,13 @@
 
 import { define } from "../../elements";
 
-export default define(class VariableAssignments {
-  constructor(string, array) {
-    this.string = string;
-    this.array = array;
-  }
+import Element from "../../element";
 
-  getString() {
-    return this.string;
+export default define(class VariableAssignments extends Element {
+  constructor(context, string, node, array) {
+    super(context, string, node)
+
+    this.array = array;
   }
 
   getArray() {
@@ -17,7 +16,7 @@ export default define(class VariableAssignments {
   }
 
   evaluate(context) {
-    const variableAssignmentsString = this.string; ///
+    const variableAssignmentsString = this.getString(); ///
 
     context.trace(`Evaluating the '${variableAssignmentsString}' variable assignments...`);
 

package/src/element/declaration/procedure.js

@@ -2,16 +2,16 @@
 
 import { define } from "../../elements";
 
-export default define(class ProcedureDeclaration {
-  constructor(string, procedure) {
+import Element from "../../element";
+
+export default define(class ProcedureDeclaration extends Element {
+  constructor(context, string, node, procedure) {
+    super(context, string, node)
+
     this.string = string;
     this.procedure = procedure;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getProcedure() {
     return this.procedure;
   }

package/src/element/error.js

@@ -2,13 +2,11 @@
 
 import { define } from "../elements";
 
-export default define(class Error {
-  constructor(string) {
-    this.string = string;
-  }
+import Element from "../element";
 
-  getString() {
-    return this.string;
+export default define(class Error extends Element {
+  constructor(conterxt, string, node) {
+    super(context, string, node)
   }
 
   verify(context) {

package/src/element/every.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import Element from "../element";
 import elements from "../elements";
 import Exception from "../exception";
 
@@ -7,17 +8,15 @@ import { define } from "../elements";
 import { NODES_TYPE, BOOLEAN_TYPE } from "../types";
 import { termFromNode, termFromBoolean } from "../utilities/term";
 
-export default define(class Every {
-  constructor(string, variable, anonymousProcedure) {
+export default define(class Every extends Element {
+  constructor(context, string, node, variable, anonymousProcedure) {
+    super(context, string, node)
+
     this.string = string;
     this.variable = variable;
     this.anonymousProcedure = anonymousProcedure;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getVariable() {
     return this.variable;
   }

package/src/element/expression.js

@@ -1,10 +1,13 @@
 "use strict";
 
+import Element from "../element";
+
 import { define } from "../elements";
 
-export default define(class Expression {
-  constructor(string, term, some, every, reduce, ternary, nodeQuery, nodesQuery, returnBlock, procedureCall) {
-    this.string = string;
+export default define(class Expression extends Element {
+  constructor(context, string, node, term, some, every, reduce, ternary, nodeQuery, nodesQuery, returnBlock, procedureCall) {
+    super(context, string, node)
+
     this.term = term;
     this.some = some;
     this.every = every;
@@ -16,10 +19,6 @@ export default define(class Expression {
     this.procedureCall = procedureCall;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getTerm() {
     return this.term;
   }

package/src/element/label.js

@@ -1,15 +1,14 @@
 "use strict";
 
+import Element from "../element";
+
 import { define } from "../elements";
 
-export default define(class Label {
-  constructor(string, name) {
-    this.string = string;
-    this.name = name;
-  }
+export default define(class Label extends Element {
+  constructor(context, string, node, name) {
+    super(context, string, node)
 
-  getString() {
-    return this.string;
+    this.name = name;
   }
 
   getName() {

package/src/element/nodeQuery.js

@@ -2,6 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
+import Element from "../element";
 import Exception from "../exception";
 
 import { define } from "../elements";
@@ -10,17 +11,14 @@ import { termFromNode } from "../utilities/term";
 
 const { first } = arrayUtilities;
 
-export default define(class NodeQuery {
-  constructor(string, variable, query) {
-    this.string = string;
+export default define(class NodeQuery extends Element {
+  constructor(context, string, node, variable, query) {
+    super(context, string, node)
+
     this.variable = variable;
     this.query = query;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getVariable() {
     return this.variable;
   }
@@ -32,7 +30,7 @@ export default define(class NodeQuery {
   evaluate(context) {
     let term;
 
-    const nodeQueryString = this.string;  ///
+    const nodeQueryString = this.getString();  ///
 
     context.trace(`Evaluating the '${nodeQueryString}' node query...`);