summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2011-02-01 08:29:21 -0500
committerRuss Cox <rsc@golang.org>2011-02-01 08:29:21 -0500
commit81431417eb11dbb22a69c867f1823916873611cc (patch)
tree4bde037f36e22125fcc30ba33b5489092b706330
parentc7940bd0f2b7bf83d4b5e0985962f35b5eaec1a4 (diff)
downloadgo-81431417eb11dbb22a69c867f1823916873611cc.tar.gz
gc: fix send precedence
Test and fix case found by Robert. Add receive inside send to tree too. R=ken2 CC=golang-dev http://codereview.appspot.com/3973052
-rw-r--r--src/cmd/gc/go.y3
-rw-r--r--test/chan/sendstmt.go37
2 files changed, 39 insertions, 1 deletions
diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y
index 1060fdd2b..b711d360d 100644
--- a/src/cmd/gc/go.y
+++ b/src/cmd/gc/go.y
@@ -93,9 +93,10 @@ static void fixlbrace(int);
%type <type> hidden_type_func
%type <type> hidden_type_recv_chan hidden_type_non_recv_chan
+%left LCOMM /* outside the usual hierarchy; here for good error messages */
+
%left LOROR
%left LANDAND
-%left LCOMM
%left LEQ LNE LLE LGE LLT LGT
%left '+' '-' '|' '^'
%left '*' '/' '%' '&' LLSH LRSH LANDNOT
diff --git a/test/chan/sendstmt.go b/test/chan/sendstmt.go
new file mode 100644
index 000000000..ee6f765cf
--- /dev/null
+++ b/test/chan/sendstmt.go
@@ -0,0 +1,37 @@
+// $G $D/$F.go && $L $F.$A && ./$A.out
+
+// 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.
+
+// Test various parsing cases that are a little
+// different now that send is a statement, not a expression.
+
+package main
+
+func main() {
+ chanchan()
+ sendprec()
+}
+
+func chanchan() {
+ cc := make(chan chan int, 1)
+ c := make(chan int, 1)
+ cc <- c
+ select {
+ case <-cc <- 2:
+ default:
+ panic("nonblock")
+ }
+ if <-c != 2 {
+ panic("bad receive")
+ }
+}
+
+func sendprec() {
+ c := make(chan bool, 1)
+ c <- false || true // not a syntax error: same as c <- (false || true)
+ if !<-c {
+ panic("sent false")
+ }
+}