From 8d407cec9063b3c28c67b2cf46405fdda6ba3b4c Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Fri, 5 Jul 2019 22:07:44 +0200 Subject: [PATCH] another Windows \r\n bug fix --- compiler/scanner.v | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/scanner.v b/compiler/scanner.v index 46172d17b8..fbfd888802 100644 --- a/compiler/scanner.v +++ b/compiler/scanner.v @@ -137,7 +137,10 @@ fn (s Scanner) has_gone_over_line_end() bool { fn (s mut Scanner) skip_whitespace() { for s.pos < s.text.len && is_white(s.text[s.pos]) { if is_nl(s.text[s.pos]) { - s.line_nr++ + // Count \r\n as one line + if !(s.text[s.pos] == `\n` && s.text[s.pos-1] == `\r`) { + s.line_nr++ + } if s.is_fmt { return }