#274: Reinstated calling left and right left and right.

jvdb · jvdb · commit 61aa27f7e20a · 2018-12-21T10:16:51.000+01:00
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/BinaryValueExpression.java b/core/src/main/java/io/parsingdata/metal/expression/value/BinaryValueExpression.java
@@ -34,7 +34,7 @@
  * Base class for {@link ValueExpression}s with two operands.
  * <p>
  * A BinaryValueExpression implements a ValueExpression that has two operands:
- * <code>lefts</code> and <code>rights</code> (both {@link ValueExpression}s).
+ * <code>left</code> and <code>right</code> (both {@link ValueExpression}s).
  * Both operands are first evaluated. If at least one of the operands evaluates to
  * {@link Optional#empty()}, the result of the ValueExpression itself will be
  * empty as well.
@@ -53,19 +53,19 @@
  */
 public abstract class BinaryValueExpression implements ValueExpression {
 
-    public final ValueExpression lefts;
-    public final ValueExpression rights;
+    public final ValueExpression left;
+    public final ValueExpression right;
 
-    public BinaryValueExpression(final ValueExpression lefts, final ValueExpression rights) {
-        this.lefts = checkNotNull(lefts, "lefts");
-        this.rights = checkNotNull(rights, "rights");
+    public BinaryValueExpression(final ValueExpression left, final ValueExpression right) {
+        this.left = checkNotNull(left, "left");
+        this.right = checkNotNull(right, "right");
     }
 
     public abstract Optional<Value> eval(final Value leftValue, final Value rightValue, final ParseState parseState, final Encoding encoding);
 
     @Override
     public ImmutableList<Optional<Value>> eval(final ParseState parseState, final Encoding encoding) {
-        return evalLists(lefts.eval(parseState, encoding), rights.eval(parseState, encoding), parseState, encoding);
+        return evalLists(left.eval(parseState, encoding), right.eval(parseState, encoding), parseState, encoding);
     }
 
     private ImmutableList<Optional<Value>> evalLists(final ImmutableList<Optional<Value>> leftValues, final ImmutableList<Optional<Value>> rightValues, final ParseState parseState, final Encoding encoding) {
@@ -88,19 +88,19 @@ private Trampoline<ImmutableList<Optional<Value>>> padList(final ImmutableList<O
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "(" + lefts + "," + rights + ")";
+        return getClass().getSimpleName() + "(" + left + "," + right + ")";
     }
 
     @Override
     public boolean equals(final Object obj) {
         return Util.notNullAndSameClass(this, obj)
-            && Objects.equals(lefts, ((BinaryValueExpression)obj).lefts)
-            && Objects.equals(rights, ((BinaryValueExpression)obj).rights);
+            && Objects.equals(left, ((BinaryValueExpression)obj).left)
+            && Objects.equals(right, ((BinaryValueExpression)obj).right);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getClass(), lefts, rights);
+        return Objects.hash(getClass(), left, right);
     }
 
 }
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/Cat.java b/core/src/main/java/io/parsingdata/metal/expression/value/Cat.java
@@ -32,8 +32,8 @@
  */
 public class Cat extends BinaryValueExpression {
 
-    public Cat(final ValueExpression lefts, final ValueExpression rights) {
-        super(lefts, rights);
+    public Cat(final ValueExpression left, final ValueExpression right) {
+        super(left, right);
     }
 
     @Override
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/Elvis.java b/core/src/main/java/io/parsingdata/metal/expression/value/Elvis.java
@@ -34,27 +34,27 @@
  * A {@link ValueExpression} that implements the Elvis operator:
  * <pre>?:</pre>.
  * <p>
- * An Elvis expression has two operands: <code>lefts</code> and <code>rights</code>
+ * An Elvis expression has two operands: <code>left</code> and <code>right</code>
  * (both {@link ValueExpression}s). Both operands are evaluated. The return value is
  * a list with the size of the longest list returned by the two evaluations. At
  * each index, the value at that index in the result returned by evaluating
- * <code>lefts</code> is placed, except if it does not exist or is {@link Optional#empty()},
- * in which case the value at that index in the result returned by evaluating rights is
+ * <code>left</code> is placed, except if it does not exist or is {@link Optional#empty()},
+ * in which case the value at that index in the result returned by evaluating right is
  * placed there.
  */
 public class Elvis implements ValueExpression {
 
-    public final ValueExpression lefts;
-    public final ValueExpression rights;
+    public final ValueExpression left;
+    public final ValueExpression right;
 
-    public Elvis(final ValueExpression lefts, final ValueExpression rights) {
-        this.lefts = checkNotNull(lefts, "lefts");
-        this.rights = checkNotNull(rights, "rights");
+    public Elvis(final ValueExpression left, final ValueExpression right) {
+        this.left = checkNotNull(left, "left");
+        this.right = checkNotNull(right, "right");
     }
 
     @Override
     public ImmutableList<Optional<Value>> eval(final ParseState parseState, final Encoding encoding) {
-        return reverse(eval(new ImmutableList<>(), lefts.eval(parseState, encoding), rights.eval(parseState, encoding)).computeResult());
+        return reverse(eval(new ImmutableList<>(), left.eval(parseState, encoding), right.eval(parseState, encoding)).computeResult());
     }
 
     private Trampoline<ImmutableList<Optional<Value>>> eval(final ImmutableList<Optional<Value>> result, final ImmutableList<Optional<Value>> leftValues, final ImmutableList<Optional<Value>> rightValues) {
@@ -69,19 +69,19 @@ private Trampoline<ImmutableList<Optional<Value>>> eval(final ImmutableList<Opti
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "(" + lefts + "," + rights + ")";
+        return getClass().getSimpleName() + "(" + left + "," + right + ")";
     }
 
     @Override
     public boolean equals(final Object obj) {
         return Util.notNullAndSameClass(this, obj)
-            && Objects.equals(lefts, ((Elvis)obj).lefts)
-            && Objects.equals(rights, ((Elvis)obj).rights);
+            && Objects.equals(left, ((Elvis)obj).left)
+            && Objects.equals(right, ((Elvis)obj).right);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getClass(), lefts, rights);
+        return Objects.hash(getClass(), left, right);
     }
 
 }
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Add.java b/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Add.java
@@ -30,8 +30,8 @@
  */
 public class Add extends BinaryValueExpression {
 
-    public Add(final ValueExpression lefts, final ValueExpression rights) {
-        super(lefts, rights);
+    public Add(final ValueExpression left, final ValueExpression right) {
+        super(left, right);
     }
 
     @Override
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Div.java b/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Div.java
@@ -30,13 +30,13 @@
 /**
  * A {@link BinaryValueExpression} that implements integer division.
  * <p>
- * If one of the values resulting from evaluating <code>rights</code> is equal
+ * If one of the values resulting from evaluating <code>right</code> is equal
  * to zero, the associated result will be empty.
  */
 public class Div extends BinaryValueExpression {
 
-    public Div(final ValueExpression lefts, final ValueExpression rights) {
-        super(lefts, rights);
+    public Div(final ValueExpression left, final ValueExpression right) {
+        super(left, right);
     }
 
     @Override
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Mod.java b/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Mod.java
@@ -30,13 +30,13 @@
 /**
  * A {@link BinaryValueExpression} that implements the modulo operation.
  * <p>
- * If one of the values resulting from evaluating <code>rights</code> is equal
+ * If one of the values resulting from evaluating <code>right</code> is equal
  * to or small than zero, the associated result will be empty.
  */
 public class Mod extends BinaryValueExpression {
 
-    public Mod(final ValueExpression lefts, final ValueExpression rights) {
-        super(lefts, rights);
+    public Mod(final ValueExpression left, final ValueExpression right) {
+        super(left, right);
     }
 
     @Override
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Mul.java b/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Mul.java
@@ -30,8 +30,8 @@
  */
 public class Mul extends BinaryValueExpression {
 
-    public Mul(final ValueExpression lefts, final ValueExpression rights) {
-        super(lefts, rights);
+    public Mul(final ValueExpression left, final ValueExpression right) {
+        super(left, right);
     }
 
     @Override
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Sub.java b/core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Sub.java
@@ -30,8 +30,8 @@
  */
 public class Sub extends BinaryValueExpression {
 
-    public Sub(final ValueExpression lefts, final ValueExpression rights) {
-        super(lefts, rights);
+    public Sub(final ValueExpression left, final ValueExpression right) {
+        super(left, right);
     }
 
     @Override
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/bitwise/And.java b/core/src/main/java/io/parsingdata/metal/expression/value/bitwise/And.java
@@ -31,8 +31,8 @@
  */
 public class And extends BinaryValueExpression {
 
-    public And(final ValueExpression lefts, final ValueExpression rights) {
-        super(lefts, rights);
+    public And(final ValueExpression left, final ValueExpression right) {
+        super(left, right);
     }
 
     @Override
diff --git a/core/src/main/java/io/parsingdata/metal/expression/value/bitwise/Or.java b/core/src/main/java/io/parsingdata/metal/expression/value/bitwise/Or.java
@@ -31,8 +31,8 @@
  */
 public class Or extends BinaryValueExpression {
 
-    public Or(final ValueExpression lefts, final ValueExpression rights) {
-        super(lefts, rights);
+    public Or(final ValueExpression left, final ValueExpression right) {
+        super(left, right);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@`
`32`	`32`	`*/`
`33`	`33`	`public class Cat extends BinaryValueExpression {`
`34`	`34`
`35`		`- public Cat(final ValueExpression lefts, final ValueExpression rights) {`
`36`		`- super(lefts, rights);`
	`35`	`+ public Cat(final ValueExpression left, final ValueExpression right) {`
	`36`	`+ super(left, right);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@`
`30`	`30`	`*/`
`31`	`31`	`public class Add extends BinaryValueExpression {`
`32`	`32`
`33`		`- public Add(final ValueExpression lefts, final ValueExpression rights) {`
`34`		`- super(lefts, rights);`
	`33`	`+ public Add(final ValueExpression left, final ValueExpression right) {`
	`34`	`+ super(left, right);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@`
`31`	`31`	`*/`
`32`	`32`	`public class And extends BinaryValueExpression {`
`33`	`33`
`34`		`- public And(final ValueExpression lefts, final ValueExpression rights) {`
`35`		`- super(lefts, rights);`
	`34`	`+ public And(final ValueExpression left, final ValueExpression right) {`
	`35`	`+ super(left, right);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`