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

strconv: use generics to reduce redundant helper functions

Browse Source 
Benchstat shows there are no noticeable performance changes here.

Change-Id: If2250334fe6664986f044cbaabfa1bfc84f871f7
GitHub-Last-Rev: d41a498d54
GitHub-Pull-Request: golang/go#66266
Reviewed-on: https://go-review.googlesource.com/c/go/+/570935
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Commit-Queue: Ian Lance Taylor <iant@google.com>
Reviewed-by: Robert Griesemer <gri@google.com>
This commit is contained in:
apocelipes 2024-03-12 10:18:00 +00:00 committed by Gopher Robot
parent 2ab9218c86
commit f83102cf71
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/strconv/quote.go
View File

@ -493,34 +493,20 @@ func unquote(in string, unescape bool) (out, rem string, err error) {
} }
} }
// bsearch16 returns the smallest i such that a[i] >= x. // bsearch is semantically the same as [slices.BinarySearch] (without NaN checks)
// If there is no such i, bsearch16 returns len(a). // We copied this function because we can not import "slices" here.
func bsearch16(a []uint16, x uint16) int { func bsearch[S ~[]E, E ~uint16 | ~uint32](s S, v E) (int, bool) {
i, j := 0, len(a) n := len(s)
i, j := 0, n
for i < j { for i < j {
h := i + (j-i)>>1 h := i + (j-i)>>1
if a[h] < x { if s[h] < v {
i = h + 1 i = h + 1
} else { } else {
j = h j = h
} }
} }
return i return i, i < n && s[i] == v
}
// bsearch32 returns the smallest i such that a[i] >= x.
// If there is no such i, bsearch32 returns len(a).
func bsearch32(a []uint32, x uint32) int {
i, j := 0, len(a)
for i < j {
h := i + (j-i)>>1
if a[h] < x {
i = h + 1
} else {
j = h
}
}
return i
} }
// TODO: IsPrint is a local implementation of unicode.IsPrint, verified by the tests // TODO: IsPrint is a local implementation of unicode.IsPrint, verified by the tests
@ -554,16 +540,16 @@ func IsPrint(r rune) bool {
if 0 <= r && r < 1<<16 { if 0 <= r && r < 1<<16 {
rr, isPrint, isNotPrint := uint16(r), isPrint16, isNotPrint16 rr, isPrint, isNotPrint := uint16(r), isPrint16, isNotPrint16
i := bsearch16(isPrint, rr) i, _ := bsearch(isPrint, rr)
if i >= len(isPrint) || rr < isPrint[i&^1] || isPrint[i|1] < rr { if i >= len(isPrint) || rr < isPrint[i&^1] || isPrint[i|1] < rr {
return false return false
} }
j := bsearch16(isNotPrint, rr) _, found := bsearch(isNotPrint, rr)
return j >= len(isNotPrint) || isNotPrint[j] != rr return !found
} }
rr, isPrint, isNotPrint := uint32(r), isPrint32, isNotPrint32 rr, isPrint, isNotPrint := uint32(r), isPrint32, isNotPrint32
i := bsearch32(isPrint, rr) i, _ := bsearch(isPrint, rr)
if i >= len(isPrint) || rr < isPrint[i&^1] || isPrint[i|1] < rr { if i >= len(isPrint) || rr < isPrint[i&^1] || isPrint[i|1] < rr {
return false return false
} }
@ -571,8 +557,8 @@ func IsPrint(r rune) bool {
return true return true
} }
r -= 0x10000 r -= 0x10000
j := bsearch16(isNotPrint, uint16(r)) _, found := bsearch(isNotPrint, uint16(r))
return j >= len(isNotPrint) || isNotPrint[j] != uint16(r) return !found
} }
// IsGraphic reports whether the rune is defined as a Graphic by Unicode. Such // IsGraphic reports whether the rune is defined as a Graphic by Unicode. Such
@ -593,7 +579,6 @@ func isInGraphicList(r rune) bool {
if r > 0xFFFF { if r > 0xFFFF {
return false return false
} }
rr := uint16(r) _, found := bsearch(isGraphic, uint16(r))
i := bsearch16(isGraphic, rr) return found
return i < len(isGraphic) && rr == isGraphic[i]
} }