qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 08:47:56 -07:00
Code Releases Activity

go/scanner: partially revert CL4538096 now that we have %#U for runes

Browse Source 
R=r, bradfitz, rsc
CC=golang-dev
https://golang.org/cl/4572049
This commit is contained in:
Robert Griesemer 2011-06-10 17:19:01 -07:00
parent c8ee1b8ebc
commit 968afa0e8c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pkg/go/scanner/scanner.go
View File

@ -22,6 +22,7 @@ package scanner
import ( import (
"bytes" "bytes"
"fmt"
"go/token" "go/token"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -674,7 +675,7 @@ scanAgain:
tok = S.switch3(token.OR, token.OR_ASSIGN, '|', token.LOR) tok = S.switch3(token.OR, token.OR_ASSIGN, '|', token.LOR)
default: default:
if S.mode&AllowIllegalChars == 0 { if S.mode&AllowIllegalChars == 0 {
S.error(offs, "illegal character "+strconv.QuoteRune(ch)) S.error(offs, fmt.Sprintf("illegal character %#U", ch))
} }
insertSemi = S.insertSemi // preserve insertSemi info insertSemi = S.insertSemi // preserve insertSemi info
} }

6
src/pkg/go/scanner/scanner_test.go
View File

@ -650,9 +650,9 @@ var errors = []struct {
pos int pos int
err string err string
}{ }{
{"\a", token.ILLEGAL, 0, "illegal character '\\a'"}, {"\a", token.ILLEGAL, 0, "illegal character U+0007"},
{`#`, token.ILLEGAL, 0, "illegal character '#'"}, {`#`, token.ILLEGAL, 0, "illegal character U+0023 '#'"},
{`…`, token.ILLEGAL, 0, "illegal character '…'"}, {`…`, token.ILLEGAL, 0, "illegal character U+2026 '…'"},
{`' '`, token.CHAR, 0, ""}, {`' '`, token.CHAR, 0, ""},
{`''`, token.CHAR, 0, "illegal character literal"}, {`''`, token.CHAR, 0, "illegal character literal"},
{`'\8'`, token.CHAR, 2, "unknown escape sequence"}, {`'\8'`, token.CHAR, 2, "unknown escape sequence"},