mirror of
https://github.com/golang/go
synced 2024-11-24 23:07:56 -07:00
Fix for scanner bug (introduced with most recent change).
Fixes #433. R=rsc CC=golang-dev https://golang.org/cl/179072
This commit is contained in:
parent
69bed164a7
commit
a47a45ec77
@ -223,10 +223,10 @@ func (S *Scanner) findNewline(pos token.Position) bool {
|
||||
}
|
||||
}
|
||||
|
||||
// reset position
|
||||
// reset position to where it was upon calling findNewline
|
||||
S.pos = pos
|
||||
S.offset = pos.Offset + 1
|
||||
S.ch = '/'
|
||||
S.next()
|
||||
|
||||
return newline
|
||||
}
|
||||
@ -577,6 +577,10 @@ scanAgain:
|
||||
if S.ch == '/' || S.ch == '*' {
|
||||
// comment
|
||||
if S.insertSemi && S.findNewline(pos) {
|
||||
// reset position to the beginning of the comment
|
||||
S.pos = pos
|
||||
S.offset = pos.Offset + 1
|
||||
S.ch = '/'
|
||||
S.insertSemi = false // newline consumed
|
||||
return pos, token.SEMICOLON, semicolon
|
||||
}
|
||||
|
@ -392,6 +392,8 @@ var lines = []string{
|
||||
"foo $/*comment*/ \n",
|
||||
"foo $/*0*/ /*1*/ /*2*/ \n",
|
||||
"foo $/**/ /*-------------*/ /*----\n*/bar $/* \n*/baa",
|
||||
|
||||
"package main$\n\nfunc main() {\n\tif {\n\t\treturn /* */ }$\n}$\n",
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user