From c86ff2fcc3dd08befd2fd311463d134ad5e06c08 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 14:22:29 +1000 Subject: [PATCH] Parse "x.y". --- lang/ast/ast.go | 4 ++-- lang/parse/parse.go | 42 +++++++++++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 0dbda6dd..c4b45092 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -16,7 +16,7 @@ const ( KInvalid = Kind(iota) // KExpr is an expression, such as "i", "+j" or "k + l[m].n". - // - ID0: <0|operator|IDOpenBracket|IDDot> + // - ID0: <0|operator|IDOpenParen|IDOpenBracket|IDDot> // - ID1: <0|identifier name|literal> // - LHS: // - RHS: @@ -33,7 +33,7 @@ const ( // // For indexes, like "lhs[rhs]", ID0 is IDOpenBracket. // - // For selectors, like "lhs.rhs", ID0 is IDDot. + // For selectors, like "lhs.id1", ID0 is IDDot. KExpr // KAssign is "Left = Right". diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 98e3c7f0..ad513ec1 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -310,7 +310,7 @@ func (p *parser) parseOperand() (*a.Node, error) { case x.IsUnaryOp(): p.src = p.src[1:] - rhs, err := p.parseExpr() + rhs, err := p.parseOperand() if err != nil { return nil, err } @@ -325,18 +325,34 @@ func (p *parser) parseOperand() (*a.Node, error) { if err != nil { return nil, err } - - switch p.peekID() { - case t.IDOpenParen: - // TODO: parse "f(i)". - case t.IDOpenBracket: - // TODO: parse "a[i]". - case t.IDDot: - // TODO: parse "x.y". - } - - return &a.Node{ + lhs := &a.Node{ Kind: a.KExpr, ID1: id, - }, nil + } + + for { + switch p.peekID() { + default: + return lhs, nil + + case t.IDOpenParen: + // TODO: parse "f(i)". + + case t.IDOpenBracket: + // TODO: parse "a[i]". + + case t.IDDot: + p.src = p.src[1:] + id, err := p.parseIdent() + if err != nil { + return nil, err + } + lhs = &a.Node{ + Kind: a.KExpr, + ID0: t.IDDot, + ID1: id, + LHS: lhs, + } + } + } }