From 380fe3d76fff85aede5187f7aa3c01a750967de3 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 16 Jun 2017 17:49:10 +1000 Subject: [PATCH] Generate C code for "var x[N] T". --- cmd/puffs-gen-c/main.go | 20 +++++++++---- gen/c/std/gif.c | 61 +++++++++++----------------------------- std/gif/decode_gif.puffs | 15 +++++----- 3 files changed, 39 insertions(+), 57 deletions(-) diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index e9cde5c2..7d4329d6 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -864,13 +864,23 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error { return err } } - g.printf("%s%s = ", vPrefix, n.Name().String(g.tm)) - if v := n.Value(); v != nil { - if err := g.writeExpr(v, replaceCallSuspendibles, parenthesesMandatory, 0); err != nil { - return err + if n.XType().Decorator().Key() == t.KeyOpenBracket { + if n.Value() != nil { + return fmt.Errorf("TODO: array initializers for non-zero default values") } + // TODO: arrays of arrays. + cv := n.XType().ArrayLength().ConstValue() + // TODO: check that cv is within size_t's range. + g.printf("for (size_t i = 0; i < %d; i++) { %s%s[i] = 0; }\n", cv, vPrefix, n.Name().String(g.tm)) } else { - g.writeb('0') + g.printf("%s%s = ", vPrefix, n.Name().String(g.tm)) + if v := n.Value(); v != nil { + if err := g.writeExpr(v, replaceCallSuspendibles, parenthesesMandatory, 0); err != nil { + return err + } + } else { + g.writeb('0') + } } g.writes(";\n") return nil diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 835e58b6..9ae22c69 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -302,52 +302,25 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, puffs_base_buf1* a_src) { puffs_gif_status status = self->private_impl.status; - uint8_t v_c; + uint8_t v_c[6]; + uint8_t v_i; - if (a_src->ri >= a_src->wi) { - status = a_src->closed ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; + for (size_t i = 0; i < 6; i++) { + v_c[i] = 0; + }; + v_i = 0; + while (v_i < 6) { + if (a_src->ri >= a_src->wi) { + status = a_src->closed ? puffs_gif_error_unexpected_eof + : puffs_gif_status_short_read; + return status; + } + uint8_t t_0 = a_src->ptr[a_src->ri++]; + v_c[v_i] = t_0; + v_i += 1; } - uint8_t t_0 = a_src->ptr[a_src->ri++]; - if (a_src->ri >= a_src->wi) { - status = a_src->closed ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_1 = a_src->ptr[a_src->ri++]; - if (a_src->ri >= a_src->wi) { - status = a_src->closed ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_2 = a_src->ptr[a_src->ri++]; - if (a_src->ri >= a_src->wi) { - status = a_src->closed ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_3 = a_src->ptr[a_src->ri++]; - if ((t_0 != 71) || (t_1 != 73) || (t_2 != 70) || (t_3 != 56)) { - return puffs_gif_error_bad_gif_header; - } - if (a_src->ri >= a_src->wi) { - status = a_src->closed ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_4 = a_src->ptr[a_src->ri++]; - v_c = t_4; - if ((v_c != 55) && (v_c != 57)) { - return puffs_gif_error_bad_gif_header; - } - if (a_src->ri >= a_src->wi) { - status = a_src->closed ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; - return status; - } - uint8_t t_5 = a_src->ptr[a_src->ri++]; - if (t_5 != 97) { + if ((v_c[0] != 71) || (v_c[1] != 73) || (v_c[2] != 70) || (v_c[3] != 56) || + ((v_c[4] != 55) && (v_c[4] != 57)) || (v_c[5] != 97)) { return puffs_gif_error_bad_gif_header; } diff --git a/std/gif/decode_gif.puffs b/std/gif/decode_gif.puffs index d10c1383..d0db35a0 100644 --- a/std/gif/decode_gif.puffs +++ b/std/gif/decode_gif.puffs @@ -15,15 +15,14 @@ pub func decoder.decode?(dst ptr buf1, src ptr buf1)() { // decode_header reads either "GIF87a" or "GIF89a". pri func decoder.decode_header?(src ptr buf1)() { - if (in.src.read_u8?() != 0x47) or (in.src.read_u8?() != 0x49) or - (in.src.read_u8?() != 0x46) or (in.src.read_u8?() != 0x38) { - return error "bad GIF header" + var c[6] u8 + var i u8 + while i < 6 { + c[i] = in.src.read_u8?() + i += 1 } - var c u8 = in.src.read_u8?() - if (c != 0x37) and (c != 0x39) { - return error "bad GIF header" - } - if in.src.read_u8?() != 0x61 { + if (c[0] != 0x47) or (c[1] != 0x49) or (c[2] != 0x46) or (c[3] != 0x38) or + ((c[4] != 0x37) and (c[4] != 0x39)) or (c[5] != 0x61) { return error "bad GIF header" } }