1
0
mirror of https://github.com/golang/go synced 2024-11-12 09:20:22 -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:
Robert Griesemer 2009-12-15 18:03:59 -08:00
parent 69bed164a7
commit a47a45ec77
2 changed files with 8 additions and 2 deletions

View File

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

View File

@ -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",
}