Fix SyntaxTreeVisitor for LoadStatement.

Also, some cleanup in the code - #codehealth

--
MOS_MIGRATED_REVID=96315466

1 files changed, 10 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SyntaxTreeVisitor.java b/src/main/java/com/google/devtools/build/lib/syntax/SyntaxTreeVisitor.java
index 3127f71b09..3d699ffb23 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SyntaxTreeVisitor.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SyntaxTreeVisitor.java
@@ -75,6 +75,10 @@ public class SyntaxTreeVisitor {
     visit(node.getListExpression());
   }
 
+  public void visit(LoadStatement node) {
+    visitAll(node.getSymbols());
+  }
+
   public void visit(ListLiteral node) {
     visitAll(node.getElements());
   }
@@ -95,38 +99,26 @@ public class SyntaxTreeVisitor {
   }
 
   public void visit(IfStatement node) {
-    for (ConditionalStatements stmt : node.getThenBlocks()) {
-      visit(stmt);
-    }
-    for (Statement stmt : node.getElseBlock()) {
-      visit(stmt);
-    }
+    visitAll(node.getThenBlocks());
+    visitAll(node.getElseBlock());
   }
 
   public void visit(ConditionalStatements node) {
     visit(node.getCondition());
-    for (Statement stmt : node.getStmts()) {
-      visit(stmt);
-    }
+    visitAll(node.getStmts());
   }
 
   public void visit(FunctionDefStatement node) {
     visit(node.getIdent());
     List<Expression> defaults = node.getArgs().getDefaultValues();
     if (defaults != null) {
-      for (Expression expr : defaults) {
-        visit(expr);
-      }
-    }
-    for (Statement stmt : node.getStatements()) {
-      visit(stmt);
+      visitAll(defaults);
     }
+    visitAll(node.getStatements());
   }
 
   public void visit(DictionaryLiteral node) {
-    for (DictionaryEntryLiteral entry : node.getEntries()) {
-      visit(entry);
-    }
+    visitAll(node.getEntries());
   }
 
   public void visit(DictionaryEntryLiteral node) {