undo CL 4964067 / 661cb84cc6f0

API change. Needs further reflection.

««« original CL description
path/filepath: Simplify Walk interface

The last argument of filepath.Walk was removed, and the Visitor
interface now contains an Error method that is called on errors.

Fixes #2237.

R=golang-dev, gri, r
CC=golang-dev
https://golang.org/cl/4964067

»»»

R=r
CC=golang-dev
https://golang.org/cl/4974065

5 files changed, 40 insertions, 45 deletions

diff --git a/src/cmd/gofix/main.go b/src/cmd/gofix/main.go
index 514bf38edb..e7e7013c56 100644
--- a/src/cmd/gofix/main.go
+++ b/src/cmd/gofix/main.go
@@ -200,7 +200,7 @@ func report(err os.Error) {
 func walkDir(path string) {
 	v := make(fileVisitor)
 	go func() {
-		filepath.Walk(path, v)
+		filepath.Walk(path, v, v)
 		close(v)
 	}()
 	for err := range v {
@@ -225,10 +225,6 @@ func (v fileVisitor) VisitFile(path string, f *os.FileInfo) {
 	}
 }
 
-func (v fileVisitor) Error(path string, err os.Error) {
-	v <- err
-}
-
 func isGoFile(f *os.FileInfo) bool {
 	// ignore non-Go files
 	return f.IsRegular() && !strings.HasPrefix(f.Name, ".") && strings.HasSuffix(f.Name, ".go")
diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go
index 1225618031..975ae6ac6f 100644
--- a/src/cmd/gofmt/gofmt.go
+++ b/src/cmd/gofmt/gofmt.go
@@ -164,14 +164,10 @@ func (v fileVisitor) VisitFile(path string, f *os.FileInfo) {
 	}
 }
 
-func (v fileVisitor) Error(path string, err os.Error) {
-	v <- err
-}
-
 func walkDir(path string) {
 	v := make(fileVisitor)
 	go func() {
-		filepath.Walk(path, v)
+		filepath.Walk(path, v, v)
 		close(v)
 	}()
 	for err := range v {
diff --git a/src/cmd/govet/govet.go b/src/cmd/govet/govet.go
index c53515d3bf..98d3d5c17f 100644
--- a/src/cmd/govet/govet.go
+++ b/src/cmd/govet/govet.go
@@ -104,34 +104,30 @@ func doFile(name string, reader io.Reader) {
 // Visitor for filepath.Walk - trivial.  Just calls doFile on each file.
 // TODO: if govet becomes richer, might want to process
 // a directory (package) at a time.
-type fileVisitor chan os.Error
+type V struct{}
 
-func (v fileVisitor) VisitDir(path string, f *os.FileInfo) bool {
+func (v V) VisitDir(path string, f *os.FileInfo) bool {
 	return true
 }
 
-func (v fileVisitor) VisitFile(path string, f *os.FileInfo) {
+func (v V) VisitFile(path string, f *os.FileInfo) {
 	if strings.HasSuffix(path, ".go") {
 		doFile(path, nil)
 	}
 }
 
-func (v fileVisitor) Error(path string, err os.Error) {
-	v <- err
-}
-
 // walkDir recursively walks the tree looking for .go files.
 func walkDir(root string) {
-	v := make(fileVisitor)
+	errors := make(chan os.Error)
 	done := make(chan bool)
 	go func() {
-		for e := range v {
+		for e := range errors {
 			errorf("walk error: %s", e)
 		}
 		done <- true
 	}()
-	filepath.Walk(root, v)
-	close(v)
+	filepath.Walk(root, V{}, errors)
+	close(errors)
 	<-done
 }
 
diff --git a/src/pkg/path/filepath/path.go b/src/pkg/path/filepath/path.go
index d6a7d08e83..3d5b915c10 100644
--- a/src/pkg/path/filepath/path.go
+++ b/src/pkg/path/filepath/path.go
@@ -255,14 +255,14 @@ func Abs(path string) (string, os.Error) {
 }
 
 // Visitor methods are invoked for corresponding file tree entries
-// visited by Walk.
+// visited by Walk. The parameter path is the full path of f relative
+// to root.
 type Visitor interface {
 	VisitDir(path string, f *os.FileInfo) bool
 	VisitFile(path string, f *os.FileInfo)
-	Error(path string, err os.Error)
 }
 
-func walk(path string, f *os.FileInfo, v Visitor) {
+func walk(path string, f *os.FileInfo, v Visitor, errors chan<- os.Error) {
 	if !f.IsDirectory() {
 		v.VisitFile(path, f)
 		return
@@ -274,11 +274,13 @@ func walk(path string, f *os.FileInfo, v Visitor) {
 
 	list, err := readDir(path)
 	if err != nil {
-		v.Error(path, err)
+		if errors != nil {
+			errors <- err
+		}
 	}
 
 	for _, e := range list {
-		walk(Join(path, e.Name), e, v)
+		walk(Join(path, e.Name), e, v, errors)
 	}
 }
 
@@ -314,14 +316,18 @@ func (f fileInfoList) Swap(i, j int)      { f[i], f[j] = f[j], f[i] }
 // v.VisitFile for each directory or file in the tree, including root.
 // If v.VisitDir returns false, Walk skips the directory's entries;
 // otherwise it invokes itself for each directory entry in sorted order.
-// Walk calls v.Error if an error happens while reading a directory.
-func Walk(root string, v Visitor) {
+// An error reading a directory does not abort the Walk.
+// If errors != nil, Walk sends each directory read error
+// to the channel.  Otherwise Walk discards the error.
+func Walk(root string, v Visitor, errors chan<- os.Error) {
 	f, err := os.Lstat(root)
 	if err != nil {
-		v.Error(root, err)
+		if errors != nil {
+			errors <- err
+		}
 		return // can't progress
 	}
-	walk(root, f, v)
+	walk(root, f, v, errors)
 }
 
 // Base returns the last element of path.
diff --git a/src/pkg/path/filepath/path_test.go b/src/pkg/path/filepath/path_test.go
index 8c566c7002..395b12775a 100644
--- a/src/pkg/path/filepath/path_test.go
+++ b/src/pkg/path/filepath/path_test.go
@@ -299,30 +299,30 @@ func mark(name string) {
 	})
 }
 
-type TestVisitor chan os.Error
+type TestVisitor struct{}
 
-func (v TestVisitor) VisitDir(path string, f *os.FileInfo) bool {
+func (v *TestVisitor) VisitDir(path string, f *os.FileInfo) bool {
 	mark(f.Name)
 	return true
 }
 
-func (v TestVisitor) VisitFile(path string, f *os.FileInfo) {
+func (v *TestVisitor) VisitFile(path string, f *os.FileInfo) {
 	mark(f.Name)
 }
 
-func (v TestVisitor) Error(path string, err os.Error) {
-	v <- err
-}
-
 func TestWalk(t *testing.T) {
 	makeTree(t)
 
-	v := make(TestVisitor, 64)
+	// 1) ignore error handling, expect none
+	v := &TestVisitor{}
+	filepath.Walk(tree.name, v, nil)
+	checkMarks(t)
 
-	// 1) no errors expected.
-	filepath.Walk(tree.name, v)
+	// 2) handle errors, expect none
+	errors := make(chan os.Error, 64)
+	filepath.Walk(tree.name, v, errors)
 	select {
-	case err := <-v:
+	case err := <-errors:
 		t.Errorf("no error expected, found: %s", err)
 	default:
 		// ok
@@ -343,13 +343,14 @@ func TestWalk(t *testing.T) {
 		tree.entries[1].mark--
 		tree.entries[3].mark--
 
-		// 2) expect two errors
+		// 3) handle errors, expect two
+		errors = make(chan os.Error, 64)
 		os.Chmod(filepath.Join(tree.name, tree.entries[1].name), 0)
-		filepath.Walk(tree.name, v)
+		filepath.Walk(tree.name, v, errors)
 	Loop:
 		for i := 1; i <= 2; i++ {
 			select {
-			case <-v:
+			case <-errors:
 				// ok
 			default:
 				t.Errorf("%d. error expected, none found", i)
@@ -357,7 +358,7 @@ func TestWalk(t *testing.T) {
 			}
 		}
 		select {
-		case err := <-v:
+		case err := <-errors:
 			t.Errorf("only two errors expected, found 3rd: %v", err)
 		default:
 			// ok