qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 02:10:21 -07:00
Code Releases Activity

strconv: make QuoteRune etc. take a rune argument

Browse Source 
Just an oversight it didn't already.
Fixes #2515.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5483064
This commit is contained in:
Rob Pike 2011-12-13 11:13:23 -08:00
parent c0951e9f8b
commit 38df0459ae
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkg/fmt/format.go
View File

@ -331,9 +331,9 @@ func (f *fmt) fmt_q(s string) {
func (f *fmt) fmt_qc(c int64) {
var quoted string
if f.plus {
quoted = strconv.QuoteRuneToASCII(int(c))
quoted = strconv.QuoteRuneToASCII(rune(c))
} else {
quoted = strconv.QuoteRune(int(c))
quoted = strconv.QuoteRune(rune(c))
}
f.padString(quoted)
}

16
src/pkg/strconv/quote.go
View File

@ -116,30 +116,30 @@ func AppendQuoteToASCII(dst []byte, s string) []byte {
// rune. The returned string uses Go escape sequences (\t, \n, \xFF, \u0100)
// for control characters and non-printable characters as defined by
// unicode.IsPrint.
func QuoteRune(rune int) string {
func QuoteRune(r rune) string {
// TODO: avoid the allocation here.
return quoteWith(string(rune), '\'', false)
return quoteWith(string(r), '\'', false)
}
// AppendQuoteRune appends a single-quoted Go character literal representing the rune,
// as generated by QuoteRune, to dst and returns the extended buffer.
func AppendQuoteRune(dst []byte, rune int) []byte {
return append(dst, QuoteRune(rune)...)
func AppendQuoteRune(dst []byte, r rune) []byte {
return append(dst, QuoteRune(r)...)
}
// QuoteRuneToASCII returns a single-quoted Go character literal representing
// the rune. The returned string uses Go escape sequences (\t, \n, \xFF,
// \u0100) for non-ASCII characters and non-printable characters as defined
// by unicode.IsPrint.
func QuoteRuneToASCII(rune int) string {
func QuoteRuneToASCII(r rune) string {
// TODO: avoid the allocation here.
return quoteWith(string(rune), '\'', true)
return quoteWith(string(r), '\'', true)
}
// AppendQuoteRune appends a single-quoted Go character literal representing the rune,
// as generated by QuoteRuneToASCII, to dst and returns the extended buffer.
func AppendQuoteRuneToASCII(dst []byte, rune int) []byte {
return append(dst, QuoteRuneToASCII(rune)...)
func AppendQuoteRuneToASCII(dst []byte, r rune) []byte {
return append(dst, QuoteRuneToASCII(r)...)
}
// CanBackquote returns whether the string s would be

2
src/pkg/strconv/quote_test.go
View File

@ -47,7 +47,7 @@ func TestQuoteToASCII(t *testing.T) {
}
type quoteRuneTest struct {
in int
in rune
out string
ascii string
}