Skip to content

Commit a8d996e

Browse files
jvdbjvdb
committed
#274: Reinstated calling operand operand.
1 parent 61aa27f commit a8d996e

File tree

12 files changed

+66
-66
lines changed

12 files changed

+66
-66
lines changed

‎core/src/main/java/io/parsingdata/metal/expression/value/Bytes.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,30 @@
3535

3636
/**
3737
* A {@link ValueExpression} that splits the results of evaluating its
38-
* <code>operands</code> into individual bytes.
38+
* <code>operand</code> into individual bytes.
3939
* <p>
40-
* A Bytes expression has a single <code>operands</code> (a
41-
* {@link ValueExpression}). When evaluated, it evaluates <code>operands</code>
40+
* A Bytes expression has a single <code>operand</code> (a
41+
* {@link ValueExpression}). When evaluated, it evaluates <code>operand</code>
4242
* and instead of returning the list of results, each result is split into
4343
* {@link Value} objects representing each individual byte of the original
4444
* result.
4545
* <p>
46-
* For example, if <code>operands</code> evaluates to a list of two values, of
46+
* For example, if <code>operand</code> evaluates to a list of two values, of
4747
* 2 and 3 bytes respectively, the <code>Bytes</code> expression turns this
4848
* into a list of 5 values, representing the individual bytes of the original
4949
* results.
5050
*/
5151
public class Bytes implements ValueExpression {
5252

53-
public final ValueExpression operands;
53+
public final ValueExpression operand;
5454

55-
public Bytes(final ValueExpression operands) {
56-
this.operands = checkNotNull(operands, "operands");
55+
public Bytes(final ValueExpression operand) {
56+
this.operand = checkNotNull(operand, "operand");
5757
}
5858

5959
@Override
6060
public ImmutableList<Optional<Value>> eval(final ParseState parseState, final Encoding encoding) {
61-
final ImmutableList<Optional<Value>> evaluatedOperands = operands.eval(parseState, encoding);
61+
final ImmutableList<Optional<Value>> evaluatedOperands = operand.eval(parseState, encoding);
6262
if (evaluatedOperands.isEmpty()) {
6363
return evaluatedOperands;
6464
}
@@ -81,18 +81,18 @@ private Trampoline<ImmutableList<Optional<Value>>> extractByteValues(final Immut
8181

8282
@Override
8383
public String toString() {
84-
return getClass().getSimpleName() + "(" + operands + ")";
84+
return getClass().getSimpleName() + "(" + operand + ")";
8585
}
8686

8787
@Override
8888
public boolean equals(final Object obj) {
8989
return Util.notNullAndSameClass(this, obj)
90-
&& Objects.equals(operands, ((Bytes)obj).operands);
90+
&& Objects.equals(operand, ((Bytes)obj).operand);
9191
}
9292

9393
@Override
9494
public int hashCode() {
95-
return Objects.hash(getClass(), operands);
95+
return Objects.hash(getClass(), operand);
9696
}
9797

9898
}

‎core/src/main/java/io/parsingdata/metal/expression/value/FoldCat.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,34 @@
3939
*/
4040
public class FoldCat implements ValueExpression {
4141

42-
public final ValueExpression operands;
42+
public final ValueExpression operand;
4343

44-
public FoldCat(final ValueExpression operands) {
45-
this.operands = checkNotNull(operands, "operands");
44+
public FoldCat(final ValueExpression operand) {
45+
this.operand = checkNotNull(operand, "operand");
4646
}
4747

4848
@Override
4949
public ImmutableList<Optional<Value>> eval(final ParseState parseState, final Encoding encoding) {
50-
return ConcatenatedValueSource.create(operands.eval(parseState, encoding))
50+
return ConcatenatedValueSource.create(operand.eval(parseState, encoding))
5151
.flatMap(source -> createFromSource(source, ZERO, source.length))
5252
.map(slice -> new ImmutableList<Optional<Value>>().add(Optional.of(new Value(slice, encoding))))
5353
.orElseGet(() -> ImmutableList.create(Optional.empty()));
5454
}
5555

5656
@Override
5757
public String toString() {
58-
return getClass().getSimpleName() + "(" + operands + ")";
58+
return getClass().getSimpleName() + "(" + operand + ")";
5959
}
6060

6161
@Override
6262
public boolean equals(final Object obj) {
6363
return Util.notNullAndSameClass(this, obj)
64-
&& Objects.equals(operands, ((FoldCat)obj).operands);
64+
&& Objects.equals(operand, ((FoldCat)obj).operand);
6565
}
6666

6767
@Override
6868
public int hashCode() {
69-
return Objects.hash(getClass(), operands);
69+
return Objects.hash(getClass(), operand);
7070
}
7171

7272
}

‎core/src/main/java/io/parsingdata/metal/expression/value/UnaryValueExpression.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
/**
3434
* Base class for {@link ValueExpression}s with one operand.
3535
* <p>
36-
* A UnaryValueExpression implements a ValueExpression that has a single <code>operands</code>
37-
* (a {@link ValueExpression}). <code>operands</code> is first evaluated. If it evaluates
36+
* A UnaryValueExpression implements a ValueExpression that has a single <code>operand</code>
37+
* (a {@link ValueExpression}). <code>operand</code> is first evaluated. If it evaluates
3838
* to {@link Optional#empty()}, the result of the ValueExpression itself will be that as well.
3939
* <p>
4040
* To implement a UnaryValueExpression, only the {@link #eval(Value, ParseState, Encoding)}
@@ -45,15 +45,15 @@
4545
*/
4646
public abstract class UnaryValueExpression implements ValueExpression {
4747

48-
public final ValueExpression operands;
48+
public final ValueExpression operand;
4949

50-
public UnaryValueExpression(final ValueExpression operands) {
51-
this.operands = checkNotNull(operands, "operands");
50+
public UnaryValueExpression(final ValueExpression operand) {
51+
this.operand = checkNotNull(operand, "operand");
5252
}
5353

5454
@Override
5555
public ImmutableList<Optional<Value>> eval(final ParseState parseState, final Encoding encoding) {
56-
return reverse(eval(operands.eval(parseState, encoding), parseState, encoding, new ImmutableList<>()).computeResult());
56+
return reverse(eval(operand.eval(parseState, encoding), parseState, encoding, new ImmutableList<>()).computeResult());
5757
}
5858

5959
private Trampoline<ImmutableList<Optional<Value>>> eval(final ImmutableList<Optional<Value>> evaluatedValues, final ParseState parseState, final Encoding encoding, final ImmutableList<Optional<Value>> result) {
@@ -67,18 +67,18 @@ private Trampoline<ImmutableList<Optional<Value>>> eval(final ImmutableList<Opti
6767

6868
@Override
6969
public String toString() {
70-
return getClass().getSimpleName() + "(" + operands + ")";
70+
return getClass().getSimpleName() + "(" + operand + ")";
7171
}
7272

7373
@Override
7474
public boolean equals(final Object obj) {
7575
return Util.notNullAndSameClass(this, obj)
76-
&& Objects.equals(operands, ((UnaryValueExpression)obj).operands);
76+
&& Objects.equals(operand, ((UnaryValueExpression)obj).operand);
7777
}
7878

7979
@Override
8080
public int hashCode() {
81-
return Objects.hash(getClass(), operands);
81+
return Objects.hash(getClass(), operand);
8282
}
8383

8484
}

‎core/src/main/java/io/parsingdata/metal/expression/value/arithmetic/Neg.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
*/
3131
public class Neg extends UnaryValueExpression {
3232

33-
public Neg(final ValueExpression operands) {
34-
super(operands);
33+
public Neg(final ValueExpression operand) {
34+
super(operand);
3535
}
3636

3737
@Override

‎core/src/main/java/io/parsingdata/metal/expression/value/bitwise/Not.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
*/
3232
public class Not extends UnaryValueExpression {
3333

34-
public Not(final ValueExpression operands) {
35-
super(operands);
34+
public Not(final ValueExpression operand) {
35+
super(operand);
3636
}
3737

3838
@Override

‎core/src/main/java/io/parsingdata/metal/expression/value/bitwise/ShiftLeft.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
*/
3333
public class ShiftLeft extends BinaryValueExpression {
3434

35-
public ShiftLeft(final ValueExpression operands, final ValueExpression positions) {
36-
super(operands, positions);
35+
public ShiftLeft(final ValueExpression operand, final ValueExpression positions) {
36+
super(operand, positions);
3737
}
3838

3939
@Override

‎core/src/main/java/io/parsingdata/metal/expression/value/bitwise/ShiftRight.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
*/
3333
public class ShiftRight extends BinaryValueExpression {
3434

35-
public ShiftRight(final ValueExpression operands, final ValueExpression positions) {
36-
super(operands, positions);
35+
public ShiftRight(final ValueExpression operand, final ValueExpression positions) {
36+
super(operand, positions);
3737
}
3838

3939
@Override

‎core/src/main/java/io/parsingdata/metal/expression/value/reference/Count.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@
3232

3333
/**
3434
* A {@link ValueExpression} that represents the amount of {@link Value}s
35-
* returned by evaluating its <code>operands</code>.
35+
* returned by evaluating its <code>operand</code>.
3636
*/
3737
public class Count implements ValueExpression {
3838

39-
public final ValueExpression operands;
39+
public final ValueExpression operand;
4040

41-
public Count(final ValueExpression operands) {
42-
this.operands = checkNotNull(operands, "operands");
41+
public Count(final ValueExpression operand) {
42+
this.operand = checkNotNull(operand, "operand");
4343
}
4444

4545
@Override
4646
public ImmutableList<Optional<Value>> eval(final ParseState parseState, final Encoding encoding) {
47-
final ImmutableList<Optional<Value>> evaluatedOperands = operands.eval(parseState, encoding);
47+
final ImmutableList<Optional<Value>> evaluatedOperands = operand.eval(parseState, encoding);
4848
return ImmutableList.create(Optional.of(fromNumeric(evaluatedOperands.size)));
4949
}
5050

@@ -54,18 +54,18 @@ private static Value fromNumeric(final long length) {
5454

5555
@Override
5656
public String toString() {
57-
return getClass().getSimpleName() + "(" + operands + ")";
57+
return getClass().getSimpleName() + "(" + operand + ")";
5858
}
5959

6060
@Override
6161
public boolean equals(final Object obj) {
6262
return Util.notNullAndSameClass(this, obj)
63-
&& Objects.equals(operands, ((Count)obj).operands);
63+
&& Objects.equals(operand, ((Count)obj).operand);
6464
}
6565

6666
@Override
6767
public int hashCode() {
68-
return Objects.hash(getClass(), operands);
68+
return Objects.hash(getClass(), operand);
6969
}
7070

7171
}

‎core/src/main/java/io/parsingdata/metal/expression/value/reference/First.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,40 +33,40 @@
3333

3434
/**
3535
* A {@link ValueExpression} that represents the first {@link Value} returned
36-
* by evaluating its <code>operands</code>.
36+
* by evaluating its <code>operand</code>.
3737
*/
3838
public class First implements ValueExpression {
3939

40-
public final ValueExpression operands;
40+
public final ValueExpression operand;
4141

42-
public First(final ValueExpression operands) {
43-
this.operands = checkNotNull(operands, "operands");
42+
public First(final ValueExpression operand) {
43+
this.operand = checkNotNull(operand, "operand");
4444
}
4545

4646
@Override
4747
public ImmutableList<Optional<Value>> eval(final ParseState parseState, final Encoding encoding) {
48-
final ImmutableList<Optional<Value>> evaluatedOperands = operands.eval(parseState, encoding);
48+
final ImmutableList<Optional<Value>> evaluatedOperands = operand.eval(parseState, encoding);
4949
return evaluatedOperands.isEmpty() ? evaluatedOperands : ImmutableList.create(getFirst(evaluatedOperands).computeResult());
5050
}
5151

52-
private Trampoline<Optional<Value>> getFirst(final ImmutableList<Optional<Value>> operandsValues) {
53-
return operandsValues.tail.isEmpty() ? complete(() -> operandsValues.head) : intermediate(() -> getFirst(operandsValues.tail));
52+
private Trampoline<Optional<Value>> getFirst(final ImmutableList<Optional<Value>> operandValues) {
53+
return operandValues.tail.isEmpty() ? complete(() -> operandValues.head) : intermediate(() -> getFirst(operandValues.tail));
5454
}
5555

5656
@Override
5757
public String toString() {
58-
return getClass().getSimpleName() + "(" + operands + ")";
58+
return getClass().getSimpleName() + "(" + operand + ")";
5959
}
6060

6161
@Override
6262
public boolean equals(final Object obj) {
6363
return Util.notNullAndSameClass(this, obj)
64-
&& Objects.equals(operands, ((First)obj).operands);
64+
&& Objects.equals(operand, ((First)obj).operand);
6565
}
6666

6767
@Override
6868
public int hashCode() {
69-
return Objects.hash(getClass(), operands);
69+
return Objects.hash(getClass(), operand);
7070
}
7171

7272
}

‎core/src/main/java/io/parsingdata/metal/expression/value/reference/Last.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,36 +30,36 @@
3030

3131
/**
3232
* A {@link ValueExpression} that represents the last {@link Value} returned
33-
* by evaluating its <code>operands</code>.
33+
* by evaluating its <code>operand</code>.
3434
*/
3535
public class Last implements ValueExpression {
3636

37-
public final ValueExpression operands;
37+
public final ValueExpression operand;
3838

39-
public Last(final ValueExpression operands) {
40-
this.operands = checkNotNull(operands, "operands");
39+
public Last(final ValueExpression operand) {
40+
this.operand = checkNotNull(operand, "operand");
4141
}
4242

4343
@Override
4444
public ImmutableList<Optional<Value>> eval(final ParseState parseState, final Encoding encoding) {
45-
final ImmutableList<Optional<Value>> list = operands.eval(parseState, encoding);
45+
final ImmutableList<Optional<Value>> list = operand.eval(parseState, encoding);
4646
return list.isEmpty() ? list : ImmutableList.create(list.head);
4747
}
4848

4949
@Override
5050
public String toString() {
51-
return getClass().getSimpleName() + "(" + operands + ")";
51+
return getClass().getSimpleName() + "(" + operand + ")";
5252
}
5353

5454
@Override
5555
public boolean equals(final Object obj) {
5656
return Util.notNullAndSameClass(this, obj)
57-
&& Objects.equals(operands, ((Last)obj).operands);
57+
&& Objects.equals(operand, ((Last)obj).operand);
5858
}
5959

6060
@Override
6161
public int hashCode() {
62-
return Objects.hash(getClass(), operands);
62+
return Objects.hash(getClass(), operand);
6363
}
6464

6565
}

‎core/src/main/java/io/parsingdata/metal/expression/value/reference/Len.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
/**
3131
* A {@link UnaryValueExpression} that represents the sizes (in bytes) of all
32-
* {@link Value}s returned by evaluating its <code>operands</code>.
32+
* {@link Value}s returned by evaluating its <code>operand</code>.
3333
*/
3434
public class Len extends UnaryValueExpression {
3535

36-
public Len(final ValueExpression operands) {
37-
super(operands);
36+
public Len(final ValueExpression operand) {
37+
super(operand);
3838
}
3939

4040
@Override

‎core/src/main/java/io/parsingdata/metal/expression/value/reference/Offset.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929

3030
/**
3131
* A {@link ValueExpression} that represents the offset of the {@link Value}s
32-
* returned by evaluating its <code>operands</code> field.
32+
* returned by evaluating its <code>operand</code>.
3333
* <p>
3434
* Only {@link ParseValue}s have an offset, since they originate in the input.
3535
* If a result does not have an offset (such as the {@link Value}s returned by
3636
* {@link Const}), empty is returned.
3737
*/
3838
public class Offset extends UnaryValueExpression {
3939

40-
public Offset(final ValueExpression operands) { super(operands); }
40+
public Offset(final ValueExpression operand) { super(operand); }
4141

4242
@Override
4343
public Optional<Value> eval(final Value value, final ParseState parseState, final Encoding encoding) {

0 commit comments

Comments
 (0)