Imported Upstream version 2011.08.17

1 files changed, 12 insertions, 3 deletions

diff --git a/src/cmd/gofix/fix.go b/src/cmd/gofix/fix.go
index c1c5a746c..cc85ceafa 100644
--- a/src/cmd/gofix/fix.go
+++ b/src/cmd/gofix/fix.go
@@ -71,17 +71,21 @@ func walkBeforeAfter(x interface{}, before, after func(interface{})) {
 		walkBeforeAfter(*n, before, after)
 	case **ast.FuncType:
 		walkBeforeAfter(*n, before, after)
+	case **ast.Ident:
+		walkBeforeAfter(*n, before, after)
 
 	// pointers to slices
-	case *[]ast.Stmt:
+	case *[]ast.Decl:
 		walkBeforeAfter(*n, before, after)
 	case *[]ast.Expr:
 		walkBeforeAfter(*n, before, after)
-	case *[]ast.Decl:
+	case *[]*ast.File:
+		walkBeforeAfter(*n, before, after)
+	case *[]*ast.Ident:
 		walkBeforeAfter(*n, before, after)
 	case *[]ast.Spec:
 		walkBeforeAfter(*n, before, after)
-	case *[]*ast.File:
+	case *[]ast.Stmt:
 		walkBeforeAfter(*n, before, after)
 
 	// These are ordered and grouped to match ../../pkg/go/ast/ast.go
@@ -212,6 +216,7 @@ func walkBeforeAfter(x interface{}, before, after func(interface{})) {
 	case *ast.ValueSpec:
 		walkBeforeAfter(&n.Type, before, after)
 		walkBeforeAfter(&n.Values, before, after)
+		walkBeforeAfter(&n.Names, before, after)
 	case *ast.TypeSpec:
 		walkBeforeAfter(&n.Type, before, after)
 
@@ -245,6 +250,10 @@ func walkBeforeAfter(x interface{}, before, after func(interface{})) {
 		for i := range n {
 			walkBeforeAfter(&n[i], before, after)
 		}
+	case []*ast.Ident:
+		for i := range n {
+			walkBeforeAfter(&n[i], before, after)
+		}
 	case []ast.Stmt:
 		for i := range n {
 			walkBeforeAfter(&n[i], before, after)