diff options
author | Robert Griesemer <gri@golang.org> | 2011-01-07 13:33:29 -0800 |
---|---|---|
committer | Robert Griesemer <gri@golang.org> | 2011-01-07 13:33:29 -0800 |
commit | 0c723f6a81514cd206e33dfb8cd181d4f499ff98 (patch) | |
tree | 34bb5aafb98cdbec16249dcda771962ddadb599d | |
parent | 6eaeb073243682c93afa7e0c76ec6608a8d72008 (diff) | |
download | go-0c723f6a81514cd206e33dfb8cd181d4f499ff98.tar.gz |
gofmt: rewriter matches apply to expressions only
Fixes issue 1384.
R=rsc
CC=golang-dev
http://codereview.appspot.com/3912041
-rw-r--r-- | src/cmd/gofmt/rewrite.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/cmd/gofmt/rewrite.go b/src/cmd/gofmt/rewrite.go index 7fa8c909a..a87dbeb8c 100644 --- a/src/cmd/gofmt/rewrite.go +++ b/src/cmd/gofmt/rewrite.go @@ -111,15 +111,18 @@ func match(m map[string]reflect.Value, pattern, val reflect.Value) bool { if m != nil && pattern.Type() == identType { name := pattern.Interface().(*ast.Ident).Name if isWildcard(name) { - if old, ok := m[name]; ok { - return match(nil, old, val) + // wildcards only match expressions + if _, ok := val.Interface().(ast.Expr); ok { + if old, ok := m[name]; ok { + return match(nil, old, val) + } + m[name] = val + return true } - m[name] = val - return true } } - // Otherwise, the expressions must match recursively. + // Otherwise, pattern and val must match recursively. if pattern == nil || val == nil { return pattern == nil && val == nil } @@ -204,7 +207,7 @@ func subst(m map[string]reflect.Value, pattern reflect.Value, pos reflect.Value) if pos != nil && pattern.Type() == positionType { // use new position only if old position was valid in the first place - if old := pattern.Interface().(token.Position); !old.IsValid() { + if old := pattern.Interface().(token.Pos); !old.IsValid() { return pattern } return pos |