Fix linter issues in lib/syntax.
--
MOS_MIGRATED_REVID=85882605
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
index a148a70..19f1f3b 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
@@ -247,7 +247,7 @@
out.append("Environment{");
List<String> keys = new ArrayList<>(env.keySet());
Collections.sort(keys);
- for (String key: keys) {
+ for (String key : keys) {
out.append(key).append(" -> ").append(env.get(key)).append(", ");
}
out.append("}");
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
index 70d89bc..4de32fa 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
@@ -247,9 +247,7 @@
throws IOException {
if (o == null) {
throw new NullPointerException(); // None is not a build language value.
- } else if (o instanceof String ||
- o instanceof Integer ||
- o instanceof Double) {
+ } else if (o instanceof String || o instanceof Integer || o instanceof Double) {
buffer.append(o.toString());
} else if (o == Environment.NONE) {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Lexer.java b/src/main/java/com/google/devtools/build/lib/syntax/Lexer.java
index fc12c66..f4e9815 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Lexer.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Lexer.java
@@ -177,9 +177,9 @@
/**
* Parses an end-of-line sequence, handling statement indentation correctly.
*
- * UNIX newlines are assumed (LF). Carriage returns are always ignored.
+ * <p>UNIX newlines are assumed (LF). Carriage returns are always ignored.
*
- * ON ENTRY: 'pos' is the index of the char after '\n'.
+ * <p>ON ENTRY: 'pos' is the index of the char after '\n'.
* ON EXIT: 'pos' is the index of the next non-space char after '\n'.
*/
private void newline() {
@@ -485,7 +485,7 @@
/**
* Scans an identifier or keyword.
*
- * ON ENTRY: 'pos' is 1 + the index of the first char in the identifier.
+ * <p>ON ENTRY: 'pos' is 1 + the index of the first char in the identifier.
* ON EXIT: 'pos' is 1 + the index of the last char in the identifier.
*
* @return the identifier or keyword token.
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/LineNumberTable.java b/src/main/java/com/google/devtools/build/lib/syntax/LineNumberTable.java
index 4842a16..6de38ac 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/LineNumberTable.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/LineNumberTable.java
@@ -158,9 +158,9 @@
* Represents a "#line" directive
*/
private static class SingleHashLine implements Serializable {
- final private int offset;
- final private int line;
- final private Path path;
+ private final int offset;
+ private final int line;
+ private final Path path;
SingleHashLine(int offset, int line, Path path) {
this.offset = offset;
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/ListLiteral.java b/src/main/java/com/google/devtools/build/lib/syntax/ListLiteral.java
index 9437135..b18c21c 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/ListLiteral.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/ListLiteral.java
@@ -19,7 +19,7 @@
/**
* Syntax node for list and tuple literals.
*
- * (Note that during evaluation, both list and tuple values are represented by
+ * <p>(Note that during evaluation, both list and tuple values are represented by
* java.util.List objects, the only difference between them being whether or not
* they are mutable.)
*/
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/ParserInputSource.java b/src/main/java/com/google/devtools/build/lib/syntax/ParserInputSource.java
index 488c762..e83cec6 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/ParserInputSource.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/ParserInputSource.java
@@ -90,7 +90,7 @@
* with this source. 'path' will be used in error messages, etc, but will
* not (in general) be used to to read the content from path.
*
- * (The exception is the case in which Python pre-processing is required; the
+ * <p>(The exception is the case in which Python pre-processing is required; the
* path will be used to provide the input to the Python pre-processor.
* Arguably, we should just send the content as input to the subprocess
* instead of using the path, but it's not clear it's worth the effort.)