From 2045b1a9d44542e1e291e1c797d002132f3c9f14 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 18:39:47 +1000 Subject: [PATCH] Parse break, continue and return. --- lang/ast/ast.go | 35 +++++++++++++++++++++++++---------- lang/parse/parse.go | 23 +++++++++++++++++++++++ lang/token/list.go | 30 ++++++++++++++++++------------ 3 files changed, 66 insertions(+), 22 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 3b00a588..e453b0af 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -64,6 +64,18 @@ const ( // - List2: <*> if-false body KIf + // KReturn is "return LHS": + // - LHS: + KReturn + + // KBreak is "break": + // TODO: label? + KBreak + + // KContinue is "continue": + // TODO: label? + KContinue + // KType is a type, such as "u32", "pkg.foo", "ptr T" or "[8] T": // - ID0: <0|package name|IDPtr> // - ID1: <0|type name> @@ -102,16 +114,19 @@ func (k Kind) String() string { } var kindStrings = [...]string{ - KAssert: "KAssert", - KAssign: "KAssign", - KExpr: "KExpr", - KFile: "KFile", - KFor: "KFor", - KFunc: "KFunc", - KIf: "KIf", - KInvalid: "KInvalid", - KParam: "KParam", - KType: "KType", + KAssert: "KAssert", + KAssign: "KAssign", + KBreak: "KBreak", + KContinue: "KContinue", + KExpr: "KExpr", + KFile: "KFile", + KFor: "KFor", + KFunc: "KFunc", + KIf: "KIf", + KInvalid: "KInvalid", + KParam: "KParam", + KReturn: "KReturn", + KType: "KType", } type Flags uint32 diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 25825ec1..d4aca51b 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -302,6 +302,18 @@ func (p *parser) parseStatement() (*a.Node, error) { RHS: rhs, }, nil + case t.IDBreak: + p.src = p.src[1:] + return &a.Node{ + Kind: a.KBreak, + }, nil + + case t.IDContinue: + p.src = p.src[1:] + return &a.Node{ + Kind: a.KContinue, + }, nil + case t.IDFor: p.src = p.src[1:] lhs, err := (*a.Node)(nil), error(nil) @@ -323,6 +335,17 @@ func (p *parser) parseStatement() (*a.Node, error) { case t.IDIf: return p.parseIf() + + case t.IDReturn: + p.src = p.src[1:] + lhs, err := p.parseExpr() + if err != nil { + return nil, err + } + return &a.Node{ + Kind: a.KReturn, + LHS: lhs, + }, nil } lhs, err := p.parseExpr() diff --git a/lang/token/list.go b/lang/token/list.go index 28a47948..db719c7d 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -143,12 +143,15 @@ const ( IDAs = ID(0x83<> idShift: {"not", IDNot}, IDAs >> idShift: {"as", IDAs}, - IDFunc >> idShift: {"func", IDFunc}, - IDPtr >> idShift: {"ptr", IDPtr}, - IDAssert >> idShift: {"assert", IDAssert}, - IDFor >> idShift: {"for", IDFor}, - IDIf >> idShift: {"if", IDIf}, - IDElse >> idShift: {"else", IDElse}, + IDFunc >> idShift: {"func", IDFunc}, + IDPtr >> idShift: {"ptr", IDPtr}, + IDAssert >> idShift: {"assert", IDAssert}, + IDFor >> idShift: {"for", IDFor}, + IDIf >> idShift: {"if", IDIf}, + IDElse >> idShift: {"else", IDElse}, + IDReturn >> idShift: {"return", IDReturn}, + IDBreak >> idShift: {"break", IDBreak}, + IDContinue >> idShift: {"continue", IDContinue}, IDFalse >> idShift: {"false", IDFalse}, IDTrue >> idShift: {"true", IDTrue},