From 7fd9cfd0cc74756ffa1cb9ac58f847b7c583c4ce Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Wed, 10 Jun 2009 15:40:19 -0700 Subject: [PATCH] - parser bug: return keyword may be followed by case or default keyword as well - fixed unrelated typo R=rsc DELTA=2 (0 added, 0 deleted, 2 changed) OCL=30175 CL=30175 --- src/pkg/go/parser/parser.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pkg/go/parser/parser.go b/src/pkg/go/parser/parser.go index 0568686956..11c0ee1725 100644 --- a/src/pkg/go/parser/parser.go +++ b/src/pkg/go/parser/parser.go @@ -1314,7 +1314,7 @@ func (p *parser) parseReturnStmt() *ast.ReturnStmt { pos := p.pos; p.expect(token.RETURN); var x []ast.Expr; - if p.tok != token.SEMICOLON && p.tok != token.RBRACE { + if p.tok != token.SEMICOLON && p.tok != token.CASE && p.tok != token.DEFAULT && p.tok != token.RBRACE { x = p.parseExpressionList(); } @@ -1431,7 +1431,7 @@ func (p *parser) parseCaseClause() *ast.CaseClause { func (p *parser) parseTypeCaseClause() *ast.TypeCaseClause { if p.trace { - defer un(trace(p, "CaseClause")); + defer un(trace(p, "TypeCaseClause")); } // TypeSwitchCase -- 2.48.1