mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
Add iterate advance parameter
This commit is contained in:
1 parent
f2c99e64ed
commit
a1a70da539
13 files changed
+209
-59
No files matched your search
+10
-6
@@ -170,7 +170,7 @@ type Node struct {
|
||||
// Func funcName receiverPkg receiverName Func
|
||||
// IOBind . . . IOBind
|
||||
// If . . . If
|
||||
// Iterate unroll label length Iterate
|
||||
// Iterate advance label length Iterate
|
||||
// Jump keyword label . Jump
|
||||
// Ret keyword . . Ret
|
||||
// Status keyword pkg lit(message) Status
|
||||
@@ -550,12 +550,13 @@ func NewIOBind(keyword t.ID, io *Expr, arg1 *Expr, body []*Node) *IOBind {
|
||||
}
|
||||
|
||||
// Iterate is
|
||||
// "iterate.ID1 (assigns)(length:ID2, unroll:ID0), List1 { List2 } else RHS":
|
||||
// "iterate.ID1 (assigns)(length:ID2, advance:ID0, unroll:LHS), List1 { List2 } else RHS":
|
||||
// - FlagsHasBreak is the iterate has an explicit break
|
||||
// - FlagsHasContinue is the iterate has an explicit continue
|
||||
// - ID0: unroll
|
||||
// - ID0: advance
|
||||
// - ID1: <0|label>
|
||||
// - ID2: length
|
||||
// - LHS: <Expr> unroll
|
||||
// - RHS: <nil|Iterate>
|
||||
// - List0: <Assign> assigns
|
||||
// - List1: <Assert> asserts
|
||||
@@ -566,9 +567,11 @@ func (n *Iterate) AsNode() *Node { return (*Node)(n) }
|
||||
func (n *Iterate) HasBreak() bool { return n.flags&FlagsHasBreak != 0 }
|
||||
func (n *Iterate) HasContinue() bool { return n.flags&FlagsHasContinue != 0 }
|
||||
func (n *Iterate) Keyword() t.ID { return t.IDIterate }
|
||||
func (n *Iterate) Unroll() t.ID { return n.id0 }
|
||||
func (n *Iterate) Advance() t.ID { return n.id0 }
|
||||
func (n *Iterate) Label() t.ID { return n.id1 }
|
||||
func (n *Iterate) Length() t.ID { return n.id2 }
|
||||
func (n *Iterate) Unroll() t.ID { return n.lhs.id2 }
|
||||
func (n *Iterate) UnrollAsExpr() *Expr { return n.lhs.AsExpr() }
|
||||
func (n *Iterate) ElseIterate() *Iterate { return n.rhs.AsIterate() }
|
||||
func (n *Iterate) Assigns() []*Node { return n.list0 }
|
||||
func (n *Iterate) Asserts() []*Node { return n.list1 }
|
||||
@@ -579,12 +582,13 @@ func (n *Iterate) SetElseIterate(o *Iterate) { n.rhs = o.AsNode() }
|
||||
func (n *Iterate) SetHasBreak() { n.flags |= FlagsHasBreak }
|
||||
func (n *Iterate) SetHasContinue() { n.flags |= FlagsHasContinue }
|
||||
|
||||
func NewIterate(label t.ID, assigns []*Node, length t.ID, unroll t.ID, asserts []*Node) *Iterate {
|
||||
func NewIterate(label t.ID, assigns []*Node, length t.ID, advance t.ID, unroll t.ID, asserts []*Node) *Iterate {
|
||||
return &Iterate{
|
||||
kind: KIterate,
|
||||
id0: unroll,
|
||||
id0: advance,
|
||||
id1: label,
|
||||
id2: length,
|
||||
lhs: NewExpr(0, 0, unroll, nil, nil, nil, nil).AsNode(),
|
||||
list0: assigns,
|
||||
list1: asserts,
|
||||
}
|
||||
|
||||
@@ -269,6 +269,9 @@ func (q *checker) bcheckStatement(n *a.Node) error {
|
||||
|
||||
case a.KIterate:
|
||||
n := n.AsIterate()
|
||||
if _, err := q.bcheckExpr(n.UnrollAsExpr(), 0); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, o := range n.Assigns() {
|
||||
o := o.AsAssign()
|
||||
if err := q.bcheckAssignment(o.LHS(), o.Operator(), o.RHS()); err != nil {
|
||||
@@ -281,6 +284,9 @@ func (q *checker) bcheckStatement(n *a.Node) error {
|
||||
|
||||
assigns := n.Assigns()
|
||||
for ; n != nil; n = n.ElseIterate() {
|
||||
if _, err := q.bcheckExpr(n.UnrollAsExpr(), 0); err != nil {
|
||||
return err
|
||||
}
|
||||
q.facts = q.facts[:0]
|
||||
for _, o := range assigns {
|
||||
lhs := o.AsAssign().LHS()
|
||||
|
||||
@@ -129,6 +129,9 @@ func (q *checker) tcheckStatement(n *a.Node) error {
|
||||
|
||||
case a.KIterate:
|
||||
for n := n.AsIterate(); n != nil; n = n.ElseIterate() {
|
||||
if err := q.tcheckExpr(n.UnrollAsExpr(), 0); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, o := range n.Assigns() {
|
||||
if err := q.tcheckStatement(o); err != nil {
|
||||
return err
|
||||
|
||||
+43
-10
@@ -1177,7 +1177,8 @@ func (p *parser) parseIterateBlock(label t.ID, assigns []*a.Node) (*a.Iterate, e
|
||||
p.src = p.src[1:]
|
||||
|
||||
length := p.peek1()
|
||||
if !isSmallPositiveInt256(p.tm, length) {
|
||||
lengthInt := asSmallPositiveInt256(p.tm, length)
|
||||
if lengthInt == 0 {
|
||||
return nil, fmt.Errorf(`parse: expected length count in [1 ..= 256], got %q at %s:%d`,
|
||||
p.tm.ByID(length), p.filename, p.line())
|
||||
}
|
||||
@@ -1189,6 +1190,35 @@ func (p *parser) parseIterateBlock(label t.ID, assigns []*a.Node) (*a.Iterate, e
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
|
||||
if x := p.peek1(); x != t.IDAdvance {
|
||||
got := p.tm.ByID(x)
|
||||
return nil, fmt.Errorf(`parse: expected "advance", got %q at %s:%d`, got, p.filename, p.line())
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
|
||||
if x := p.peek1(); x != t.IDColon {
|
||||
got := p.tm.ByID(x)
|
||||
return nil, fmt.Errorf(`parse: expected ":", got %q at %s:%d`, got, p.filename, p.line())
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
|
||||
advance := p.peek1()
|
||||
advanceInt := asSmallPositiveInt256(p.tm, advance)
|
||||
if advanceInt == 0 {
|
||||
return nil, fmt.Errorf(`parse: expected advance count in [1 ..= 256], got %q at %s:%d`,
|
||||
p.tm.ByID(advance), p.filename, p.line())
|
||||
} else if advanceInt > lengthInt {
|
||||
return nil, fmt.Errorf(`parse: advance %d is larger than length %d at %s:%d`,
|
||||
advanceInt, lengthInt, p.filename, p.line())
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
|
||||
if x := p.peek1(); x != t.IDComma {
|
||||
got := p.tm.ByID(x)
|
||||
return nil, fmt.Errorf(`parse: expected ",", got %q at %s:%d`, got, p.filename, p.line())
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
|
||||
if x := p.peek1(); x != t.IDUnroll {
|
||||
got := p.tm.ByID(x)
|
||||
return nil, fmt.Errorf(`parse: expected "unroll", got %q at %s:%d`, got, p.filename, p.line())
|
||||
@@ -1202,7 +1232,7 @@ func (p *parser) parseIterateBlock(label t.ID, assigns []*a.Node) (*a.Iterate, e
|
||||
p.src = p.src[1:]
|
||||
|
||||
unroll := p.peek1()
|
||||
if !isSmallPositiveInt256(p.tm, unroll) {
|
||||
if asSmallPositiveInt256(p.tm, unroll) == 0 {
|
||||
return nil, fmt.Errorf(`parse: expected unroll count in [1 ..= 256], got %q at %s:%d`,
|
||||
p.tm.ByID(unroll), p.filename, p.line())
|
||||
}
|
||||
@@ -1218,7 +1248,7 @@ func (p *parser) parseIterateBlock(label t.ID, assigns []*a.Node) (*a.Iterate, e
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
n := a.NewIterate(label, assigns, length, unroll, asserts)
|
||||
n := a.NewIterate(label, assigns, length, advance, unroll, asserts)
|
||||
// TODO: decide how break/continue work with iterate loops.
|
||||
if !p.loops.Push(n) {
|
||||
return nil, fmt.Errorf(`parse: duplicate loop label %s at %s:%d`,
|
||||
@@ -1243,24 +1273,27 @@ func (p *parser) parseIterateBlock(label t.ID, assigns []*a.Node) (*a.Iterate, e
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// isSmallPositiveInt256 returns whether id is a numeric literal in the range
|
||||
// [1 ..= 256].
|
||||
func isSmallPositiveInt256(tm *t.Map, id t.ID) bool {
|
||||
// asSmallPositiveInt256 returns id's value when id is a numeric literal in the
|
||||
// range [1 ..= 256]. Otherwise, it returns 0.
|
||||
func asSmallPositiveInt256(tm *t.Map, id t.ID) int {
|
||||
if !id.IsNumLiteral(tm) {
|
||||
return false
|
||||
return 0
|
||||
}
|
||||
s := id.Str(tm)
|
||||
if (len(s) > 3) || (len(s) == 0) || (s[0] < '1') || ('9' < s[0]) {
|
||||
return false
|
||||
return 0
|
||||
}
|
||||
n, s := int(s[0]-'0'), s[1:]
|
||||
for ; len(s) > 0; s = s[1:] {
|
||||
if (s[0] < '0') || ('9' < s[0]) {
|
||||
return false
|
||||
return 0
|
||||
}
|
||||
n = (10 * n) + int(s[0]-'0')
|
||||
}
|
||||
return n <= 256
|
||||
if n > 256 {
|
||||
return 0
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
func (p *parser) parseArgNode() (*a.Node, error) {
|
||||
|
||||
+16
-14
@@ -604,11 +604,13 @@ const (
|
||||
|
||||
// -------- 0x200 block.
|
||||
|
||||
IDInitialize = ID(0x200)
|
||||
IDReset = ID(0x201)
|
||||
IDSet = ID(0x202)
|
||||
IDUnroll = ID(0x203)
|
||||
IDUpdate = ID(0x204)
|
||||
IDAdvance = ID(0x200)
|
||||
IDInitialize = ID(0x201)
|
||||
IDLength = ID(0x202)
|
||||
IDReset = ID(0x203)
|
||||
IDSet = ID(0x204)
|
||||
IDUnroll = ID(0x205)
|
||||
IDUpdate = ID(0x206)
|
||||
|
||||
// TODO: range/rect methods like intersection and contains?
|
||||
|
||||
@@ -624,14 +626,13 @@ const (
|
||||
IDData = ID(0x240)
|
||||
IDHeight = ID(0x241)
|
||||
IDIO = ID(0x242)
|
||||
IDLength = ID(0x243)
|
||||
IDLimit = ID(0x244)
|
||||
IDPrefix = ID(0x245)
|
||||
IDRow = ID(0x246)
|
||||
IDStride = ID(0x247)
|
||||
IDSuffix = ID(0x248)
|
||||
IDValidUTF8Length = ID(0x249)
|
||||
IDWidth = ID(0x24A)
|
||||
IDLimit = ID(0x243)
|
||||
IDPrefix = ID(0x244)
|
||||
IDRow = ID(0x245)
|
||||
IDStride = ID(0x246)
|
||||
IDSuffix = ID(0x247)
|
||||
IDValidUTF8Length = ID(0x248)
|
||||
IDWidth = ID(0x249)
|
||||
|
||||
IDLimitedSwizzleU32InterleavedFromReader = ID(0x280)
|
||||
IDSwizzleInterleavedFromReader = ID(0x281)
|
||||
@@ -967,7 +968,9 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
|
||||
// -------- 0x200 block.
|
||||
|
||||
IDAdvance: "advance",
|
||||
IDInitialize: "initialize",
|
||||
IDLength: "length",
|
||||
IDReset: "reset",
|
||||
IDSet: "set",
|
||||
IDUnroll: "unroll",
|
||||
@@ -985,7 +988,6 @@ var builtInsByID = [nBuiltInIDs]string{
|
||||
IDData: "data",
|
||||
IDHeight: "height",
|
||||
IDIO: "io",
|
||||
IDLength: "length",
|
||||
IDLimit: "limit",
|
||||
IDPrefix: "prefix",
|
||||
IDRow: "row",
|
||||
|
||||
Reference in new issue
Block a user