From 7fc98dee00cf0d9f450b8c37c11764b5b462af10 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 4 Aug 2018 08:51:15 +1000 Subject: [PATCH] Tweak how we parse "try foo?(etc)" --- lang/check/type.go | 4 ---- lang/parse/parse.go | 45 +++++++++++++++++---------------------------- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/lang/check/type.go b/lang/check/type.go index f443f028..d4ac1783 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -580,10 +580,6 @@ func (q *checker) tcheckExprCall(n *a.Expr, depth uint32) error { setPlaceholderMBoundsMType(o.AsNode()) } - // TODO: distinguish t.IDOpenParen vs t.IDTry in a more principled way? - // - // TODO: figure out calls with and without "?" should interact with the out - // type. if n.Operator() == t.IDTry { n.SetMType(typeExprStatus) } else { diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 9a145a4b..23fcd515 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -902,16 +902,9 @@ func (p *parser) parseVarNode(inIterate bool) (*a.Node, error) { } else if p.peek1() == t.IDEq { op = t.IDEq p.src = p.src[1:] - if p.peek1() == t.IDTry { - value, err = p.parseTryExpr() - if err != nil { - return nil, err - } - } else { - value, err = p.parseExpr() - if err != nil { - return nil, err - } + value, err = p.parseExpr() + if err != nil { + return nil, err } } @@ -938,24 +931,6 @@ func (p *parser) parsePossibleDollarExpr() (*a.Expr, error) { return a.NewExpr(0, t.IDDollar, 0, 0, nil, nil, nil, args), nil } -func (p *parser) parseTryExpr() (*a.Expr, error) { - if x := p.peek1(); x != t.IDTry { - got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected "try", got %q at %s:%d`, got, p.filename, p.line()) - } - p.src = p.src[1:] - call, err := p.parseExpr() - if err != nil { - return nil, err - } - if call.Operator() != t.IDOpenParen { - return nil, fmt.Errorf(`parse: expected function call after "try", got %q at %s:%d`, - call.Str(p.tm), p.filename, p.line()) - } - return a.NewExpr(call.AsNode().AsRaw().Flags(), t.IDTry, 0, call.Ident(), - call.LHS(), call.MHS(), call.RHS(), call.Args()), nil -} - func (p *parser) parseExprNode() (*a.Node, error) { n, err := p.parseExpr() if err != nil { @@ -1032,6 +1007,20 @@ func (p *parser) parseOperand() (*a.Expr, error) { default: switch x { + case t.IDTry: + p.src = p.src[1:] + call, err := p.parseOperand() + if err != nil { + return nil, err + } + callFlags := call.AsNode().AsRaw().Flags() + if (call.Operator() != t.IDOpenParen) || (!callFlags.AsEffect().Optional()) { + return nil, fmt.Errorf(`parse: expected ?-function call after "try", got %q at %s:%d`, + call.Str(p.tm), p.filename, p.line()) + } + return a.NewExpr(callFlags, x, 0, call.Ident(), + call.LHS(), call.MHS(), call.RHS(), call.Args()), nil + case t.IDOpenParen: p.src = p.src[1:] expr, err := p.parseExpr()