mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
Tweak how we parse "try foo?(etc)"
This commit is contained in:
1 parent
df19bcdb03
commit
7fc98dee00
2 files changed
+17
-32
No files matched your search
@@ -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 {
|
||||
|
||||
+17
-28
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user