From 14ec9e33b77c4e3e88dd44dd4bd812d21d0a19f3 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 18:28:03 +1000 Subject: [PATCH] Parse if statements. --- lang/ast/ast.go | 8 ++++++++ lang/parse/parse.go | 41 +++++++++++++++++++++++++++++++++++++++++ lang/token/list.go | 4 ++++ 3 files changed, 53 insertions(+) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 7b20427e..3b00a588 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -57,6 +57,13 @@ const ( // - List2: <*> loop body KFor + // KIf is "if LHS { List1 } else RHS" or "if LHS { List1 } else { List2 }": + // - LHS: + // - RHS: + // - List1: <*> if-true body + // - List2: <*> if-false body + KIf + // KType is a type, such as "u32", "pkg.foo", "ptr T" or "[8] T": // - ID0: <0|package name|IDPtr> // - ID1: <0|type name> @@ -101,6 +108,7 @@ var kindStrings = [...]string{ KFile: "KFile", KFor: "KFor", KFunc: "KFunc", + KIf: "KIf", KInvalid: "KInvalid", KParam: "KParam", KType: "KType", diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 222d2fed..25825ec1 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -320,6 +320,9 @@ func (p *parser) parseStatement() (*a.Node, error) { LHS: lhs, List2: block, }, nil + + case t.IDIf: + return p.parseIf() } lhs, err := p.parseExpr() @@ -348,6 +351,44 @@ func (p *parser) parseStatement() (*a.Node, error) { }, nil } +func (p *parser) parseIf() (*a.Node, error) { + if x := p.peekID(); x != t.IDIf { + got := p.m.ByKey(x.Key()) + return nil, fmt.Errorf("parse: expected \"if\", got %q at %s:%d", got, p.filename, p.line()) + } + p.src = p.src[1:] + lhs, err := p.parseExpr() + if err != nil { + return nil, err + } + list1, err := p.parseBlock() + if err != nil { + return nil, err + } + rhs, list2 := (*a.Node)(nil), ([]*a.Node)(nil) + if p.peekID() == t.IDElse { + p.src = p.src[1:] + if p.peekID() == t.IDIf { + rhs, err = p.parseIf() + if err != nil { + return nil, err + } + } else { + list2, err = p.parseBlock() + if err != nil { + return nil, err + } + } + } + return &a.Node{ + Kind: a.KIf, + LHS: lhs, + RHS: rhs, + List1: list1, + List2: list2, + }, nil +} + func (p *parser) parseExpr() (*a.Node, error) { lhs, err := p.parseOperand() if err != nil { diff --git a/lang/token/list.go b/lang/token/list.go index 81a514aa..28a47948 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -147,6 +147,8 @@ const ( IDPtr = ID(0xA1<> idShift: {"ptr", IDPtr}, IDAssert >> idShift: {"assert", IDAssert}, IDFor >> idShift: {"for", IDFor}, + IDIf >> idShift: {"if", IDIf}, + IDElse >> idShift: {"else", IDElse}, IDFalse >> idShift: {"false", IDFalse}, IDTrue >> idShift: {"true", IDTrue},