Misc cleanups of AST node API
- changed field names and a couple accessors to consistently use full words ("statement" instead of "stmt")
- applied several local analyzers (from IntelliJ) to remove redundant modifiers, unnecessary explicit types (yay Java 8), etc.
RELNOTES: None
PiperOrigin-RevId: 161551096
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SliceExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/SliceExpression.java
index 92d51fe..48768ea 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SliceExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SliceExpression.java
@@ -17,23 +17,23 @@
import java.io.IOException;
import java.util.List;
-/** Syntax node for an index expression. e.g. obj[field], but not obj[from:to] */
+/** Syntax node for a slice expression, e.g. obj[:len(obj):2]. */
public final class SliceExpression extends Expression {
- private final Expression obj;
+ private final Expression object;
private final Expression start;
private final Expression end;
private final Expression step;
- public SliceExpression(Expression obj, Expression start, Expression end, Expression step) {
- this.obj = obj;
+ public SliceExpression(Expression object, Expression start, Expression end, Expression step) {
+ this.object = object;
this.start = start;
this.end = end;
this.step = step;
}
public Expression getObject() {
- return obj;
+ return object;
}
public Expression getStart() {
@@ -57,7 +57,7 @@
boolean stepIsDefault =
(step instanceof IntegerLiteral) && ((IntegerLiteral) step).getValue().equals(1);
- obj.prettyPrint(buffer);
+ object.prettyPrint(buffer);
buffer.append('[');
// Start and end are omitted if they are the literal identifier None, which is the default value
// inserted by the parser if no bound is given. Likewise, step is omitted if it is the literal
@@ -81,14 +81,14 @@
@Override
Object doEval(Environment env) throws EvalException, InterruptedException {
- Object objValue = obj.eval(env);
+ Object objValue = object.eval(env);
Object startValue = start.eval(env);
Object endValue = end.eval(env);
Object stepValue = step.eval(env);
Location loc = getLocation();
if (objValue instanceof SkylarkList) {
- SkylarkList<Object> list = (SkylarkList<Object>) objValue;
+ SkylarkList<?> list = (SkylarkList<?>) objValue;
Object slice = list.getSlice(startValue, endValue, stepValue, loc);
return SkylarkType.convertToSkylark(slice, env);
} else if (objValue instanceof String) {
@@ -122,6 +122,6 @@
@Override
void validate(ValidationEnvironment env) throws EvalException {
- obj.validate(env);
+ object.validate(env);
}
}
