From 31cdcd70484262bc7a372d3557ad6255f10d2847 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 13 May 2018 11:12:36 +1000 Subject: [PATCH] Derive a wuffs_base__io_buffer typed local var --- cmd/wuffs-c/internal/cgen/cgen.go | 1 + cmd/wuffs-c/internal/cgen/var.go | 10 ++++++++-- gen/c/std/gif.c | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 4ce36efa..443e1ca4 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -54,6 +54,7 @@ const ( iPrefix = "i_" // Iterate variable. oPrefix = "o_" // Temporary io_bind variable. tPrefix = "t_" // Temporary local variable. + uPrefix = "u_" // Derived from a local variable. vPrefix = "v_" // Local variable. ) diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index f5ee025d..48866d6f 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -375,16 +375,22 @@ func (g *gen) writeResumeSuspend(b *buffer, block []*a.Node, suspend bool, initB func (g *gen) writeVars(b *buffer, block []*a.Node, skipPointerTypes bool, skipIterateVariables bool) error { return g.visitVars(b, block, 0, func(g *gen, b *buffer, n *a.Var) error { - if skipPointerTypes && n.XType().HasPointers() { + typ := n.XType() + if skipPointerTypes && typ.HasPointers() { return nil } if skipIterateVariables && n.IterateVariable() { return nil } - if err := g.writeCTypeName(b, n.XType(), vPrefix, n.Name().Str(g.tm)); err != nil { + name := n.Name().Str(g.tm) + if err := g.writeCTypeName(b, typ, vPrefix, name); err != nil { return err } b.writes(";\n") + if typ.IsIOType() { + b.printf("wuffs_base__io_buffer %s%s;\n", uPrefix, name) + b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%s%s);\n", uPrefix, name) + } return nil }) } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index bc58a3d6..b9426154 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -2660,6 +2660,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( uint8_t v_lw; uint64_t v_block_size; wuffs_base__io_writer v_w; + wuffs_base__io_buffer u_w; + WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(u_w); wuffs_gif__status v_z; uint8_t* b_rptr_src = NULL;