1
0
mirror of https://github.com/golang/go synced 2024-11-23 09:40:04 -07:00

strings: narrow the search range of IndexByte in Index

Same as https://golang.org/cl/224589.

Change-Id: I6a9e2ea60bf6e1888a95bad0331c92079a7eff99
GitHub-Last-Rev: 81c13c0f5b
GitHub-Pull-Request: golang/go#38016
Reviewed-on: https://go-review.googlesource.com/c/go/+/224593
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Andy Pan 2020-03-23 04:53:40 +00:00 committed by Ian Lance Taylor
parent 3adbdb6d99
commit 6aded2524c

View File

@ -1044,11 +1044,11 @@ func Index(s, substr string) int {
if s[i] != c0 {
// IndexByte is faster than bytealg.IndexString, so use it as long as
// we're not getting lots of false positives.
o := IndexByte(s[i:t], c0)
o := IndexByte(s[i+1:t], c0)
if o < 0 {
return -1
}
i += o
i += o + 1
}
if s[i+1] == c1 && s[i:i+n] == substr {
return i
@ -1073,11 +1073,11 @@ func Index(s, substr string) int {
fails := 0
for i < t {
if s[i] != c0 {
o := IndexByte(s[i:t], c0)
o := IndexByte(s[i+1:t], c0)
if o < 0 {
return -1
}
i += o
i += o + 1
}
if s[i+1] == c1 && s[i:i+n] == substr {
return i