mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/gc: skip over reported BOMs 

This keeps the BOM runes from causing other errors.

R=golang-dev, remyoudompheng
CC=golang-dev
https://golang.org/cl/6625062
This commit is contained in:
Russ Cox 2012-10-07 16:35:45 -04:00
parent 65b782e951
commit d749783f70
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cmd/gc/lex.c
View File

@ -1532,7 +1532,7 @@ yylex(void)
static int
getc(void)
{
int c;
int c, c1, c2;
c = curio.peekc;
if(c != 0) {
@ -1545,8 +1545,20 @@ getc(void)
c = *curio.cp & 0xff;
if(c != 0)
curio.cp++;
} else
} else {
loop:
c = Bgetc(curio.bin);
if(c == 0xef) {
c1 = Bgetc(curio.bin);
c2 = Bgetc(curio.bin);
if(c1 == 0xbb && c2 == 0xbf) {
yyerrorl(lexlineno, "Unicode (UTF-8) BOM in middle of file");
goto loop;
}
Bungetc(curio.bin);
Bungetc(curio.bin);
}
}
check:
switch(c) {
@ -1597,10 +1609,6 @@ loop:
if(!fullrune(str, i))
goto loop;
c = chartorune(&rune, str);
if(rune == BOM) {
lineno = lexlineno;
yyerror("Unicode (UTF-8) BOM in middle of file");
}
if(rune == Runeerror && c == 1) {
lineno = lexlineno;
yyerror("illegal UTF-8 sequence");