From 92720594acf03ab801ff6d58f9cabe793b513623 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 13 May 2018 10:45:07 +1000 Subject: [PATCH] Distinguish io_bind(in.foo) versus io_bind(foo) --- cmd/wuffs-c/internal/cgen/statement.go | 9 ++++----- gen/c/std/gif.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 4aebc0ef..95d4094c 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -172,9 +172,8 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { name := e.Ident().Str(g.tm) // TODO: stash the whole io_reader, not just its bounds. for j := 0; j < 2; j++ { - // TODO: insert the prefix in %d_%s. - b.printf("uint8_t* %s%d_bounds%d_%s = %s%s.private_impl.bounds[%d];\n", - oPrefix, ioBindNum, j, name, prefix, name, j) + b.printf("uint8_t* %s%d_bounds%d_%s%s = %s%s.private_impl.bounds[%d];\n", + oPrefix, ioBindNum, j, prefix, name, prefix, name, j) } } @@ -192,8 +191,8 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { } name := e.Ident().Str(g.tm) for j := 1; j >= 0; j-- { - b.printf("%s%s.private_impl.bounds[%d] = %s%d_bounds%d_%s;\n", - prefix, name, j, oPrefix, ioBindNum, j, name) + b.printf("%s%s.private_impl.bounds[%d] = %s%d_bounds%d_%s%s;\n", + prefix, name, j, oPrefix, ioBindNum, j, prefix, name) } } b.writes("}\n") diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 77fa097d..8f206b47 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -2878,10 +2878,10 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( while (true) { v_w = ((wuffs_base__io_writer){}); { - uint8_t* o_0_bounds0_src = a_src.private_impl.bounds[0]; - uint8_t* o_0_bounds1_src = a_src.private_impl.bounds[1]; - uint8_t* o_0_bounds0_w = v_w.private_impl.bounds[0]; - uint8_t* o_0_bounds1_w = v_w.private_impl.bounds[1]; + uint8_t* o_0_bounds0_a_src = a_src.private_impl.bounds[0]; + uint8_t* o_0_bounds1_a_src = a_src.private_impl.bounds[1]; + uint8_t* o_0_bounds0_v_w = v_w.private_impl.bounds[0]; + uint8_t* o_0_bounds1_v_w = v_w.private_impl.bounds[1]; wuffs_base__io_reader__set_limit(&a_src, b_rptr_src, v_block_size); wuffs_base__io_reader__set_mark(&a_src, b_rptr_src); { @@ -2905,10 +2905,10 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( a_src.private_impl.bounds[0]), }) .len))); - v_w.private_impl.bounds[1] = o_0_bounds1_w; - v_w.private_impl.bounds[0] = o_0_bounds0_w; - a_src.private_impl.bounds[1] = o_0_bounds1_src; - a_src.private_impl.bounds[0] = o_0_bounds0_src; + v_w.private_impl.bounds[1] = o_0_bounds1_v_w; + v_w.private_impl.bounds[0] = o_0_bounds0_v_w; + a_src.private_impl.bounds[1] = o_0_bounds1_a_src; + a_src.private_impl.bounds[0] = o_0_bounds0_a_src; } if (v_z == 0) { self->private_impl.f_previous_lzw_decode_ended_abruptly = false;