Parse if statements.

This commit is contained in:
Nigel Tao committed 2017-05-04 18:28:03 +10:00
1 parent 6f9ad72330
commit 14ec9e33b7
3 files changed
+53

No files matched your search

+8
View File
@@ -57,6 +57,13 @@ const (
// - List2: <*> loop body
KFor
// KIf is "if LHS { List1 } else RHS" or "if LHS { List1 } else { List2 }":
// - LHS: <KExpr>
// - RHS: <nil|KIf>
// - 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",
+41
View File
@@ -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 {
+4
View File
@@ -147,6 +147,8 @@ const (
IDPtr = ID(0xA1<<idShift | FlagsOther)
IDAssert = ID(0xA2<<idShift | FlagsOther)
IDFor = ID(0xA3<<idShift | FlagsOther)
IDIf = ID(0xA4<<idShift | FlagsOther)
IDElse = ID(0xA5<<idShift | FlagsOther)
IDFalse = ID(0xD0<<idShift | FlagsLiteral | FlagsImplicitSemicolon)
IDTrue = ID(0xD1<<idShift | FlagsLiteral | FlagsImplicitSemicolon)
@@ -224,6 +226,8 @@ var builtInsByKey = [nBuiltInKeys]struct {
IDPtr >> 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},