aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-05-24 10:42:34 +0000
committerGravatar Yue Gan <yueg@google.com>2016-05-24 11:58:17 +0000
commit34d4e6f1bbe80e8b0d42caddc22b5b941a3efeb1 (patch)
tree68a2af9c00deeca426f617e0442d2f384b97b14a /src/main/java
parentd654c550a385a94da0388d77a9482e802ceb4aba (diff)
Make the parser handle CRLF correctly.
Fixes #1300 . -- MOS_MIGRATED_REVID=123090421
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/Lexer.java2
1 files changed, 2 insertions, 0 deletions
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 f656f28002..1780886059 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
@@ -251,6 +251,8 @@ public final class Lexer {
if (c == ' ') {
indentLen++;
pos++;
+ } else if (c == '\r') {
+ pos++;
} else if (c == '\t') {
indentLen += 8 - indentLen % 8;
pos++;