Commit 2dd3622b authored by Robert Griesemer's avatar Robert Griesemer

Allow func() func().

Update gofmt test script.

R=rsc
CC=golang-dev
https://golang.org/cl/195044
parent 70b92dda
...@@ -41,7 +41,7 @@ apply1() { ...@@ -41,7 +41,7 @@ apply1() {
bug014.go | bug050.go | bug068.go | bug083.go | bug088.go | \ bug014.go | bug050.go | bug068.go | bug083.go | bug088.go | \
bug106.go | bug121.go | bug125.go | bug133.go | bug160.go | \ bug106.go | bug121.go | bug125.go | bug133.go | bug160.go | \
bug163.go | bug166.go | bug169.go | bug217.go | bug222.go | \ bug163.go | bug166.go | bug169.go | bug217.go | bug222.go | \
bug226.go | bug228.go ) ;; bug226.go | bug228.go | bug248.go ) ;;
* ) "$1" "$2"; count "$F";; * ) "$1" "$2"; count "$F";;
esac esac
} }
......
...@@ -677,7 +677,7 @@ func (p *parser) parseResult(scope *ast.Scope) []*ast.Field { ...@@ -677,7 +677,7 @@ func (p *parser) parseResult(scope *ast.Scope) []*ast.Field {
var results []*ast.Field var results []*ast.Field
if p.tok == token.LPAREN { if p.tok == token.LPAREN {
results = p.parseParameters(scope, false) results = p.parseParameters(scope, false)
} else if p.tok != token.FUNC { } else {
typ := p.tryType() typ := p.tryType()
if typ != nil { if typ != nil {
results = make([]*ast.Field, 1) results = make([]*ast.Field, 1)
......
...@@ -34,7 +34,7 @@ var validPrograms = []interface{}{ ...@@ -34,7 +34,7 @@ var validPrograms = []interface{}{
`package main; func main() { if f(T{}) {} }` + "\n", `package main; func main() { if f(T{}) {} }` + "\n",
`package main; func main() { _ = (<-chan int)(x) }` + "\n", `package main; func main() { _ = (<-chan int)(x) }` + "\n",
`package main; func main() { _ = (<-chan <-chan int)(x) }` + "\n", `package main; func main() { _ = (<-chan <-chan int)(x) }` + "\n",
`package main; func f(func() (func() int))` + "\n", `package main; func f(func() func() func())` + "\n",
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment