From 4164fe25042fb7acd3029900ab7e1dfee0ad6b27 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 4 May 2017 18:02:57 +1000 Subject: [PATCH] Parse for loops. --- lang/ast/ast.go | 8 +++++++- lang/parse/parse.go | 19 +++++++++++++++++++ lang/token/list.go | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index c7c732fc..a3caf238 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -51,6 +51,11 @@ const ( // - RHS: KParam + // KFor is "for { List2 }" or "for LHS { List2 }": + // - LHS: + // - List2: <*> loop body + KFor + // KType is a type, such as "u32", "pkg.foo", "ptr T" or "[8] T": // - ID0: <0|package name|IDPtr> // - ID1: <0|type name> @@ -72,7 +77,7 @@ const ( // - ID1: name // - List0: in-parameters // - List1: out-parameters - // - List2: function body + // - List2: <*> function body // - FlagsSuspendible is (List1) vs ?(List1) KFunc @@ -93,6 +98,7 @@ var kindStrings = [...]string{ KAssign: "KAssign", KExpr: "KExpr", KFile: "KFile", + KFor: "KFor", KFunc: "KFunc", KInvalid: "KInvalid", KParam: "KParam", diff --git a/lang/parse/parse.go b/lang/parse/parse.go index a9defc61..b14fda6f 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -301,6 +301,25 @@ func (p *parser) parseStatement() (*a.Node, error) { Kind: a.KAssert, RHS: rhs, }, nil + + case t.IDFor: + p.src = p.src[1:] + lhs, err := (*a.Node)(nil), error(nil) + if p.peekID() != t.IDOpenCurly { + lhs, err = p.parseExpr() + if err != nil { + return nil, err + } + } + block, err := p.parseBlock() + if err != nil { + return nil, err + } + return &a.Node{ + Kind: a.KFor, + LHS: lhs, + List2: block, + }, nil } lhs, err := p.parseExpr() diff --git a/lang/token/list.go b/lang/token/list.go index 9cc1715c..81a514aa 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -146,6 +146,7 @@ const ( IDFunc = ID(0xA0<> idShift: {"func", IDFunc}, IDPtr >> idShift: {"ptr", IDPtr}, IDAssert >> idShift: {"assert", IDAssert}, + IDFor >> idShift: {"for", IDFor}, IDFalse >> idShift: {"false", IDFalse}, IDTrue >> idShift: {"true", IDTrue},