diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 04a7542f..7b61ce2b 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -51,19 +51,16 @@ const ( // - ID0: <0|package name|IDPtr> // - ID1: <0|type name> // - LHS: - // - RHS: + // - RHS: // - // A zero ID0 means an undecorated type like "u32" or "foo". ID1 is - // zero or "pkg". ID1 is "u32" or "foo". RHS is nil. + // An IDPtr ID0 means "ptr RHS". RHS is a KType. // - // An IDPtr ID0 means "ptr RHS". + // An IDOpenBracket ID0 means "[LHS] RHS". RHS is a KType. // - // An IDOpenBracket ID0 means "[LHS] RHS". - // - // Other ID0 values mean a package-qualified type like "pkg.foo". ID0 is - // the "pkg", ID1 is the "foo". - // - // TODO: refinements, such as "u32~[:4096]". + // Other ID0 values mean a (possibly package-qualified) type like "pkg.foo" + // or "foo". ID0 is the "pkg" or zero, ID1 is the "foo". Such a type can be + // refined as "pkg.foo[LHS:RHS]". LHS and RHS are KExpr's, possibly nil. + // For example, the LHS for "u32[:4096]" is nil. KType // KFunc is "func ID0.ID1 (List0) (List1) { List2 }": diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 2f117e8d..7d950734 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -206,13 +206,60 @@ func (p *parser) parseType() (*a.Node, error) { if err != nil { return nil, err } + + lhs, rhs := (*a.Node)(nil), (*a.Node)(nil) + if x := p.peekID(); x == t.IDOpenBracket { + lhs, rhs, err = p.parseRange() + if err != nil { + return nil, err + } + } + return &a.Node{ Kind: a.KType, ID0: id0, ID1: id1, + LHS: lhs, + RHS: rhs, }, nil } +func (p *parser) parseRange() (lhs *a.Node, rhs *a.Node, err error) { + if x := p.peekID(); x != t.IDOpenBracket { + got := p.m.ByKey(x.Key()) + return nil, nil, fmt.Errorf("parse: expected \"[\", got %q for range at %s:%d", got, p.filename, p.line()) + } + p.src = p.src[1:] + + if p.peekID() != t.IDColon { + lhs, err = p.parseExpr() + if err != nil { + return nil, nil, err + } + } + + if x := p.peekID(); x != t.IDColon { + got := p.m.ByKey(x.Key()) + return nil, nil, fmt.Errorf("parse: expected \":\", got %q for range at %s:%d", got, p.filename, p.line()) + } + p.src = p.src[1:] + + if p.peekID() != t.IDCloseBracket { + rhs, err = p.parseExpr() + if err != nil { + return nil, nil, err + } + } + + if x := p.peekID(); x != t.IDCloseBracket { + got := p.m.ByKey(x.Key()) + return nil, nil, fmt.Errorf("parse: expected \"]\", got %q for range at %s:%d", got, p.filename, p.line()) + } + p.src = p.src[1:] + + return lhs, rhs, nil +} + func (p *parser) parseBlock() ([]*a.Node, error) { if x := p.peekID(); x != t.IDOpenCurly { got := p.m.ByKey(x.Key()) diff --git a/lang/token/list.go b/lang/token/list.go index 21f54069..f98997e3 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -100,11 +100,11 @@ const ( IDOpenCurly = ID(0x14<