occam-furtle 2.0.340 → 3.0.1

package/src/element/primitive.js

@@ -2,6 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
+import Element from "../element";
 import elements from "../elements";
 import nullNode from "../nullNode";
 
@@ -10,17 +11,14 @@ import { NODE_TYPE, NODES_TYPE, STRING_TYPE, NUMBER_TYPE, BOOLEAN_TYPE  } from "
 
 const { match } = arrayUtilities;
 
-export default define(class Primitive {
-  constructor(string, type, value) {
-    this.string = string;
+export default define(class Primitive extends Element {
+  constructor(context, string, node, type, value) {
+    super(context, string, node)
+
     this.type = type;
     this.value = value;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getType() {
     return this.type;
   }
@@ -29,56 +27,6 @@ export default define(class Primitive {
     return this.value;
   }
 
-  getNode() {
-    let node = null;
-
-    if (this.type === NODE_TYPE) {
-      node = this.value;  ///
-    }
-
-    return node;
-  }
-
-  getNodes() {
-    let nodes = null;
-
-    if (this.type === NODES_TYPE) {
-      nodes = this.value; ///
-    }
-
-    return nodes;
-  }
-
-  getNumber() {
-    let number = null;
-
-    if (this.type === NUMBER_TYPE) {
-      number = this.value;  ///
-    }
-
-    return number;
-  }
-
-  getBoolean() {
-    let boolean = null;
-
-    if (this.type === BOOLEAN_TYPE) {
-      boolean = this.value; ///
-    }
-
-    return boolean;
-  }
-
-  getStringLiteral() {
-    let stringLiteral = null;
-
-    if (this.type === STRING_TYPE) {
-      stringLiteral = this.value; ///
-    }
-
-    return stringLiteral;
-  }
-
   evaluate(context) {
     const { Term } = elements,
           primitive = this,

package/src/element/procedure/anonymous.js

@@ -1,28 +1,26 @@
 "use strict";
 
+import Element from "../../element";
 import Exception from "../../exception";
 
 import { define } from "../../elements";
 import { variablesFromTermsAndParameters } from "../procedure";
 
-export default define(class AnonymousProcedure {
-  constructor(string, type, parameters, returnBlock) {
-    this.string = string;
+export default define(class AnonymousProcedure extends Element {
+  constructor(context, string, node, type, parameters, returnBlock) {
+    super(context, string, node)
+
     this.type = type;
     this.parameters = parameters;
     this.returnBlock = returnBlock;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getType() {
     return this.type;
   }
 
   getParameters() {
-    return this.paramters;
+    return this.parameters;
   }
 
   getReturnBlock() {
@@ -30,7 +28,7 @@ export default define(class AnonymousProcedure {
   }
 
   call(terms, context) {
-    const anonymousProcedureString = this.string; ///
+    const anonymousProcedureString = this.getString(); ///
 
     context.trace(`Calling the '${anonymousProcedureString}' anonymous procedure...`);
 

package/src/element/procedure.js

@@ -1,24 +1,22 @@
 "use strict";
 
+import Element from "../element";
 import elements from "../elements";
 import Exception from "../exception";
 
 import { define } from "../elements";
 import { BOOLEAN_TYPE } from "../types";
 
-export default define(class Procedure {
-  constructor(string, type, label, parameters, returnBlock) {
-    this.string = string;
+export default define(class Procedure extends Element {
+  constructor(context, string, node, type, label, parameters, returnBlock) {
+    super(context, string, node)
+
     this.type = type;
     this.label = label;
     this.parameters = parameters;
     this.returnBlock = returnBlock;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getType() {
     return this.type;
   }
@@ -49,7 +47,7 @@ export default define(class Procedure {
   matchName(name) { return this.label.matchName(name); }
 
   call(terms, context) {
-    const procedureString = this.string;  ///
+    const procedureString = this.getString();  ///
 
     context.trace(`Calling the '${procedureString}' procedure...`);
 

package/src/element/procedureCall.js

@@ -1,20 +1,18 @@
 "use strict";
 
+import Element from "../element";
 import Exception from "../exception";
 
 import { define } from "../elements";
 
-export default define(class ProcedureCall {
-  constructor(string, reference, terms) {
-    this.string = string;
+export default define(class ProcedureCall extends Element {
+  constructor(context, string, node, reference, terms) {
+    super(context, string, node)
+
     this.reference = reference;
     this.terms = terms;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getReference() {
     return this.reference;
   }
@@ -26,7 +24,7 @@ export default define(class ProcedureCall {
   getName() { return this.reference.getName(); }
 
   evaluate(context) {
-    const procedureCallString = this.string;  ///
+    const procedureCallString = this.getString();  ///
 
     context.trace(`Evaluating the '${procedureCallString}' procedure call...`);
 

package/src/element/reduce.js

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

package/src/element/reference.js

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

package/src/element/returnBlock.js

@@ -1,22 +1,20 @@
 "use strict";
 
+import Element from "../element";
 import Exception from "../exception";
 import BlockContext from "../context/block";
 
 import { define } from "../elements";
 
-export default define(class ReturnBlock {
-  constructor(string, steps, nonsensical, returnStatement) {
-    this.string = string;
+export default define(class ReturnBlock extends Element {
+  constructor(context, string, node, steps, nonsensical, returnStatement) {
+    super(context, string, node)
+
     this.steps = steps;
     this.nonsensical = nonsensical;
     this.returnStatement = returnStatement;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getSteps() {
     return this.steps;
   }

package/src/element/some.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 { NODES_TYPE, BOOLEAN_TYPE } from "../types";
 import { termFromNode, termFromBoolean } from "../utilities/term";
 
-export default define(class Some {
-  constructor(string, variable, anonymousProcedure) {
-    this.string = string;
+export default define(class Some extends Element {
+  constructor(context, string, node, variable, anonymousProcedure) {
+    super(context, string, node)
+
     this.variable = variable;
     this.anonymousProcedure = anonymousProcedure;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getVariable() {
     return this.variable;
   }
@@ -45,7 +43,8 @@ export default define(class Some {
       throw exception;
     }
 
-    const nodes = term.getNodes(),
+    const primitiveValue = term.getPrimitiveValue(),
+          nodes = primitiveValue, ///
           boolean = nodes.some((node) => {
             let term;
 
@@ -66,7 +65,8 @@ export default define(class Some {
               throw exception;
             }
 
-            const boolean = term.getBoolean();
+            const primitiveValue = term.getPrimitiveValue(),
+                  boolean = primitiveValue; ///
 
             return boolean;
           });

package/src/element/statement/return.js

@@ -2,14 +2,13 @@
 
 import { define } from "../../elements";
 
-export default define(class ReturnStatement {
-  constructor(string, term) {
-    this.string = string;
-    this.term = term;
-  }
+import Element from "../../element";
 
-  getString() {
-    return this.string;
+export default define(class ReturnStatement extends Element {
+  constructor(context, string, node, term) {
+    super(context, string, node)
+
+    this.term = term;
   }
 
   getExpression() {
@@ -19,7 +18,7 @@ export default define(class ReturnStatement {
   evaluate(context) {
     let term;
 
-    const returnStatementString = this.string;  ///
+    const returnStatementString = this.getString();  ///
 
     context.trace(`Evaluating the '${returnStatementString}' return statement...`);
 

package/src/element/step.js

@@ -1,19 +1,18 @@
 "use strict";
 
+import Element from "../element";
+
 import { define } from "../elements";
 
-export default define(class Step {
-  constructor(string, arrayAssignment, objectAssigment, variablessAssignment) {
-    this.string = string;
+export default define(class Step extends Element {
+  constructor(context, string, node, arrayAssignment, objectAssigment, variablessAssignment) {
+    super(context, string, node)
+
     this.arrayAssignment = arrayAssignment;
     this.objectAssigment = objectAssigment;
     this.variablessAssignment = variablessAssignment;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getArrayAssignment() {
     return this.arrayAssignment;
   }

package/src/element/term/bracketed.js

@@ -2,14 +2,13 @@
 
 import { define } from "../../elements";
 
-export default define(class BracketedTerm {
-  constructor(string, term) {
-    this.string = string;
-    this.term = term;
-  }
+import Element from "../../element";
 
-  getString() {
-    return this.string;
+export default define(class BracketedTerm extends Element {
+  constructor(context, string, node, term) {
+    super(context, string, node)
+
+    this.term = term;
   }
 
   getTerm() {
@@ -21,7 +20,7 @@ export default define(class BracketedTerm {
   evaluate(context) {
     let term;
 
-    const bracketedTermString = this.string; ///
+    const bracketedTermString = this.getString(); ///
 
     context.trace(`Evaluating the '${bracketedTermString}' bracketed term...`);
 

package/src/element/term/comparison.js

@@ -1,22 +1,20 @@
 "use strict";
 
+import Element from "../../element";
 import Exception from "../../exception";
 
 import { define } from "../../elements";
 import { termFromBoolean } from "../../utilities/term";
 
-export default define(class ComparisonTerm {
-  constructor(string, negated, leftTerm, rightTerm) {
-    this.string = string;
+export default define(class ComparisonTerm extends Element {
+  constructor(context, string, node, negated, leftTerm, rightTerm) {
+    super(context, string, node)
+
     this.negated = negated;
     this.leftTerm = leftTerm;
     this.rightTerm = rightTerm;
   }
 
-  getString() {
-    return this.string;
-  }
-
   isNegated() {
     return this.negated;
   }
@@ -32,7 +30,7 @@ export default define(class ComparisonTerm {
   evaluate(context) {
     let term;
 
-    const comparisonTermString = this.string; ///
+    const comparisonTermString = this.getString(); ///
 
     context.trace(`Evaluating the '${comparisonTermString}' comparison term...`);
 

package/src/element/term/logical.js

@@ -1,24 +1,22 @@
 "use strict";
 
+import Element from "../../element";
 import Exception from "../../exception";
 
 import { define } from "../../elements";
 import { BOOLEAN_TYPE } from "../../types";
 import { termFromBoolean } from "../../utilities/term";
 
-export default define(class LogicalTerm {
-  constructor(string, type, disjunction, leftTerm, rightTerm) {
-    this.string = string;
+export default define(class LogicalTerm extends Element {
+  constructor(context, string, node, type, disjunction, leftTerm, rightTerm) {
+    super(context, string, node)
+
     this.type = type;
     this.disjunction = disjunction;
     this.leftTerm = leftTerm;
     this.rightTerm = rightTerm;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getType() {
     return this.type;
   }
@@ -38,7 +36,7 @@ export default define(class LogicalTerm {
   evaluate(context) {
     let term;
 
-    const logicalTermString = this.string; ///
+    const logicalTermString = this.getString(); ///
 
     context.trace(`Evaluating the '${logicalTermString}' logical term...`);
 
@@ -63,11 +61,13 @@ export default define(class LogicalTerm {
       throw exception;
     }
 
-    const leftTermBoolean = leftTerm.getBoolean(),
-          rightTermBoolean = rightTerm.getBoolean(),
+    const leftTermPrimitiveValue = leftTerm.getPrimitiveValue(),
+          rightTermPrimitiveValue = rightTerm.getPrimitiveValue(),
+          leftBoolean =leftTermPrimitiveValue, ///
+          rightBoolean = rightTermPrimitiveValue, ///
           boolean = this.disjunction ?
-                      (leftTermBoolean || rightTermBoolean) :
-                        (leftTermBoolean && rightTermBoolean);
+                      (leftBoolean || rightBoolean) :
+                        (leftBoolean && rightBoolean);
 
     term = termFromBoolean(boolean, context);
 

package/src/element/term/negated.js

@@ -1,22 +1,20 @@
 "use strict";
 
+import Element from "../../element";
 import Exception from "../../exception";
 
 import { define } from "../../elements";
 import { BOOLEAN_TYPE } from "../../types";
 import { termFromBoolean } from "../../utilities/term";
 
-export default define(class NegatedTerm {
-  constructor(string, type, term) {
-    this.string = string;
+export default define(class NegatedTerm extends Element {
+  constructor(context, string, node, type, term) {
+    super(context, string, node)
+
     this.type = type;
     this.term = term;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getType() {
     return this.type;
   }
@@ -28,7 +26,7 @@ export default define(class NegatedTerm {
   evaluate(context) {
     let term;
 
-    const negatedTermString = this.string; ///
+    const negatedTermString = this.getString(); ///
 
     context.trace(`Evaluating the '${negatedTermString}' negated term...`);
 
@@ -44,7 +42,11 @@ export default define(class NegatedTerm {
       throw exception;
     }
 
-    let boolean = term.getBoolean();
+    let boolean;
+
+    const primitiveValue = term.getPrimitiveValue();
+
+    boolean = primitiveValue; ///
 
     boolean = !boolean;
 

package/src/element/term.js

@@ -1,10 +1,13 @@
 "use strict";
 
+import Element from "../element";
+
 import { define } from "../elements";
 
-export default define(class Term {
-  constructor(string, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm) {
-    this.string = string;
+export default define(class Term extends Element {
+  constructor(context, string, node, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm) {
+    super(context, string, node)
+
     this.variable = variable;
     this.primitive = primitive;
     this.negatedTerm = negatedTerm;
@@ -13,10 +16,6 @@ export default define(class Term {
     this.comparisonTerm = comparisonTerm;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getVariable() {
     return this.variable;
   }
@@ -41,15 +40,11 @@ export default define(class Term {
     return this.comparisonTerm;
   }
 
-  getNode() { return this.primitive.getNode(); }
-
-  getNodes() { return this.primitive.getNodes(); }
+  getPrimitiveValue() {
+    const primitiveValue = this.primitive.getValue();
 
-  getNumber() { return this.primitive.getNumber(); }
-
-  getBoolean() { return this.primitive.getBoolean(); }
-
-  getStringLiteral() { return this.primitive.getStringLiteral(); }
+    return primitiveValue;
+  }
 
   getType() {
     let type;
@@ -122,12 +117,16 @@ export default define(class Term {
   static fromPrimitive(primitive, context) {
     const primitiveString = primitive.getString(),
           string = primitiveString, ///
+          node = null,
           variable = null,
           negatedTerm = null,
           logicalTerm = null,
           bracketedTerm = null,
-          comparisonTerm = null,
-          term = new Term(string, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm);
+          comparisonTerm = null;
+
+    context = null;
+
+    const term = new Term(context, string, node, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm);
 
     return term;
   }

package/src/element/terms.js

@@ -1,16 +1,15 @@
 "use strict";
 
+import Element from "../element";
+
 import { define } from "../elements";
 import { termsStringFromTermsArray } from "../utilities/string";
 
-export default define(class Terms {
-  constructor(string, array) {
-    this.string = string;
-    this.array = array;
-  }
+export default define(class Terms extends Element {
+  constructor(context, string, node, array) {
+    super(context, string, node)
 
-  getString() {
-    return this.string;
+    this.array = array;
   }
 
   getArray() {
@@ -46,7 +45,11 @@ export default define(class Terms {
           termsString = termsStringFromTermsArray(termsArray, context),
           string = termsString, ///
           array = termsArray, ///
-          terms = new Terms(string, array);
+          node = null;
+
+    context = null;
+
+    const terms = new Terms(context, string, node, array);
 
     return terms;
   }
@@ -60,7 +63,11 @@ export default define(class Terms {
           termsString = termsStringFromTermsArray(termsArray, context),
           string = termsString, ///
           array = termsArray, ///
-          terms = new Terms(string, array);
+          node = null;
+
+    context = null;
+
+    const terms = new Terms(context, string, node, array);
 
     return terms;
   }