From d6c877e3310ce51c39b0ff34eccefbaeeffc080a Mon Sep 17 00:00:00 2001 From: visualfc Date: Mon, 4 Jul 2022 11:37:12 +0800 Subject: [PATCH] parser: tupleExpr remove Pos/End implement --- parser/parser.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/parser/parser.go b/parser/parser.go index aaba15b26..3ba835749 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -1582,7 +1582,7 @@ func (p *parser) parseCallOrConversion(fun ast.Expr, isCmd bool) *ast.CallExpr { expr := p.parseRHSOrType(isCmd && len(list) == 0) if tuple, ok := expr.(*tupleExpr); ok { list = tuple.Items - rparen = tuple.End() + rparen = tuple.Closing isCmd = false break } @@ -2085,14 +2085,6 @@ type tupleExpr struct { Closing token.Pos } -func (p *tupleExpr) Pos() token.Pos { - return p.Opening -} - -func (p *tupleExpr) End() token.Pos { - return p.Closing -} - func (p *parser) parseLambdaExpr(allowTuple bool, allowCmd, allowRangeExpr bool) ast.Expr { var x ast.Expr var first = p.pos @@ -2168,8 +2160,8 @@ func (p *parser) parseLambdaExpr(allowTuple bool, allowCmd, allowRangeExpr bool) } } if !allowTuple { - if _, ok := x.(*tupleExpr); ok { - p.error(x.Pos(), "not support tuple") + if tuple, ok := x.(*tupleExpr); ok { + p.error(tuple.Opening, "tuple is not supported") } } return x