qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 11:38:01 -07:00
Code Releases Activity

regexp: use Scanner in exec_test

Browse Source 
R=rsc
CC=golang-dev
https://golang.org/cl/7381046
This commit is contained in:
Rob Pike 2013-02-20 13:37:45 -08:00
parent 9dcf3eee41
commit f913830148
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pkg/regexp/exec_test.go
View File

@ -89,7 +89,7 @@ func testRE2(t *testing.T, file string) {
txt = f
}
lineno := 0
r := bufio.NewReader(txt)
scanner := bufio.NewScanner(txt)
var (
str []string
input []string
@ -99,16 +99,8 @@ func testRE2(t *testing.T, file string) {
nfail int
ncase int
)
for {
line, err := r.ReadString('\n')
if err != nil {
if err == io.EOF {
break
}
t.Fatalf("%s:%d: %v", file, lineno, err)
}
line = line[:len(line)-1] // chop \n
lineno++
for lineno := 1; scanner.Scan(); lineno++ {
line := scanner.Text()
switch {
case line == "":
t.Fatalf("%s:%d: unexpected blank line", file, lineno)
@ -204,6 +196,9 @@ func testRE2(t *testing.T, file string) {
t.Fatalf("%s:%d: out of sync: %s\n", file, lineno, line)
}
}
if err := scanner.Err(); err != nil {
t.Fatalf("%s:%d: %v", file, lineno, err)
}
if len(input) != 0 {
t.Fatalf("%s:%d: out of sync: have %d strings left at EOF", file, lineno, len(input))
}