commit d412c8f5d37c08ee780d6d1fdc01feb31b1a3bdc
author Laurent Le Brun <laurentlb@google.com> Tue Jun 16 11:12:54 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Tue Jun 16 14:00:08 2015 +0000
tree 2c20fdcb33a8a7b6ba661181ec548db83cbf4609
parent ee991a17299822b1ae601fd337e769e3ff513007

Fix NullPointerException in parser.

Location was not set.

--
MOS_MIGRATED_REVID=96096088

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 393f540..08dccd9 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
@@ -1416,10 +1416,14 @@
 
   // flow_stmt ::= break_stmt | continue_stmt
   private FlowStatement parseFlowStatement(TokenKind kind) {
+    int start = token.left;
     expect(kind);
-    return (kind == TokenKind.BREAK) ? FlowStatement.BREAK : FlowStatement.CONTINUE;
+    return setLocation(
+        kind == TokenKind.BREAK ? FlowStatement.BREAK : FlowStatement.CONTINUE,
+        start,
+        token.right);
   }
-  
+
   // return_stmt ::= RETURN expr
   private ReturnStatement parseReturnStatement() {
     int start = token.left;