commit 4aa2912d12dbcede9bf74397a4269499fc153fd4
author Laurent Le Brun <laurentlb@google.com> Thu Sep 10 11:31:30 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Sep 11 09:45:16 2015 +0000
tree deb58e0f65d194cf0936f6b4fdf0ae0337d47fbe
parent f80258ed9e29f91132f8d92439ddecd0f5acf75a

LoadStatement: Keep the location of the path argument.

--
MOS_MIGRATED_REVID=102743954

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

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Parser.java b/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
index 9efd28e..7d2311c 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
@@ -670,6 +670,24 @@
     }
   }
 
+  /**
+   * Parse a String literal value, e.g. "str".
+   */
+  private StringLiteral parseStringLiteral() {
+    Preconditions.checkState(token.kind == TokenKind.STRING);
+    int end = token.right;
+    char quoteChar = lexer.charAt(token.left);
+    StringLiteral literal =
+        setLocation(new StringLiteral((String) token.value, quoteChar), token.left, end);
+
+    nextToken();
+    if (token.kind == TokenKind.STRING) {
+      reportError(lexer.createLocation(end, token.left),
+          "Implicit string concatenation is forbidden, use the + operator");
+    }
+    return literal;
+  }
+
   //  primary ::= INTEGER
   //            | STRING
   //            | STRING '.' IDENTIFIER funcall_suffix
@@ -691,17 +709,7 @@
         return literal;
       }
       case STRING: {
-        String value = (String) token.value;
-        int end = token.right;
-        char quoteChar = lexer.charAt(start);
-        nextToken();
-        if (token.kind == TokenKind.STRING) {
-          reportError(lexer.createLocation(end, token.left),
-              "Implicit string concatenation is forbidden, use the + operator");
-        }
-        StringLiteral literal = new StringLiteral(value, quoteChar);
-        setLocation(literal, start, end);
-        return literal;
+        return parseStringLiteral();
       }
       case IDENTIFIER: {
         Identifier ident = parseIdent();
@@ -1103,10 +1111,7 @@
       return;
     }
 
-    Token pathToken = token;
-    String path = (String) token.value;
-
-    nextToken();
+    StringLiteral path = parseStringLiteral();
     expect(TokenKind.COMMA);
 
     Map<Identifier, String> symbols = new HashMap<>();
@@ -1130,7 +1135,7 @@
     try {
       stmt.validatePath();
     } catch (EvalException e) {
-      syntaxError(pathToken, e.getMessage());
+      reportError(path.getLocation(), e.getMessage());
     }
 
     list.add(setLocation(stmt, start, token.left));