From fcd73bcb6333fd1c77612cd96a6ae1441239d225 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Tue, 23 Jun 2020 21:10:51 +0300
Subject: [PATCH] scanner: ignore CR signs in string literals

---
 vlib/v/scanner/scanner.v | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v
index 3cd4163e8d..59dc376c8f 100644
--- a/vlib/v/scanner/scanner.v
+++ b/vlib/v/scanner/scanner.v
@@ -1177,6 +1177,7 @@ fn (mut s Scanner) ident_string() string {
 	// println('\nident_string() at char=${s.text[s.pos].str()}')
 	// println('linenr=$s.line_nr quote=  $qquote ${qquote.str()}')
 	// }
+	mut n_cr_chars := 0
 	mut start := s.pos
 	s.is_inside_string = false
 	slash := `\\`
@@ -1192,6 +1193,9 @@ fn (mut s Scanner) ident_string() string {
 			// handle '123\\'  slash at the end
 			break
 		}
+		if c == `\r` {
+			n_cr_chars++
+		}
 		if c == `\n` {
 			s.inc_line_number()
 		}
@@ -1230,10 +1234,14 @@ fn (mut s Scanner) ident_string() string {
 		end++
 	}
 	if start <= s.pos {
-		if s.text[start..end].contains('\\\n') {
-			lit = trim_slash_line_break(s.text[start..end])
+		mut string_so_far := s.text[start..end]
+		if n_cr_chars > 0 {
+			string_so_far = string_so_far.replace('\r', '')
+		}
+		if string_so_far.contains('\\\n') {
+			lit = trim_slash_line_break(string_so_far)
 		} else {
-			lit = s.text[start..end]
+			lit = string_so_far
 		}
 	}
 	return lit