From: Robert Griesemer <gri@golang.org>
Date: Fri, 29 Apr 2011 19:20:31 +0000 (-0700)
Subject: undo CL 4428057 / 19e540fc7d7d
X-Git-Tag: weekly.2011-05-22~191
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c134718611c424ead65eb8753855dd5487c52630;p=gostls13.git

undo CL 4428057 / 19e540fc7d7d

The CL introduces inconsistencies with respect to
the use of parentheses/grouping of receive operations.

««« original CL description
spec: narrow syntax for expression and select statements

This is not a language change, it simply expresses the
accepted cases explicitly in the respective productions.

R=rsc, r, iant
CC=golang-dev
https://golang.org/cl/4428057
»»»

R=golang-dev, rsc1
CC=golang-dev
https://golang.org/cl/4444080
---

diff --git a/doc/go_spec.html b/doc/go_spec.html
index b287471cff..886f89d126 100644
--- a/doc/go_spec.html
+++ b/doc/go_spec.html
@@ -1,5 +1,5 @@
 <!-- title The Go Programming Language Specification -->
-<!-- subtitle Version of Apr 29, 2011 -->
+<!-- subtitle Version of Apr 22, 2011 -->
 
 <!--
 TODO
@@ -3035,7 +3035,7 @@ f(&lt;-ch)
 </pre>
 
 <p>
-A receive operation used in an assignment or initialization of the form
+A receive expression used in an assignment or initialization of the form
 </p>
 
 <pre>
@@ -3521,14 +3521,13 @@ Error: log.Panic("error encountered")
 <h3 id="Expression_statements">Expression statements</h3>
 
 <p>
-Function calls, method calls, and
-<a href="#Receive_operator">receive operations</a>
+Function calls, method calls, and receive operations
 can appear in statement context.
 </p>
 
+
 <pre class="ebnf">
-ExpressionStmt = PrimaryExpr Call | RecvExpr .
-RecvExpr       = "&lt;-" UnaryExpr .
+ExpressionStmt = Expression .
 </pre>
 
 <pre>
@@ -4088,9 +4087,11 @@ SelectStmt = "select" "{" { CommClause } "}" .
 CommClause = CommCase ":" { Statement ";" } .
 CommCase   = "case" ( SendStmt | RecvStmt ) | "default" .
 RecvStmt   = [ Expression [ "," Expression ] ( "=" | ":=" ) ] RecvExpr .
+RecvExpr   = Expression .
 </pre>
 
 <p>
+RecvExpr must be a <a href="#Receive_operator">receive operation</a>.
 For all the cases in the "select"
 statement, the channel expressions are evaluated in top-to-bottom order, along with
 any expressions that appear on the right hand side of send statements.