occam-furtle 2.0.340 → 3.0.1

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...`);
 
@@ -42,7 +40,8 @@ export default define(class ArrayAssigment {
       throw exception;
     }
 
-    const nodes = term.getNodes(),
+    const primitiveValue = term.getPrimitiveValue(),
+          nodes = primitiveValue, ///
           nodesLength = nodes.length,
           parametersLength = this.parameters.getLength();
 

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...`);
 
@@ -104,7 +102,8 @@ export default define(class ObjectAssigment {
       throw exception;
     }
 
-    const node = term.getNode(),
+    const primitiveValue = term.getPrimitiveValue(),
+          node = primitiveValue,  ///
           nodeTerminalNode = node.isTerminalNode();
 
     if (!nodeTerminalNode) {
@@ -143,7 +142,8 @@ export default define(class ObjectAssigment {
       throw exception;
     }
 
-    const node = term.getNode(),
+    const primitiveValue = term.getPrimitiveValue(),
+          node = primitiveValue,  ///
           nodeTerminalNode = node.isTerminalNode(),
           terminal = nodeTerminalNode;  ///
 
@@ -172,7 +172,8 @@ export default define(class ObjectAssigment {
       throw exception;
     }
 
-    const node = term.getNode(),
+    const primitiveValue = term.getPrimitiveValue(),
+          node = primitiveValue,  ///
           nodeNonTerminalNode = node.isNonTerminalNode();
 
     if (!nodeNonTerminalNode) {

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,12 +1,14 @@
 "use strict";
 
+import Element from "../element";
+
 import { define } from "../elements";
 
-export default define(class Expression {
-  constructor(string, variable, primitive, some, every, reduce, ternary, nodeQuery, nodesQuery, returnBlock, procedureCall) {
-    this.string = string;
-    this.variable = variable;
-    this.primitive = primitive;
+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;
     this.reduce = reduce;
@@ -17,16 +19,8 @@ export default define(class Expression {
     this.procedureCall = procedureCall;
   }
 
-  getString() {
-    return this.string;
-  }
-
-  getVariable() {
-    return this.variable;
-  }
-
-  getPrimitive() {
-    return this.primitive;
+  getTerm() {
+    return this.term;
   }
 
   getSome() {
@@ -61,25 +55,13 @@ export default define(class Expression {
     return this.procedureCall;
   }
 
-  getNode() { return this.primitive.getNode(); }
-
-  getNodes() { return this.primitive.getNodes(); }
-
-  getNumber() { return this.primitive.getNumber(); }
-
-  getBoolean() { return this.primitive.getBoolean(); }
-
-  getStringLiteral() { return this.primitive.getStringLiteral(); }
-
   getType() {
     let type;
 
     if (false) {
       ///
-    } else if (this.variable !== null) {
-      type = this.variable.getType();
-    } else if (this.primitive !== null) {
-      type = this.primitive.getType();
+    } else if (this.term !== null) {
+      type = this.term.getType();
     } else if (this.some !== null) {
       type = this.some.getType();
     } else if (this.every !== null) {
@@ -106,10 +88,8 @@ export default define(class Expression {
 
     if (false) {
       ///
-    } else if (this.variable !== null) {
-      term = this.variable.evaluate(context);
-    } else if (this.primitive !== null) {
-      term = this.primitive.evaluate(context);
+    } else if (this.term !== null) {
+      term = this.term.evaluate(context);
     } else if (this.some !== null) {
       term = this.some.evaluate(context);
     } else if (this.every !== null) {

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...`);
 
@@ -55,9 +53,13 @@ export default define(class NodeQuery {
       throw exception;
     }
 
-    const termNode = term.getNode();
+    let node;
+
+    const primitiveValue = term.getPrimitiveValue();
 
-    if (termNode === null) {
+    node = primitiveValue;  ///
+
+    if (node === null) {
       const termString = term.getString(),
             message = `The '${termString}' term's node is null.`,
             exception = Exception.fromMessage(message);
@@ -65,10 +67,6 @@ export default define(class NodeQuery {
       throw exception;
     }
 
-    let node;
-
-    node = termNode; ///
-
     const nodes = this.query.execute(node),
           nodesLength = nodes.length;
 

package/src/element/nodesQuery.js

@@ -1,22 +1,20 @@
 "use strict";
 
+import Element from "../element";
 import Exception from "../exception";
 
 import { define } from "../elements";
 import { NODE_TYPE } from "../types";
 import { termFromNodes } from "../utilities/term";
 
-export default define(class NodesQuery {
-  constructor(string, variable, query) {
-    this.string = string;
+export default define(class NodesQuery 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;
   }
@@ -28,7 +26,7 @@ export default define(class NodesQuery {
   evaluate(context) {
     let term;
 
-    const nodesQueryString = this.string;  ///
+    const nodesQueryString = this.getString();  ///
 
     context.trace(`Evaluating the '${nodesQueryString}' nodes query...`);
 
@@ -51,9 +49,13 @@ export default define(class NodesQuery {
       throw exception;
     }
 
-    const termNode = term.getNode();
+    let node;
+
+    const primitiveValue = term.getPrimitiveValue();
 
-    if (termNode === null) {
+    node = primitiveValue;  ///
+
+    if (node === null) {
       const termString = term.getString(),
             message = `The '${termString}' term's node is null.`,
             exception = Exception.fromMessage(message);
@@ -61,10 +63,6 @@ export default define(class NodesQuery {
       throw exception;
     }
 
-    let node;
-
-    node = termNode; ///
-
     const nodes = this.query.execute(node);
 
     term = termFromNodes(nodes, context);

package/src/element/parameter/named.js

@@ -4,18 +4,17 @@ import Exception from "../../exception";
 
 import { define } from "../../elements";
 
-export default define(class NamedParameter {
-  constructor(string, type, name, alias) {
-    this.string = string;
+import Element from "../../element";
+
+export default define(class NamedParameter extends Element {
+  constructor(context, string, node, type, name, alias) {
+    super(context, string, node)
+
     this.type = type;
     this.name = name;
     this.alias = alias;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getType() {
     return this.type;
   }
@@ -45,7 +44,7 @@ export default define(class NamedParameter {
 
   matchTerm(term, context) {
     const termString = term.getString(),
-          namedParameterString = this.string;  ///
+          namedParameterString = this.getString();  ///
 
     context.trace(`Matching the '${termString}' term against the '${namedParameterString}' named parameter...`);
 

package/src/element/parameter.js

@@ -1,20 +1,18 @@
 "use strict";
 
+import Element from "../element";
 import Exception from "../exception";
 
 import { define } from "../elements";
 
-export default define(class Parameter {
-  constructor(string, type, name) {
-    this.string = string;
+export default define(class Parameter extends Element {
+  constructor(context, string, node, type, name) {
+    super(context, string, node)
+
     this.type = type;
     this.name = name;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getType() {
     return this.type;
   }
@@ -25,7 +23,7 @@ export default define(class Parameter {
 
   matchTerm(term, context) {
     const termString = term.getString(),
-          parameterString = this.string;  ///
+          parameterString = this.getString();  ///
 
     context.trace(`Matching the '${termString}' term against the '${parameterString}' parameter...`);
 

package/src/element/parameters/named.js

@@ -4,14 +4,13 @@ import Exception from "../../exception";
 
 import { define } from "../../elements";
 
-export default define(class NamedParameters {
-  constructor(string, array) {
-    this.string = string;
-    this.array = array;
-  }
+import Element from "../../element";
 
-  getString() {
-    return this.string;
+export default define(class NamedParameters extends Element {
+  constructor(context, string, node, array) {
+    super(context, string, node)
+
+    this.array = array;
   }
 
   getArray() {
@@ -36,7 +35,7 @@ export default define(class NamedParameters {
 
   matchTerms(terms, context) {
     const termsString = terms.getString(),
-          namedParametersString = this.string; ///
+          namedParametersString = this.getString(); ///
 
     context.trace(`Matching the '${termsString}' terms against the '${namedParametersString}' named parameters...`);
 
@@ -63,7 +62,7 @@ export default define(class NamedParameters {
 
   matchNamedParameter(namedParameter, context) {
     const namedParameterString = namedParameter.getString(),
-          namedParametersString = this.string; ///
+          namedParametersString = this.getString(); ///
 
     context.trace(`Matching the '${namedParameterString}' namedParameter against the '${namedParametersString}' named parameters...`);
 

package/src/element/parameters.js

@@ -1,17 +1,15 @@
 "use strict";
 
+import Element from "../element";
 import Exception from "../exception";
 
 import { define } from "../elements";
 
-export default define(class Parameters {
-  constructor(string, array) {
-    this.string = string;
-    this.array = array;
-  }
+export default define(class Parameters extends Element {
+  constructor(context, string, node, array) {
+    super(context, string, node)
 
-  getString() {
-    return this.string;
+    this.array = array;
   }
 
   getArray() {
@@ -34,7 +32,7 @@ export default define(class Parameters {
 
   matchTerms(terms, context) {
     const termsString = terms.getString(),
-          parametersString = this.string; ///
+          parametersString = this.getString(); ///
 
     context.trace(`Matching the '${termsString}' terms against the '${parametersString}' parameters...`);