code review 12485044: undo CL 12486043 / ab644299d124

src/pkg/regexp/exec_test.go

 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package regexp
 
 import (
         "bufio"
         "compress/bzip2"
         "fmt"
@@ skipping 275 matching lines @@
         i := 0
         n = 0
         for j := 0; j <= len(res); j++ {
                 if j == len(res) || res[j] == ' ' {
                         // Process a single pair.  - means no submatch.
                         pair := res[i:j]
                         if pair == "-" {
                                 out[n] = -1
                                 out[n+1] = -1
                         } else {
-                                k := strings.IndexByte(pair, '-')
+                                k := strings.Index(pair, "-")
                                 if k < 0 {
                                         t.Fatalf("%s:%d: invalid pair %s", file, lineno, pair)
                                 }
                                 lo, err1 := strconv.Atoi(pair[:k])
                                 hi, err2 := strconv.Atoi(pair[k+1:])
                                 if err1 != nil || err2 != nil || lo > hi {
                                         t.Fatalf("%s:%d: invalid pair %s", file, lineno, pair)
                                 }
                                 out[n] = lo
                                 out[n+1] = hi
@@ skipping 142 matching lines @@
                 flag := field[0]
                 switch flag[0] {
                 case '?', '&', '|', ';', '{', '}':
                         // Ignore all the control operators.
                         // Just run everything.
                         flag = flag[1:]
                         if flag == "" {
                                 continue Reading
                         }
                 case ':':
-                        i := strings.IndexByte(flag[1:], ':')
+                        i := strings.Index(flag[1:], ":")
                         if i < 0 {
                                 t.Logf("skip: %s", line)
                                 continue Reading
                         }
                         flag = flag[1+i+1:]
                 case 'C', 'N', 'T', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
                         t.Logf("skip: %s", line)
                         continue Reading
                 }
 
@@ skipping 236 matching lines @@
                 t.Fatal(err)
         }
         if g, w := re.FindString("ab"), "a"; g != w {
                 t.Errorf("first match was %q, want %q", g, w)
         }
         re.Longest()
         if g, w := re.FindString("ab"), "ab"; g != w {
                 t.Errorf("longest match was %q, want %q", g, w)
         }
 }