From 88236105c96f2c767a071f9532877241f9c6915e Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 24 Nov 2018 16:00:46 +1100 Subject: [PATCH] Have cgen functions return empty_struct, not void --- cmd/wuffs-c/internal/cgen/func.go | 25 +++++++--------- release/c/wuffs-unsupported-snapshot.h | 40 ++++++++++++++------------ 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index 77877862..c2d5305f 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -88,8 +88,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error { if n.Effect().Optional() { b.writes("wuffs_base__status ") } else if out := n.Out(); out == nil { - // TODO: wuffs_base__empty_struct. - b.writes("void ") + b.writes("wuffs_base__empty_struct ") // TODO: does writeCTypeName generate the right C if out is an array? } else if err := g.writeCTypeName(b, out, "", ""); err != nil { return err @@ -207,9 +206,7 @@ func (g *gen) gatherFuncImpl(_ *buffer, n *a.Func) error { func (g *gen) writeOutParamZeroValue(b *buffer, typ *a.TypeExpr) error { if typ == nil { - // No-op. It's "return;" and not "return foo;". - // - // TODO: "return ((wuffs_base__empty_struct){})". + b.writes("((wuffs_base__empty_struct){})") } else if typ.IsNumType() { b.writes("0") } else { @@ -334,7 +331,7 @@ func (g *gen) writeFuncImplBodySuspend(b *buffer) error { } func (g *gen) writeFuncImplEpilogue(b *buffer) error { - if g.currFunk.astFunc.Effect().Coroutine() { + if effect := g.currFunk.astFunc.Effect(); effect.Coroutine() { b.writes("goto exit;exit:") // The goto avoids the "unused label" warning. for _, o := range g.currFunk.astFunc.In().Fields() { @@ -350,6 +347,10 @@ func (g *gen) writeFuncImplEpilogue(b *buffer) error { "self->private_impl.magic = WUFFS_BASE__DISABLED; }\n") } b.writes("return status;\n\n") + } else if effect.Optional() { + // TODO. + } else if g.currFunk.astFunc.Out() == nil { + b.writes("return ((wuffs_base__empty_struct){});\n") } return nil } @@ -413,16 +414,12 @@ func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error { b.writes(c) } b.writes(") {") - if g.currFunk.astFunc.Effect().Coroutine() { - if g.currFunk.astFunc.Public() { - b.writes("self->private_impl.magic = WUFFS_BASE__DISABLED;\n") - } + b.writes("self->private_impl.magic = WUFFS_BASE__DISABLED;\n") + if g.currFunk.astFunc.Effect().Optional() { b.writes("return wuffs_base__error__bad_argument;\n\n") - } else if !n.Receiver().IsZero() { - // TODO: unused code path?? - b.writes("self->private_impl.magic = WUFFS_BASE__DISABLED; return;") } else { - b.printf("return;") + // TODO: don't assume that the return type is empty. + b.printf("return ((wuffs_base__empty_struct){});\n") } b.writes("}\n") return nil diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index e0d0b6e6..cab9f6cc 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -2462,7 +2462,7 @@ sizeof__wuffs_lzw__decoder(); // ---------------- Public Function Prototypes -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -2524,7 +2524,7 @@ struct wuffs_lzw__decoder__struct { wuffs_version); } - inline void // + inline wuffs_base__empty_struct // set_literal_width(uint32_t a_lw) { return wuffs_lzw__decoder__set_literal_width(this, a_lw); } @@ -2833,7 +2833,7 @@ sizeof__wuffs_gzip__decoder(); // ---------------- Public Function Prototypes -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -2883,7 +2883,7 @@ struct wuffs_gzip__decoder__struct { wuffs_version); } - inline void // + inline wuffs_base__empty_struct // set_ignore_checksum(bool a_ic) { return wuffs_gzip__decoder__set_ignore_checksum(this, a_ic); } @@ -2937,7 +2937,7 @@ sizeof__wuffs_zlib__decoder(); // ---------------- Public Function Prototypes -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -2984,7 +2984,7 @@ struct wuffs_zlib__decoder__struct { wuffs_version); } - inline void // + inline wuffs_base__empty_struct // set_ignore_checksum(bool a_ic) { return wuffs_zlib__decoder__set_ignore_checksum(this, a_ic); } @@ -6841,20 +6841,21 @@ sizeof__wuffs_lzw__decoder() { // -------- func lzw.decoder.set_literal_width -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw) { if (!self) { - return; + return ((wuffs_base__empty_struct){}); } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - return; + return ((wuffs_base__empty_struct){}); } if (a_lw < 2 || a_lw > 8) { self->private_impl.magic = WUFFS_BASE__DISABLED; - return; + return ((wuffs_base__empty_struct){}); } self->private_impl.f_literal_width = a_lw; + return ((wuffs_base__empty_struct){}); } // -------- func lzw.decoder.decode @@ -7272,7 +7273,7 @@ static wuffs_base__status // wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, wuffs_base__io_reader a_src); -static void // +static wuffs_base__empty_struct // wuffs_gif__decoder__reset_gc(wuffs_gif__decoder* self); static wuffs_base__status // @@ -7818,7 +7819,7 @@ exit: // -------- func gif.decoder.reset_gc -static void // +static wuffs_base__empty_struct // wuffs_gif__decoder__reset_gc(wuffs_gif__decoder* self) { self->private_impl.f_call_sequence = 3; self->private_impl.f_seen_graphic_control = false; @@ -7826,6 +7827,7 @@ wuffs_gif__decoder__reset_gc(wuffs_gif__decoder* self) { self->private_impl.f_gc_transparent_index = 0; self->private_impl.f_gc_disposal = 0; self->private_impl.f_gc_duration = 0; + return ((wuffs_base__empty_struct){}); } // -------- func gif.decoder.decode_up_to_id_part1 @@ -9454,16 +9456,17 @@ sizeof__wuffs_gzip__decoder() { // -------- func gzip.decoder.set_ignore_checksum -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic) { if (!self) { - return; + return ((wuffs_base__empty_struct){}); } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - return; + return ((wuffs_base__empty_struct){}); } self->private_impl.f_ignore_checksum = a_ic; + return ((wuffs_base__empty_struct){}); } // -------- func gzip.decoder.decode @@ -9908,16 +9911,17 @@ sizeof__wuffs_zlib__decoder() { // -------- func zlib.decoder.set_ignore_checksum -WUFFS_BASE__MAYBE_STATIC void // +WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic) { if (!self) { - return; + return ((wuffs_base__empty_struct){}); } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - return; + return ((wuffs_base__empty_struct){}); } self->private_impl.f_ignore_checksum = a_ic; + return ((wuffs_base__empty_struct){}); } // -------- func zlib.decoder.decode