@@ -528,6 +528,18 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
             if (currentToken.size() < 2U)
                 // TODO report
                 return;
+
+            std::string s = currentToken;
+            std::string::size_type pos;
+            while ((pos = s.find_first_of("\r\n")) != std::string::npos) {
+                s.erase(pos,1);
+            }
+
+            push_back(new Token(s, location)); // push string without newlines
+
+            location.adjust(currentToken);
+
+            continue;
         }
 
         else {
@@ -899,8 +911,12 @@ std::string simplecpp::TokenList::readUntil(std::istream &istr, const Location &
     while (ch != end && ch != '\r' && ch != '\n' && istr.good()) {
         ch = (unsigned char)istr.get();
         ret += ch;
-        if (ch == '\\')
-            ret += (unsigned char)istr.get();
+        if (ch == '\\') {
+            const char next = (unsigned char)istr.get();
+            if (next == '\r' || next == '\n')
+                ret.erase(ret.size()-1U);
+            ret += next;
+        }
     }
 
     if (!istr.good() || ch != end) {
 
@@ -1031,6 +1031,7 @@ void readfile_string()
     const char code[] = "A = \"abc\'def\"";
     ASSERT_EQUALS("A = \"abc\'def\"", readfile(code));
     ASSERT_EQUALS("( \"\\\\\\\\\" )", readfile("(\"\\\\\\\\\")"));
+    ASSERT_EQUALS("x = \"a  b\"\n;", readfile("x=\"a\\\n  b\";"));
 }
 
 void readfile_rawstring()
Original file line number	Diff line number	Diff line change
`@@ -1031,6 +1031,7 @@ void readfile_string()`
`1031`	`1031`	`const char code[] = "A = \"abc\'def\"";`
`1032`	`1032`	`ASSERT_EQUALS("A = \"abc\'def\"", readfile(code));`
`1033`	`1033`	`ASSERT_EQUALS("( \"\\\\\\\\\" )", readfile("(\"\\\\\\\\\")"));`
	`1034`	`+ ASSERT_EQUALS("x = \"a b\"\n;", readfile("x=\"a\\\n b\";"));`
`1034`	`1035`	`}`
`1035`	`1036`
`1036`	`1037`	`void readfile_rawstring()`