vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

scanner: ignore CR signs in string literals

pull/5468/head
Delyan Angelov 2020-06-23 21:10:51 +03:00
parent 74af88bc92
commit fcd73bcb63
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/v/scanner/scanner.v
View File

@ -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