commit 8f46458a02ad9d1206d499d26c70880b794c0f3f
author Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Wed Jun 24 20:41:46 2015 +0900
committer Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Thu Jun 25 17:51:01 2015 +0900
tree 74d1c152b65e6ab70a8537e4c52148620bdf7601
parent 2b674c4d0a30843b77c418e285f9b4f9994074af

[C++] Fix multiline concatination

value.cc

diff --git a/value.cc b/value.cc
index 87cc736..09ef6e0 100644
--- a/value.cc
+++ b/value.cc
@@ -455,13 +455,17 @@
       }
       if (n == '\r' || n == '\n') {
         if (i > b) {
-          r->AddValue(new Literal(s.substr(b, i-b)));
+          r->AddValue(new Literal(TrimRightSpace(s.substr(b, i-b))));
         }
         r->AddValue(new Literal(STRING_PIECE(" ")));
-        i++;
-        if (n == '\r' && s.get(i+1) == '\n')
-          i++;
-        b = i + 1;
+        for (i++; i < s.size(); i++) {
+          if (!isspace(s[i]) &&
+              (s[i] != '\\' || (s.get(i+1) != '\r' && s.get(i+1) != '\n'))) {
+            break;
+          }
+        }
+        b = i;
+        i--;
       }
     }
   }