commit 7b1708c64fe98a7db3911f9f91e6b07d28111e73
author Laurent Le Brun <laurentlb@google.com> Thu Oct 13 10:05:12 2016 +0000
committer Yue Gan <yueg@google.com> Thu Oct 13 14:28:51 2016 +0000
tree 9d796126c8e1477dcca7c40291a123523842bec7
parent 7b825b8ea442246aabfa6a5a8962abd70855d0da

Refactoring for LoadStatement

Use StringLiteral instead of String+Location. This improves consistency.

getRawImports() now returns StringLiterals, which makes possible to show
location in error messages.

--
MOS_MIGRATED_REVID=136019586

src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java b/src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java
index 2a6e0fb..2254116 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/LoadStatement.java
@@ -17,14 +17,11 @@
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.compiler.DebugInfo;
 import com.google.devtools.build.lib.syntax.compiler.LoopLabels;
 import com.google.devtools.build.lib.syntax.compiler.VariableScope;
-
-import net.bytebuddy.implementation.bytecode.ByteCodeAppender;
-
 import java.util.Map;
+import net.bytebuddy.implementation.bytecode.ByteCodeAppender;
 
 /**
  * Syntax node for an import statement.
@@ -33,8 +30,7 @@
 
   private final ImmutableMap<Identifier, String> symbols;
   private final ImmutableList<Identifier> cachedSymbols; // to save time
-  private final String imp;
-  private final Location importLocation;
+  private final StringLiteral imp;
 
   /**
    * Constructs an import statement.
@@ -43,29 +39,24 @@
    * the bzl file that should be loaded. If aliasing is used, the value differs from its key's
    * {@code symbol.getName()}. Otherwise, both values are identical.
    */
-  LoadStatement(String imp, Location importLocation, Map<Identifier, String> symbols) {
+  LoadStatement(StringLiteral imp, Map<Identifier, String> symbols) {
     this.imp = imp;
-    this.importLocation = importLocation;
     this.symbols = ImmutableMap.copyOf(symbols);
     this.cachedSymbols = ImmutableList.copyOf(symbols.keySet());
   }
 
-  public Location getImportLocation() {
-    return importLocation;
-  }
-
   public ImmutableList<Identifier> getSymbols() {
     return cachedSymbols;
   }
 
-  public String getImport() {
+  public StringLiteral getImport() {
     return imp;
   }
 
   @Override
   public String toString() {
     return String.format(
-        "load(\"%s\", %s)", imp, Joiner.on(", ").join(cachedSymbols));
+        "load(\"%s\", %s)", imp.getValue(), Joiner.on(", ").join(cachedSymbols));
   }
 
   @Override
@@ -81,7 +72,7 @@
         }
         // The key is the original name that was used to define the symbol
         // in the loaded bzl file.
-        env.importSymbol(imp, name, declared.getName());
+        env.importSymbol(imp.getValue(), name, declared.getName());
       } catch (Environment.LoadFailedException e) {
         throw new EvalException(getLocation(), e.getMessage());
       }