Merge pull request #388 from visualfc/commcase

commCase: update scope

package_test.go

@@ -977,10 +977,10 @@ func TestSelect(t *testing.T) {
 	pkg.NewFunc(nil, "main", nil, nil, false).BodyStart(pkg).
 		NewVar(tyXchg, "xchg").
 		/**/ Select().
-		/****/ DefineVarStart(0, "x").Val(ctxRef(pkg, "xchg")).UnaryOp(token.ARROW).EndInit(1).CommCase(1).
+		/****/ CommCase(1).DefineVarStart(0, "x").Val(ctxRef(pkg, "xchg")).UnaryOp(token.ARROW).EndInit(1).
 		/******/ NewVarStart(types.Typ[types.Int], "t").Val(ctxRef(pkg, "x")).EndInit(1).
 		/****/ End().
-		/****/ Val(ctxRef(pkg, "xchg")).Val(1).Send().CommCase(1).
+		/****/ CommCase(1).Val(ctxRef(pkg, "xchg")).Val(1).Send().
 		/******/ DefineVarStart(0, "x").Val(1).EndInit(1).
 		/****/ End().
 		/****/ CommCase(0).

stmt.go

@@ -226,11 +226,7 @@ type selectStmt struct {
 }
 
 func (p *selectStmt) CommCase(cb *CodeBuilder, n int, src ...ast.Node) {
-	var comm ast.Stmt
-	if n == 1 {
-		comm = cb.popStmt()
-	}
-	stmt := &commCase{comm: comm}
+	stmt := &commCase{n: n}
 	cb.startBlockStmt(stmt, src, "comm case statement", &stmt.old)
 }
 
@@ -241,14 +237,19 @@ func (p *selectStmt) End(cb *CodeBuilder, src ast.Node) {
 }
 
 type commCase struct {
-	comm ast.Stmt
-	old  codeBlockCtx
+	n   int
+	old codeBlockCtx
 }
 
 func (p *commCase) End(cb *CodeBuilder, src ast.Node) {
+	var comm ast.Stmt
+	if p.n == 1 {
+		comm = cb.current.stmts[0]
+		cb.current.stmts = cb.current.stmts[1:]
+	}
 	body, flows := cb.endBlockStmt(&p.old)
 	cb.current.flows |= flows
-	cb.emitStmt(&ast.CommClause{Comm: p.comm, Body: body})
+	cb.emitStmt(&ast.CommClause{Comm: comm, Body: body})
 }
 
 // ----------------------------------------------------------------------------