From 156cea5a7098a910af91eefe9fb56eec1f885873 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 11 Jun 2018 08:52:53 +1000 Subject: [PATCH] Add a std/gif work_buffer_size method --- cmd/wuffs-c/internal/cgen/func.go | 50 ++++++++++++++++++------------- gen/c/std/gif.c | 22 ++++++++++++++ gen/h/std/gif.h | 3 ++ std/gif/decode_gif.wuffs | 4 +++ 4 files changed, 59 insertions(+), 20 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index 5d618135..5d23470c 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -173,39 +173,49 @@ func (g *gen) gatherFuncImpl(_ *buffer, n *a.Func) error { return nil } +func (g *gen) writeOutFieldsZeroValue(b *buffer, outFields []*a.Node) error { + switch len(outFields) { + case 0: + // No-op. + case 1: + if typ := outFields[0].Field().XType(); typ.IsNumType() { + b.writes("0") + } else { + b.writes("((") + if err := g.writeCTypeName(b, typ, "", ""); err != nil { + return err + } + b.writes("){})") + } + default: + return fmt.Errorf("TODO: handle structured return types") + } + return nil +} + func (g *gen) writeFuncImplHeader(b *buffer) error { // Check the previous status and the "self" arg. if g.currFunk.public && !g.currFunk.astFunc.Receiver().IsZero() { outFields := g.currFunk.astFunc.Out().Fields() - b.writes("if (!self) {") + b.writes("if (!self) { return ") if g.currFunk.suspendible { - b.writes("return WUFFS_BASE__ERROR_BAD_RECEIVER;") - } else if len(outFields) == 0 { - b.writes("return;") - } else if len(outFields) == 1 { - // TODO: don't assume that the return type is an integer. - b.writes("return 0;") - } else { - return fmt.Errorf("TODO: handle structured return types") + b.writes("WUFFS_BASE__ERROR_BAD_RECEIVER") + } else if err := g.writeOutFieldsZeroValue(b, outFields); err != nil { + return err } - b.writes("}") + b.writes(";}") b.writes("if (self->private_impl.magic != WUFFS_BASE__MAGIC) {" + "self->private_impl.status = WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; }") - b.writes("if (self->private_impl.status < 0) {") + b.writes("if (self->private_impl.status < 0) { return ") if g.currFunk.suspendible { - b.writes("return self->private_impl.status;") - } else if len(outFields) == 0 { - b.writes("return;") - } else if len(outFields) == 1 { - // TODO: don't assume that the return type is an integer. - b.writes("return 0;") - } else { - return fmt.Errorf("TODO: handle structured return types") + b.writes("self->private_impl.status") + } else if err := g.writeOutFieldsZeroValue(b, outFields); err != nil { + return err } - b.writes("}\n") + b.writes(";}\n") } // For public functions, check (at runtime) the other args for bounds and diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 14aee5c1..44e3cf5e 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1505,6 +1505,9 @@ wuffs_base__status wuffs_gif__decoder__decode_config( wuffs_base__image_config* a_dst, wuffs_base__io_reader a_src); +wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size( + wuffs_gif__decoder* self); + wuffs_base__status wuffs_gif__decoder__decode_frame( wuffs_gif__decoder* self, wuffs_base__image_buffer* a_dst, @@ -2320,6 +2323,25 @@ exit: return status; } +// -------- func decoder.work_buffer_size + +wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size( + wuffs_gif__decoder* self) { + if (!self) { + return ((wuffs_base__range_ii_u64){}); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + self->private_impl.status = + WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; + } + if (self->private_impl.status < 0) { + return ((wuffs_base__range_ii_u64){}); + } + + return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util, 0, + 0); +} + // -------- func decoder.decode_frame wuffs_base__status wuffs_gif__decoder__decode_frame( diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index f2aa79a2..c381d816 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1505,6 +1505,9 @@ wuffs_base__status wuffs_gif__decoder__decode_config( wuffs_base__image_config* a_dst, wuffs_base__io_reader a_src); +wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size( + wuffs_gif__decoder* self); + wuffs_base__status wuffs_gif__decoder__decode_frame( wuffs_gif__decoder* self, wuffs_base__image_buffer* a_dst, diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 725ff0a0..baf21aa8 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -125,6 +125,10 @@ pub func decoder.decode_config?(dst ptr base.image_config, src base.io_reader)() this.call_sequence = 1 } +pub func decoder.work_buffer_size()(ret base.range_ii_u64) { + return this.util.make_range_ii_u64(min_inclusive:0, max_inclusive:0) +} + pub func decoder.decode_frame?(dst ptr base.image_buffer, src base.io_reader)() { if this.call_sequence == 0 { return error "invalid call sequence"