[C++] Fix handling CRLF after a backslash

This fixes #77
AOSP-JF-MM · Jun 7, 2016 · 3e98b6b · 3e98b6b
1 parent 71e7934
commit 3e98b6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/expr.cc b/expr.cc
@@ -537,6 +537,8 @@ Value* ParseExprImpl(const Loc& loc,
         r->AddValue(new Literal(StringPiece(" ")));
         // Skip the current escaped newline
         i += 2;
+        if (n == '\r' && s.get(i) == '\n')
+          i++;
         // Then continue skipping escaped newlines, spaces, and tabs
         for (; i < s.size(); i++) {
           if (s[i] == '\\' && (s.get(i+1) == '\r' || s.get(i+1) == '\n')) {

diff --git a/testcase/crlf.mk b/testcase/crlf.mk
@@ -1,4 +1,5 @@
 PASS := \
+  PASS \
   PASS
 
 test: