mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 08:32:11 +01:00
Parse "f?(x)".
Also fix some FlagsAssociative token flags.
This commit is contained in:
1 parent
2045b1a9d4
commit
9f5ddd4d99
3 files changed
+25
-21
No files matched your search
+2
-1
@@ -21,6 +21,7 @@ const (
|
||||
// - LHS: <nil|KExpr>
|
||||
// - RHS: <nil|KExpr|KType>
|
||||
// - List0: <KExpr> 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: <KParam> in-parameters
|
||||
// - List1: <KParam> out-parameters
|
||||
// - List2: <*> function body
|
||||
// - FlagsSuspendible is (List1) vs ?(List1)
|
||||
// - FlagsSuspendible is "(List1)" vs "?(List1)"
|
||||
KFunc
|
||||
|
||||
// KFile is a file of source code:
|
||||
|
||||
+20
-17
@@ -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,
|
||||
|
||||
+3
-3
@@ -102,7 +102,7 @@ const (
|
||||
|
||||
IDDot = ID(0x20<<idShift | FlagsTightLeft | FlagsTightRight)
|
||||
IDComma = ID(0x21<<idShift | FlagsTightLeft)
|
||||
IDQuestion = ID(0x22<<idShift | FlagsTightRight | FlagsUnaryOp)
|
||||
IDQuestion = ID(0x22<<idShift | FlagsTightLeft | FlagsTightRight)
|
||||
IDColon = ID(0x23<<idShift | FlagsTightLeft | FlagsTightRight)
|
||||
IDSemicolon = ID(0x24<<idShift | FlagsTightLeft)
|
||||
|
||||
@@ -137,8 +137,8 @@ const (
|
||||
IDGreaterThan = ID(0x75<<idShift | FlagsBinaryOp)
|
||||
|
||||
// TODO: sort these by name, when the list has stabilized.
|
||||
IDAnd = ID(0x80<<idShift | FlagsBinaryOp)
|
||||
IDOr = ID(0x81<<idShift | FlagsBinaryOp)
|
||||
IDAnd = ID(0x80<<idShift | FlagsBinaryOp | FlagsAssociative)
|
||||
IDOr = ID(0x81<<idShift | FlagsBinaryOp | FlagsAssociative)
|
||||
IDNot = ID(0x82<<idShift | FlagsUnaryOp)
|
||||
IDAs = ID(0x83<<idShift | FlagsBinaryOp)
|
||||
|
||||
|
||||
Reference in new issue
Block a user