diff --git a/internal/cgen/statement.go b/internal/cgen/statement.go index 053361f7..a90ffe77 100644 --- a/internal/cgen/statement.go +++ b/internal/cgen/statement.go @@ -313,106 +313,105 @@ func (g *gen) writeStatementIOManip(b *buffer, n *a.IOManip, depth uint32) error // instead of block-scoped (smaller scope) if the coro_susp_point // switch can jump past this initialization?? b.writes("{\n") - { - if keyword := n.Keyword(); keyword == t.IDIOBind { - b.printf("wuffs_base__io_buffer* %s%d_%s%s = %s%s;\n", - oPrefix, ioBindNum, prefix, name, - prefix, name) - b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", - qualifier, oPrefix, ioBindNum, iopPrefix, prefix, name, - iopPrefix, prefix, name) - b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", - qualifier, oPrefix, ioBindNum, io0Prefix, prefix, name, - io0Prefix, prefix, name) - b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", - qualifier, oPrefix, ioBindNum, io1Prefix, prefix, name, - io1Prefix, prefix, name) - b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", - qualifier, oPrefix, ioBindNum, io2Prefix, prefix, name, - io2Prefix, prefix, name) - b.printf("%s%s = wuffs_private_impl__io_%s__set("+ - "\n&%s%s,\n&%s%s%s,\n&%s%s%s,\n&%s%s%s,\n&%s%s%s,\n", - prefix, name, cTyp, - uPrefix, name, - iopPrefix, prefix, name, - io0Prefix, prefix, name, - io1Prefix, prefix, name, - io2Prefix, prefix, name) - if err := g.writeExpr(b, n.Arg1(), false, 0); err != nil { - return err - } - b.writes(",\n") - if err := g.writeExpr(b, n.HistoryPosition(), false, 0); err != nil { - return err - } - b.writes(");\n") - - } else if keyword == t.IDIOForgetHistory { - if !isWriter { - return fmt.Errorf("unsupported io_forget_history for an io_reader") - } - b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", - qualifier, oPrefix, ioBindNum, io0Prefix, prefix, name, - io0Prefix, prefix, name) - b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", - qualifier, oPrefix, ioBindNum, io1Prefix, prefix, name, - io1Prefix, prefix, name) - b.printf("%s%s%s = %s%s%s;\n", - io0Prefix, prefix, name, iopPrefix, prefix, name) - b.printf("%s%s%s = %s%s%s;\n", - io1Prefix, prefix, name, iopPrefix, prefix, name) - b.printf("wuffs_base__io_buffer %s%d_%s%s;\n", - oPrefix, ioBindNum, prefix, name) - b.printf("if (%s%s) {\n", - prefix, name) - if isWriter { - b.printf("memcpy(&%s%d_%s%s, %s%s, sizeof(*%s%s));\n", - oPrefix, ioBindNum, prefix, name, - prefix, name, - prefix, name) - b.printf("size_t wi%d = %s%s->meta.wi;\n", - ioBindNum, prefix, name) - b.printf("%s%s->data.ptr += wi%d;\n", - prefix, name, ioBindNum) - b.printf("%s%s->data.len -= wi%d;\n", - prefix, name, ioBindNum) - b.printf("%s%s->meta.ri = 0;\n", - prefix, name) - b.printf("%s%s->meta.wi = 0;\n", - prefix, name) - b.printf("%s%s->meta.pos = wuffs_base__u64__sat_add(%s%s->meta.pos, wi%d);\n", - prefix, name, prefix, name, ioBindNum) - } else { - // TODO. - } - b.printf("}\n") - - } else { - if !isWriter { - b.printf("const bool %s%d_closed_%s%s = %s%s->meta.closed;\n", - oPrefix, ioBindNum, prefix, name, prefix, name) - } - b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", - qualifier, oPrefix, ioBindNum, io2Prefix, prefix, name, io2Prefix, prefix, name) - b.printf("wuffs_private_impl__io_%s__limit(&%s%s%s, %s%s%s,\n", - cTyp, - io2Prefix, prefix, name, - iopPrefix, prefix, name) - if err := g.writeExpr(b, n.Arg1(), false, 0); err != nil { - return err - } - b.writes(");\n") - b.printf("if (%s%s) {\n", prefix, name) - b.printf("size_t n = ((size_t)(%s%s%s - %s%s->data.ptr));\n", - io2Prefix, prefix, name, prefix, name) - if !isWriter { - b.printf("%s%s->meta.closed = %s%s->meta.closed && (%s%s->%s <= n);\n", - prefix, name, prefix, name, prefix, name, end) - } - b.printf("%s%s->%s = n;\n", - prefix, name, end) - b.printf("}\n") + switch n.Keyword() { + case t.IDIOBind: + b.printf("wuffs_base__io_buffer* %s%d_%s%s = %s%s;\n", + oPrefix, ioBindNum, prefix, name, + prefix, name) + b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", + qualifier, oPrefix, ioBindNum, iopPrefix, prefix, name, + iopPrefix, prefix, name) + b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", + qualifier, oPrefix, ioBindNum, io0Prefix, prefix, name, + io0Prefix, prefix, name) + b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", + qualifier, oPrefix, ioBindNum, io1Prefix, prefix, name, + io1Prefix, prefix, name) + b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", + qualifier, oPrefix, ioBindNum, io2Prefix, prefix, name, + io2Prefix, prefix, name) + b.printf("%s%s = wuffs_private_impl__io_%s__set("+ + "\n&%s%s,\n&%s%s%s,\n&%s%s%s,\n&%s%s%s,\n&%s%s%s,\n", + prefix, name, cTyp, + uPrefix, name, + iopPrefix, prefix, name, + io0Prefix, prefix, name, + io1Prefix, prefix, name, + io2Prefix, prefix, name) + if err := g.writeExpr(b, n.Arg1(), false, 0); err != nil { + return err } + b.writes(",\n") + if err := g.writeExpr(b, n.HistoryPosition(), false, 0); err != nil { + return err + } + b.writes(");\n") + + case t.IDIOForgetHistory: + if !isWriter { + return fmt.Errorf("unsupported io_forget_history for an io_reader") + } + b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", + qualifier, oPrefix, ioBindNum, io0Prefix, prefix, name, + io0Prefix, prefix, name) + b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", + qualifier, oPrefix, ioBindNum, io1Prefix, prefix, name, + io1Prefix, prefix, name) + b.printf("%s%s%s = %s%s%s;\n", + io0Prefix, prefix, name, iopPrefix, prefix, name) + b.printf("%s%s%s = %s%s%s;\n", + io1Prefix, prefix, name, iopPrefix, prefix, name) + b.printf("wuffs_base__io_buffer %s%d_%s%s;\n", + oPrefix, ioBindNum, prefix, name) + b.printf("if (%s%s) {\n", + prefix, name) + if isWriter { + b.printf("memcpy(&%s%d_%s%s, %s%s, sizeof(*%s%s));\n", + oPrefix, ioBindNum, prefix, name, + prefix, name, + prefix, name) + b.printf("size_t wi%d = %s%s->meta.wi;\n", + ioBindNum, prefix, name) + b.printf("%s%s->data.ptr += wi%d;\n", + prefix, name, ioBindNum) + b.printf("%s%s->data.len -= wi%d;\n", + prefix, name, ioBindNum) + b.printf("%s%s->meta.ri = 0;\n", + prefix, name) + b.printf("%s%s->meta.wi = 0;\n", + prefix, name) + b.printf("%s%s->meta.pos = wuffs_base__u64__sat_add(%s%s->meta.pos, wi%d);\n", + prefix, name, prefix, name, ioBindNum) + } else { + // TODO. + } + b.printf("}\n") + + case t.IDIOLimit: + if !isWriter { + b.printf("const bool %s%d_closed_%s%s = %s%s->meta.closed;\n", + oPrefix, ioBindNum, prefix, name, prefix, name) + } + b.printf("%suint8_t* %s%d_%s%s%s = %s%s%s;\n", + qualifier, oPrefix, ioBindNum, io2Prefix, prefix, name, io2Prefix, prefix, name) + b.printf("wuffs_private_impl__io_%s__limit(&%s%s%s, %s%s%s,\n", + cTyp, + io2Prefix, prefix, name, + iopPrefix, prefix, name) + if err := g.writeExpr(b, n.Arg1(), false, 0); err != nil { + return err + } + b.writes(");\n") + b.printf("if (%s%s) {\n", prefix, name) + b.printf("size_t n = ((size_t)(%s%s%s - %s%s->data.ptr));\n", + io2Prefix, prefix, name, prefix, name) + if !isWriter { + b.printf("%s%s->meta.closed = %s%s->meta.closed && (%s%s->%s <= n);\n", + prefix, name, prefix, name, prefix, name, end) + } + b.printf("%s%s->%s = n;\n", + prefix, name, end) + b.printf("}\n") } for _, o := range n.Body() { @@ -421,60 +420,59 @@ func (g *gen) writeStatementIOManip(b *buffer, n *a.IOManip, depth uint32) error } } - { - if keyword := n.Keyword(); keyword == t.IDIOBind { - b.printf("%s%s = %s%d_%s%s;\n", + switch n.Keyword() { + case t.IDIOBind: + b.printf("%s%s = %s%d_%s%s;\n", + prefix, name, + oPrefix, ioBindNum, prefix, name) + b.printf("%s%s%s = %s%d_%s%s%s;\n", + iopPrefix, prefix, name, + oPrefix, ioBindNum, iopPrefix, prefix, name) + b.printf("%s%s%s = %s%d_%s%s%s;\n", + io0Prefix, prefix, name, + oPrefix, ioBindNum, io0Prefix, prefix, name) + b.printf("%s%s%s = %s%d_%s%s%s;\n", + io1Prefix, prefix, name, + oPrefix, ioBindNum, io1Prefix, prefix, name) + b.printf("%s%s%s = %s%d_%s%s%s;\n", + io2Prefix, prefix, name, + oPrefix, ioBindNum, io2Prefix, prefix, name) + + case t.IDIOForgetHistory: + b.printf("if (%s%s) {\n", + prefix, name) + if isWriter { + b.printf("memcpy(%s%s, &%s%d_%s%s, sizeof(*%s%s));\n", prefix, name, - oPrefix, ioBindNum, prefix, name) - b.printf("%s%s%s = %s%d_%s%s%s;\n", - iopPrefix, prefix, name, - oPrefix, ioBindNum, iopPrefix, prefix, name) + oPrefix, ioBindNum, prefix, name, + prefix, name) + b.printf("%s%s->meta.wi = ((size_t)(%s%s%s - %s%s->data.ptr));\n", + prefix, name, iopPrefix, prefix, name, prefix, name) b.printf("%s%s%s = %s%d_%s%s%s;\n", io0Prefix, prefix, name, oPrefix, ioBindNum, io0Prefix, prefix, name) b.printf("%s%s%s = %s%d_%s%s%s;\n", io1Prefix, prefix, name, oPrefix, ioBindNum, io1Prefix, prefix, name) - b.printf("%s%s%s = %s%d_%s%s%s;\n", - io2Prefix, prefix, name, - oPrefix, ioBindNum, io2Prefix, prefix, name) - - } else if keyword == t.IDIOForgetHistory { - b.printf("if (%s%s) {\n", - prefix, name) - if isWriter { - b.printf("memcpy(%s%s, &%s%d_%s%s, sizeof(*%s%s));\n", - prefix, name, - oPrefix, ioBindNum, prefix, name, - prefix, name) - b.printf("%s%s->meta.wi = ((size_t)(%s%s%s - %s%s->data.ptr));\n", - prefix, name, iopPrefix, prefix, name, prefix, name) - b.printf("%s%s%s = %s%d_%s%s%s;\n", - io0Prefix, prefix, name, - oPrefix, ioBindNum, io0Prefix, prefix, name) - b.printf("%s%s%s = %s%d_%s%s%s;\n", - io1Prefix, prefix, name, - oPrefix, ioBindNum, io1Prefix, prefix, name) - } else { - // TODO. - } - b.printf("}\n") - } else { - b.printf("%s%s%s = %s%d_%s%s%s;\n", - io2Prefix, prefix, name, - oPrefix, ioBindNum, io2Prefix, prefix, name) - b.printf("if (%s%s) {\n", prefix, name) - if !isWriter { - b.printf("%s%s->meta.closed = %s%d_closed_%s%s;\n", - prefix, name, oPrefix, ioBindNum, prefix, name) - } - b.printf("%s%s->%s = ((size_t)(%s%s%s - %s%s->data.ptr));\n", - prefix, name, end, - io2Prefix, prefix, name, - prefix, name) - b.printf("}\n") + // TODO. } + b.printf("}\n") + + case t.IDIOLimit: + b.printf("%s%s%s = %s%d_%s%s%s;\n", + io2Prefix, prefix, name, + oPrefix, ioBindNum, io2Prefix, prefix, name) + b.printf("if (%s%s) {\n", prefix, name) + if !isWriter { + b.printf("%s%s->meta.closed = %s%d_closed_%s%s;\n", + prefix, name, oPrefix, ioBindNum, prefix, name) + } + b.printf("%s%s->%s = ((size_t)(%s%s%s - %s%s->data.ptr));\n", + prefix, name, end, + io2Prefix, prefix, name, + prefix, name) + b.printf("}\n") } b.writes("}\n") return nil