Parse for loops.

This commit is contained in:
Nigel Tao committed 2017-05-04 18:02:57 +10:00
1 parent 17c6c71e53
commit 4164fe2504
3 files changed
+28 -1

No files matched your search

+7 -1
View File
@@ -51,6 +51,11 @@ const (
// - RHS: <KType>
KParam
// KFor is "for { List2 }" or "for LHS { List2 }":
// - LHS: <nil|KExpr>
// - 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: <KParam> in-parameters
// - List1: <KParam> out-parameters
// - List2: <KAssign> 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",
+19
View File
@@ -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()
+2
View File
@@ -146,6 +146,7 @@ const (
IDFunc = ID(0xA0<<idShift | FlagsOther)
IDPtr = ID(0xA1<<idShift | FlagsOther)
IDAssert = ID(0xA2<<idShift | FlagsOther)
IDFor = ID(0xA3<<idShift | FlagsOther)
IDFalse = ID(0xD0<<idShift | FlagsLiteral | FlagsImplicitSemicolon)
IDTrue = ID(0xD1<<idShift | FlagsLiteral | FlagsImplicitSemicolon)
@@ -222,6 +223,7 @@ var builtInsByKey = [nBuiltInKeys]struct {
IDFunc >> idShift: {"func", IDFunc},
IDPtr >> idShift: {"ptr", IDPtr},
IDAssert >> idShift: {"assert", IDAssert},
IDFor >> idShift: {"for", IDFor},
IDFalse >> idShift: {"false", IDFalse},
IDTrue >> idShift: {"true", IDTrue},