From 9f5ddd4d99e1e2f545611b53363b8371f5834a8b Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 19:04:07 +1000 Subject: [PATCH] Parse "f?(x)". Also fix some FlagsAssociative token flags. --- lang/ast/ast.go | 3 ++- lang/parse/parse.go | 37 ++++++++++++++++++++----------------- lang/token/list.go | 6 +++--- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index e453b0af..ee885251 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -21,6 +21,7 @@ const ( // - LHS: // - RHS: // - List0: function call arguments + // - FlagsSuspendible is "f(x)" vs "f?(x)" // // A zero ID0 means an identifier or literal in ID1, like "foo" or "42". // @@ -98,7 +99,7 @@ const ( // - List0: in-parameters // - List1: out-parameters // - List2: <*> function body - // - FlagsSuspendible is (List1) vs ?(List1) + // - FlagsSuspendible is "(List1)" vs "?(List1)" KFunc // KFile is a file of source code: diff --git a/lang/parse/parse.go b/lang/parse/parse.go index d4aca51b..5d0650bd 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -353,25 +353,21 @@ func (p *parser) parseStatement() (*a.Node, error) { return nil, err } - op := p.peekID() - if !op.IsAssign() { - got := p.m.ByKey(op.Key()) - return nil, fmt.Errorf("parse: expected assignment, got %q for statement at %s:%d", - got, p.filename, p.line()) - } - p.src = p.src[1:] - - rhs, err := p.parseExpr() - if err != nil { - return nil, err + if op := p.peekID(); op.IsAssign() { + p.src = p.src[1:] + rhs, err := p.parseExpr() + if err != nil { + return nil, err + } + return &a.Node{ + Kind: a.KAssign, + ID0: op, + LHS: lhs, + RHS: rhs, + }, nil } - return &a.Node{ - Kind: a.KAssign, - ID0: op, - LHS: lhs, - RHS: rhs, - }, nil + return lhs, nil } func (p *parser) parseIf() (*a.Node, error) { @@ -482,10 +478,16 @@ func (p *parser) parseOperand() (*a.Node, error) { } for { + flags := a.Flags(0) switch p.peekID() { default: return lhs, nil + case t.IDQuestion: + p.src = p.src[1:] + flags |= a.FlagsSuspendible + fallthrough + case t.IDOpenParen: list0, err := p.parseList("argument", (*parser).parseExpr) if err != nil { @@ -493,6 +495,7 @@ func (p *parser) parseOperand() (*a.Node, error) { } lhs = &a.Node{ Kind: a.KExpr, + Flags: flags, ID0: t.IDOpenParen, LHS: lhs, List0: list0, diff --git a/lang/token/list.go b/lang/token/list.go index db719c7d..759dffb6 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -102,7 +102,7 @@ const ( IDDot = ID(0x20<