mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Reorder some switch cases.
This commit is contained in:
1 parent
ac793d33bc
commit
83c8faef4d
3 files changed
+96
-96
No files matched your search
@@ -121,6 +121,60 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
|
||||
}
|
||||
return nil
|
||||
|
||||
case a.KIterate:
|
||||
n := n.Iterate()
|
||||
vars := n.Variables()
|
||||
if len(vars) == 0 {
|
||||
return nil
|
||||
}
|
||||
if len(vars) != 1 {
|
||||
return fmt.Errorf("TODO: iterate over more than one variable")
|
||||
}
|
||||
v := vars[0].Var()
|
||||
name := v.Name().String(g.tm)
|
||||
b.writes("{\n")
|
||||
|
||||
// TODO: don't assume that the slice is a slice of u8. In particular,
|
||||
// the code gen can be subtle if the slice element type has zero size,
|
||||
// such as the empty struct.
|
||||
b.printf("puffs_base__slice_u8 %sslice_%s =", iPrefix, name)
|
||||
if err := g.writeExpr(b, v.Value(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(";\n")
|
||||
b.printf("uint8_t* %s%s = %sslice_%s.ptr;\n", vPrefix, name, iPrefix, name)
|
||||
// TODO: look at n.HasContinue() and n.HasBreak().
|
||||
|
||||
unrollCount := int(n.UnrollCount().ConstValue().Int64())
|
||||
if unrollCount != 1 {
|
||||
b.printf("uint8_t* %send0_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n",
|
||||
iPrefix, name, iPrefix, name, iPrefix, name, unrollCount, unrollCount)
|
||||
b.printf("while (%s%s < %send0_%s) {\n", vPrefix, name, iPrefix, name)
|
||||
for i := 0; i < unrollCount; i++ {
|
||||
for _, o := range n.Body() {
|
||||
if err := g.writeStatement(b, o, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
b.printf("%s%s++;\n", vPrefix, name)
|
||||
}
|
||||
b.writes("}\n")
|
||||
}
|
||||
|
||||
b.printf("uint8_t* %send1_%s = %sslice_%s.ptr + %sslice_%s.len;\n",
|
||||
iPrefix, name, iPrefix, name, iPrefix, name)
|
||||
b.printf("while (%s%s < %send1_%s) {\n", vPrefix, name, iPrefix, name)
|
||||
for _, o := range n.Body() {
|
||||
if err := g.writeStatement(b, o, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
b.printf("%s%s++;\n", vPrefix, name)
|
||||
b.writes("}\n")
|
||||
|
||||
b.writes("}\n")
|
||||
return nil
|
||||
|
||||
case a.KJump:
|
||||
n := n.Jump()
|
||||
jt, err := g.currFunk.jumpTarget(n.JumpTarget())
|
||||
@@ -238,60 +292,6 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
|
||||
}
|
||||
return nil
|
||||
|
||||
case a.KIterate:
|
||||
n := n.Iterate()
|
||||
vars := n.Variables()
|
||||
if len(vars) == 0 {
|
||||
return nil
|
||||
}
|
||||
if len(vars) != 1 {
|
||||
return fmt.Errorf("TODO: iterate over more than one variable")
|
||||
}
|
||||
v := vars[0].Var()
|
||||
name := v.Name().String(g.tm)
|
||||
b.writes("{\n")
|
||||
|
||||
// TODO: don't assume that the slice is a slice of u8. In particular,
|
||||
// the code gen can be subtle if the slice element type has zero size,
|
||||
// such as the empty struct.
|
||||
b.printf("puffs_base__slice_u8 %sslice_%s =", iPrefix, name)
|
||||
if err := g.writeExpr(b, v.Value(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(";\n")
|
||||
b.printf("uint8_t* %s%s = %sslice_%s.ptr;\n", vPrefix, name, iPrefix, name)
|
||||
// TODO: look at n.HasContinue() and n.HasBreak().
|
||||
|
||||
unrollCount := int(n.UnrollCount().ConstValue().Int64())
|
||||
if unrollCount != 1 {
|
||||
b.printf("uint8_t* %send0_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n",
|
||||
iPrefix, name, iPrefix, name, iPrefix, name, unrollCount, unrollCount)
|
||||
b.printf("while (%s%s < %send0_%s) {\n", vPrefix, name, iPrefix, name)
|
||||
for i := 0; i < unrollCount; i++ {
|
||||
for _, o := range n.Body() {
|
||||
if err := g.writeStatement(b, o, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
b.printf("%s%s++;\n", vPrefix, name)
|
||||
}
|
||||
b.writes("}\n")
|
||||
}
|
||||
|
||||
b.printf("uint8_t* %send1_%s = %sslice_%s.ptr + %sslice_%s.len;\n",
|
||||
iPrefix, name, iPrefix, name, iPrefix, name)
|
||||
b.printf("while (%s%s < %send1_%s) {\n", vPrefix, name, iPrefix, name)
|
||||
for _, o := range n.Body() {
|
||||
if err := g.writeStatement(b, o, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
b.printf("%s%s++;\n", vPrefix, name)
|
||||
b.writes("}\n")
|
||||
|
||||
b.writes("}\n")
|
||||
return nil
|
||||
|
||||
case a.KWhile:
|
||||
n := n.While()
|
||||
// TODO: consider suspendible calls.
|
||||
|
||||
+18
-18
@@ -122,6 +122,24 @@ func (q *checker) tcheckStatement(n *a.Node) error {
|
||||
}
|
||||
return nil
|
||||
|
||||
case a.KIterate:
|
||||
n := n.Iterate()
|
||||
unroll := n.UnrollCount()
|
||||
if err := q.tcheckExpr(unroll, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
if cv := unroll.ConstValue(); cv == nil {
|
||||
return fmt.Errorf("check: unroll count %q is not constant", unroll.String(q.tm))
|
||||
}
|
||||
for _, o := range n.Variables() {
|
||||
if err := q.tcheckStatement(o); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := q.tcheckLoop(n); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case a.KJump:
|
||||
n := n.Jump()
|
||||
jumpTarget := (a.Loop)(nil)
|
||||
@@ -213,24 +231,6 @@ func (q *checker) tcheckStatement(n *a.Node) error {
|
||||
// TODO: check that the default zero value is assignable to n.XType().
|
||||
}
|
||||
|
||||
case a.KIterate:
|
||||
n := n.Iterate()
|
||||
unroll := n.UnrollCount()
|
||||
if err := q.tcheckExpr(unroll, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
if cv := unroll.ConstValue(); cv == nil {
|
||||
return fmt.Errorf("check: unroll count %q is not constant", unroll.String(q.tm))
|
||||
}
|
||||
for _, o := range n.Variables() {
|
||||
if err := q.tcheckStatement(o); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := q.tcheckLoop(n); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case a.KWhile:
|
||||
n := n.While()
|
||||
cond := n.Condition()
|
||||
|
||||
+24
-24
@@ -568,6 +568,10 @@ func (p *parser) parseStatement1() (*a.Node, error) {
|
||||
}
|
||||
return a.NewJump(x, label).Node(), nil
|
||||
|
||||
case t.KeyIf:
|
||||
o, err := p.parseIf()
|
||||
return o.Node(), err
|
||||
|
||||
case t.KeyIterate:
|
||||
p.src = p.src[1:]
|
||||
if x := p.peek1().Key(); x != t.KeyDot {
|
||||
@@ -608,30 +612,6 @@ func (p *parser) parseStatement1() (*a.Node, error) {
|
||||
}
|
||||
return a.NewIterate(label, unroll, vars, asserts, body).Node(), nil
|
||||
|
||||
case t.KeyWhile:
|
||||
p.src = p.src[1:]
|
||||
label, err := p.parseLabel()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
condition, err := p.parseExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
asserts, err := p.parseAsserts()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
body, err := p.parseBlock()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return a.NewWhile(label, condition, asserts, body).Node(), nil
|
||||
|
||||
case t.KeyIf:
|
||||
o, err := p.parseIf()
|
||||
return o.Node(), err
|
||||
|
||||
case t.KeyMark:
|
||||
p.src = p.src[1:]
|
||||
value, err := p.parseExpr()
|
||||
@@ -666,6 +646,26 @@ func (p *parser) parseStatement1() (*a.Node, error) {
|
||||
case t.KeyVar:
|
||||
p.src = p.src[1:]
|
||||
return p.parseVar(false)
|
||||
|
||||
case t.KeyWhile:
|
||||
p.src = p.src[1:]
|
||||
label, err := p.parseLabel()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
condition, err := p.parseExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
asserts, err := p.parseAsserts()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
body, err := p.parseBlock()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return a.NewWhile(label, condition, asserts, body).Node(), nil
|
||||
}
|
||||
|
||||
lhs, err := p.parseExpr()
|
||||
|
||||
Reference in new issue
Block a user