From 017e73c1b259450e6fc1b8437844c66b9ce08db3 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Wed, 13 Apr 2011 22:48:21 -0400
Subject: [PATCH] gc: fix func syntax error

Fixes #1685.

R=ken2
CC=golang-dev
https://golang.org/cl/4414042
---
 src/cmd/gc/go.y |  3 ++-
 test/func6.go   | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 test/func6.go

diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y
index ba2b2a6343..89899ae1e9 100644
--- a/src/cmd/gc/go.y
+++ b/src/cmd/gc/go.y
@@ -1239,9 +1239,10 @@ fnlitdcl:
 	}
 
 fnliteral:
-	fnlitdcl '{' stmt_list '}'
+	fnlitdcl lbrace stmt_list '}'
 	{
 		$$ = closurebody($3);
+		fixlbrace($2);
 	}
 
 
diff --git a/test/func6.go b/test/func6.go
new file mode 100644
index 0000000000..1356b6aa8b
--- /dev/null
+++ b/test/func6.go
@@ -0,0 +1,14 @@
+// $G $D/$F.go
+
+// Copyright 2011 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+func main() {
+	if func() bool { return true }() {}  // 6g used to say this was a syntax error
+	if (func() bool { return true })() {}
+	if (func() bool { return true }()) {}
+}
+