mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 16:47:28 +01:00
Parse "u32[:4096]".
This commit is contained in:
1 parent
a3fd737dae
commit
17607c74a5
3 files changed
+59
-15
No files matched your search
+7
-10
@@ -51,19 +51,16 @@ const (
|
||||
// - ID0: <0|package name|IDPtr>
|
||||
// - ID1: <0|type name>
|
||||
// - LHS: <nil|KExpr>
|
||||
// - RHS: <nil|KType>
|
||||
// - RHS: <nil|KExpr|KType>
|
||||
//
|
||||
// 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 }":
|
||||
|
||||
@@ -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())
|
||||
|
||||
+5
-5
@@ -100,11 +100,11 @@ const (
|
||||
IDOpenCurly = ID(0x14<<idShift | FlagsOpen)
|
||||
IDCloseCurly = ID(0x15<<idShift | FlagsClose | FlagsImplicitSemicolon)
|
||||
|
||||
IDDot = ID(0x20<<idShift | FlagsOther | FlagsTightLeft | FlagsTightRight)
|
||||
IDComma = ID(0x21<<idShift | FlagsOther | FlagsTightLeft)
|
||||
IDQuestion = ID(0x22<<idShift | FlagsOther | FlagsTightRight | FlagsUnaryOp)
|
||||
IDColon = ID(0x23<<idShift | FlagsOther)
|
||||
IDSemicolon = ID(0x24<<idShift | FlagsOther)
|
||||
IDDot = ID(0x20<<idShift | FlagsTightLeft | FlagsTightRight)
|
||||
IDComma = ID(0x21<<idShift | FlagsTightLeft)
|
||||
IDQuestion = ID(0x22<<idShift | FlagsTightRight | FlagsUnaryOp)
|
||||
IDColon = ID(0x23<<idShift | FlagsTightLeft | FlagsTightRight)
|
||||
IDSemicolon = ID(0x24<<idShift | FlagsTightLeft)
|
||||
|
||||
IDEq = ID(0x40<<idShift | FlagsAssign)
|
||||
IDPlusEq = ID(0x41<<idShift | FlagsAssign)
|
||||
|
||||
Reference in new issue
Block a user