go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scanner: Update prevPos even when returning utf8.RuneError.

Browse Source 
The calling code will still call unread(), causing panics.
This fixes the TestScanHeredocRegexpCompile() unit test.
This commit is contained in:
Florian Forster 2018-03-19 14:00:49 +01:00 committed by Florian Forster
parent 73fde59edb
commit fdaaf22252
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hcl/scanner/scanner.go
View File

@ -74,14 +74,6 @@ func (s *Scanner) next() rune {
return eof return eof
} }
if ch == utf8.RuneError && size == 1 {
s.srcPos.Column++
s.srcPos.Offset += size
s.lastCharLen = size
s.err("illegal UTF-8 encoding")
return ch
}
// remember last position // remember last position
s.prevPos = s.srcPos s.prevPos = s.srcPos
@ -89,6 +81,11 @@ func (s *Scanner) next() rune {
s.lastCharLen = size s.lastCharLen = size
s.srcPos.Offset += size s.srcPos.Offset += size
if ch == utf8.RuneError && size == 1 {
s.err("illegal UTF-8 encoding")
return ch
}
if ch == '\n' { if ch == '\n' {
s.srcPos.Line++ s.srcPos.Line++
s.lastLineLen = s.srcPos.Column s.lastLineLen = s.srcPos.Column