diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 7b61ce2b..c7c732fc 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -15,7 +15,7 @@ type Kind uint32 const ( KInvalid = Kind(iota) - // KExpr is an expression, such as "i", "+j" or "k + l[m(n, o)].p". + // KExpr is an expression, such as "i", "+j" or "k + l[m(n, o)].p": // - ID0: <0|operator|IDOpenParen|IDOpenBracket|IDDot> // - ID1: <0|identifier name|literal> // - LHS: @@ -37,9 +37,13 @@ const ( // For selectors, like "lhs.id1", ID0 is IDDot. KExpr - // KAssign is "Left = Right". - // - LHS: Left - // - RHS: Right + // KAssert is "assert RHS": + // - RHS: + KAssert + + // KAssign is "LHS = RHS": + // - LHS: + // - RHS: KAssign // KParam is a "name type" parameter: @@ -47,7 +51,7 @@ const ( // - RHS: KParam - // KType is a type, such as "u32", "pkg.foo", "ptr T" or "[8] T". + // KType is a type, such as "u32", "pkg.foo", "ptr T" or "[8] T": // - ID0: <0|package name|IDPtr> // - ID1: <0|type name> // - LHS: @@ -72,7 +76,7 @@ const ( // - FlagsSuspendible is (List1) vs ?(List1) KFunc - // KFile is a file of source code. + // KFile is a file of source code: // - List0: top-level declarations KFile ) @@ -85,6 +89,7 @@ func (k Kind) String() string { } var kindStrings = [...]string{ + KAssert: "KAssert", KAssign: "KAssign", KExpr: "KExpr", KFile: "KFile", diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 7d950734..a9defc61 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -290,7 +290,18 @@ func (p *parser) parseBlock() ([]*a.Node, error) { } func (p *parser) parseStatement() (*a.Node, error) { - // TODO: parse statements other than x = y. + switch x := p.peekID(); x { + case t.IDAssert: + p.src = p.src[1:] + rhs, err := p.parseExpr() + if err != nil { + return nil, err + } + return &a.Node{ + Kind: a.KAssert, + RHS: rhs, + }, nil + } lhs, err := p.parseExpr() if err != nil { diff --git a/lang/token/list.go b/lang/token/list.go index f98997e3..9cc1715c 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -143,8 +143,9 @@ const ( IDAs = ID(0x83<> idShift: {"not", IDNot}, IDAs >> idShift: {"as", IDAs}, - IDFunc >> idShift: {"func", IDFunc}, - IDPtr >> idShift: {"ptr", IDPtr}, + IDFunc >> idShift: {"func", IDFunc}, + IDPtr >> idShift: {"ptr", IDPtr}, + IDAssert >> idShift: {"assert", IDAssert}, IDFalse >> idShift: {"false", IDFalse}, IDTrue >> idShift: {"true", IDTrue},