diff --git a/cmd/puffs-gen-c/func.go b/cmd/puffs-gen-c/func.go index f2ea55de..d23995d5 100644 --- a/cmd/puffs-gen-c/func.go +++ b/cmd/puffs-gen-c/func.go @@ -79,7 +79,7 @@ func (g *gen) writeFuncImpl(n *a.Func) error { if n.Receiver() != 0 { g.writes("if (!self) {\n") if n.Suspendible() { - g.printf("return puffs_%s_error_bad_receiver;", g.pkgName) + g.printf("return PUFFS_%s_ERROR_BAD_RECEIVER;", g.PKGNAME) } else { g.printf("return;") } @@ -96,16 +96,16 @@ func (g *gen) writeFuncImpl(n *a.Func) error { g.writes("if (status < 0) { return status; }") } } else { - g.printf("puffs_%s_status_ok;\n", g.pkgName) + g.printf("PUFFS_%s_STATUS_OK;\n", g.PKGNAME) } if n.Public() { g.printf("if (self->private_impl.magic != PUFFS_MAGIC) {"+ - "status = puffs_%s_error_constructor_not_called; goto exit; }\n", g.pkgName) + "status = PUFFS_%s_ERROR_CONSTRUCTOR_NOT_CALLED; goto exit; }\n", g.PKGNAME) } } else if n.Receiver() != 0 && n.Public() { g.writes("if (self->private_impl.status < 0) { return; }") g.printf("if (self->private_impl.magic != PUFFS_MAGIC) {"+ - "self->private_impl.status = puffs_%s_error_constructor_not_called; return; }\n", g.pkgName) + "self->private_impl.status = PUFFS_%s_ERROR_CONSTRUCTOR_NOT_CALLED; return; }\n", g.PKGNAME) } // For public functions, check (at runtime) the other args for bounds and @@ -260,9 +260,9 @@ func (g *gen) writeFuncImplArgChecks(n *a.Func) error { } g.writes(") {") if n.Suspendible() { - g.printf("status = puffs_%s_error_bad_argument; goto exit;", g.pkgName) + g.printf("status = PUFFS_%s_ERROR_BAD_ARGUMENT; goto exit;", g.PKGNAME) } else if n.Receiver() != 0 { - g.printf("self->private_impl.status = puffs_%s_error_bad_argument; return;", g.pkgName) + g.printf("self->private_impl.status = PUFFS_%s_ERROR_BAD_ARGUMENT; return;", g.PKGNAME) } else { g.printf("return;") } @@ -643,7 +643,7 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error { n := n.Return() ret := "" if n.Keyword() == 0 { - ret = fmt.Sprintf("puffs_%s_status_ok", g.pkgName) + ret = fmt.Sprintf("PUFFS_%s_STATUS_OK", g.PKGNAME) } else { ret = g.statusMap[n.Message()].name } @@ -822,8 +822,8 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { g.printf("%s%d -= %srend_src - %srptr_src;\n", tPrefix, temp, bPrefix, bPrefix) g.printf("%ssrc.buf->ri = %ssrc.buf->wi;\n", aPrefix, aPrefix) - g.printf("status = %ssrc.buf->closed ? puffs_%s_error_unexpected_eof : puffs_%s_status_short_read;", - aPrefix, g.pkgName, g.pkgName) + g.printf("status = %ssrc.buf->closed ? PUFFS_%s_ERROR_UNEXPECTED_EOF : PUFFS_%s_STATUS_SHORT_READ;", + aPrefix, g.PKGNAME, g.PKGNAME) if g.perFunc.public && g.perFunc.suspendible { // TODO: drop the g.perFunc.public? g.writes("goto suspend;") } else { @@ -835,7 +835,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { } else if isInDst(g.tm, n, t.KeyWrite, 1) { // TODO: don't assume that the argument is "this.stack[s:]". - g.printf("if (%sdst.buf->closed) { status = puffs_%s_error_closed_for_writes;", aPrefix, g.pkgName) + g.printf("if (%sdst.buf->closed) { status = PUFFS_%s_ERROR_CLOSED_FOR_WRITES;", aPrefix, g.PKGNAME) if g.perFunc.public && g.perFunc.suspendible { g.writes("goto suspend;") } else { @@ -844,7 +844,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { g.writes("}\n") g.printf("if ((%swend_dst - %swptr_dst) < (sizeof(self->private_impl.f_stack) - v_s)) {", bPrefix, bPrefix) - g.printf("status = puffs_%s_status_short_write;", g.pkgName) + g.printf("status = PUFFS_%s_STATUS_SHORT_WRITE;", g.PKGNAME) if g.perFunc.public && g.perFunc.suspendible { g.writes("goto suspend;") } else { @@ -857,8 +857,8 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { g.printf("b_wptr_dst += sizeof(self->private_impl.f_stack) - v_s;\n") } else if isInDst(g.tm, n, t.KeyWriteU8, 1) { - g.printf("if (%swptr_dst == %swend_dst) { status = puffs_%s_status_short_write;", - bPrefix, bPrefix, g.pkgName) + g.printf("if (%swptr_dst == %swend_dst) { status = PUFFS_%s_STATUS_SHORT_WRITE;", + bPrefix, bPrefix, g.PKGNAME) if g.perFunc.public && g.perFunc.suspendible { g.writes("goto suspend;") } else { @@ -926,8 +926,8 @@ func (g *gen) writeShortRead(name string) error { g.printf("\nshort_read_%s:\n", name) // TODO: ri == wi isn't the right condition. g.printf("status = ((%s%s.buf->closed) && (%s%s.buf->ri == %s%s.buf->wi)) ?"+ - "puffs_%s_error_unexpected_eof : puffs_%s_status_short_read;", - aPrefix, name, aPrefix, name, aPrefix, name, g.pkgName, g.pkgName) + "PUFFS_%s_ERROR_UNEXPECTED_EOF : PUFFS_%s_STATUS_SHORT_READ;", + aPrefix, name, aPrefix, name, aPrefix, name, g.PKGNAME, g.PKGNAME) if g.perFunc.public && g.perFunc.suspendible { // TODO: drop the g.perFunc.public? g.writes("goto suspend;") } else { diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index 6b137f63..b002ffe3 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -48,6 +48,7 @@ func main() { generate.Main(func(pkgName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error) { g := &gen{ pkgName: pkgName, + PKGNAME: strings.ToUpper(pkgName), tm: tm, checker: c, files: files, @@ -140,6 +141,7 @@ type status struct { type gen struct { buffer bytes.Buffer pkgName string + PKGNAME string tm *t.Map checker *check.Checker files []*a.File @@ -223,7 +225,7 @@ func (g *gen) genHeader() error { code |= 1 << 31 } code |= uint32(i) - g.printf("#define %s %d // %#08x\n", g.cName(s), int32(code), code) + g.printf("#define %s %d // %#08x\n", strings.ToUpper(g.cName(s)), int32(code), code) } g.writes("\n") @@ -410,7 +412,7 @@ func (g *gen) gatherStatuses(n *a.Status) error { prefix = "error " } s := status{ - name: g.cName(prefix + msg), + name: strings.ToUpper(g.cName(prefix + msg)), msg: msg, isError: isError, } @@ -523,7 +525,7 @@ func (g *gen) writeCtorImpl(n *a.Struct) error { if ctor { g.printf("if (puffs_version != PUFFS_VERSION) {\n") - g.printf("self->private_impl.status = puffs_%s_error_bad_version;\n", g.pkgName) + g.printf("self->private_impl.status = PUFFS_%s_ERROR_BAD_VERSION;\n", g.PKGNAME) g.printf("return;\n") g.printf("}\n") diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index fb99ce53..ffcedc5d 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -90,24 +90,24 @@ typedef int32_t puffs_gif_status; #define puffs_gif_packageid 1017222 // 0x000f8586 -#define puffs_gif_status_ok 0 // 0x00000000 -#define puffs_gif_error_bad_version -2147483647 // 0x80000001 -#define puffs_gif_error_bad_receiver -2147483646 // 0x80000002 -#define puffs_gif_error_bad_argument -2147483645 // 0x80000003 -#define puffs_gif_error_constructor_not_called -2147483644 // 0x80000004 -#define puffs_gif_error_unexpected_eof -2147483643 // 0x80000005 -#define puffs_gif_status_short_read 6 // 0x00000006 -#define puffs_gif_status_short_write 7 // 0x00000007 -#define puffs_gif_error_closed_for_writes -2147483640 // 0x80000008 +#define PUFFS_GIF_STATUS_OK 0 // 0x00000000 +#define PUFFS_GIF_ERROR_BAD_VERSION -2147483647 // 0x80000001 +#define PUFFS_GIF_ERROR_BAD_RECEIVER -2147483646 // 0x80000002 +#define PUFFS_GIF_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 +#define PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004 +#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005 +#define PUFFS_GIF_STATUS_SHORT_READ 6 // 0x00000006 +#define PUFFS_GIF_STATUS_SHORT_WRITE 7 // 0x00000007 +#define PUFFS_GIF_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 -#define puffs_gif_error_bad_gif_block -1105848320 // 0xbe161800 -#define puffs_gif_error_bad_gif_extension_label -1105848319 // 0xbe161801 -#define puffs_gif_error_bad_gif_header -1105848318 // 0xbe161802 -#define puffs_gif_error_bad_lzw_literal_width -1105848317 // 0xbe161803 -#define puffs_gif_error_todo_unsupported_local_color_table \ +#define PUFFS_GIF_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800 +#define PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801 +#define PUFFS_GIF_ERROR_BAD_GIF_HEADER -1105848318 // 0xbe161802 +#define PUFFS_GIF_ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xbe161803 +#define PUFFS_GIF_ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE \ -1105848316 // 0xbe161804 -#define puffs_gif_error_lzw_code_is_out_of_range -1105848315 // 0xbe161805 -#define puffs_gif_error_lzw_prefix_chain_is_cyclical -1105848314 // 0xbe161806 +#define PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848315 // 0xbe161805 +#define PUFFS_GIF_ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848314 // 0xbe161806 bool puffs_gif_status_is_error(puffs_gif_status s); @@ -355,7 +355,7 @@ void puffs_gif_lzw_decoder_constructor(puffs_gif_lzw_decoder* self, return; } if (puffs_version != PUFFS_VERSION) { - self->private_impl.status = puffs_gif_error_bad_version; + self->private_impl.status = PUFFS_GIF_ERROR_BAD_VERSION; return; } if (for_internal_use_only != PUFFS_ALREADY_ZEROED) { @@ -378,7 +378,7 @@ void puffs_gif_decoder_constructor(puffs_gif_decoder* self, return; } if (puffs_version != PUFFS_VERSION) { - self->private_impl.status = puffs_gif_error_bad_version; + self->private_impl.status = PUFFS_GIF_ERROR_BAD_VERSION; return; } if (for_internal_use_only != PUFFS_ALREADY_ZEROED) { @@ -402,14 +402,14 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self, puffs_base_writer1 a_dst, puffs_base_reader1 a_src) { if (!self) { - return puffs_gif_error_bad_receiver; + return PUFFS_GIF_ERROR_BAD_RECEIVER; } puffs_gif_status status = self->private_impl.status; if (status < 0) { return status; } if (self->private_impl.magic != PUFFS_MAGIC) { - status = puffs_gif_error_constructor_not_called; + status = PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED; goto exit; } @@ -550,10 +550,10 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self, goto suspend; } } else if (v_c == 59) { - status = puffs_gif_status_ok; + status = PUFFS_GIF_STATUS_OK; goto suspend; } else { - status = puffs_gif_error_bad_gif_block; + status = PUFFS_GIF_ERROR_BAD_GIF_BLOCK; goto suspend; } } @@ -583,8 +583,8 @@ exit: short_read_src: status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; + ? PUFFS_GIF_ERROR_UNEXPECTED_EOF + : PUFFS_GIF_STATUS_SHORT_READ; goto suspend; } @@ -635,7 +635,7 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self, } 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; + return PUFFS_GIF_ERROR_BAD_GIF_HEADER; } coro_state = 0; } @@ -663,8 +663,8 @@ exit: short_read_src: status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; + ? PUFFS_GIF_ERROR_UNEXPECTED_EOF + : PUFFS_GIF_STATUS_SHORT_READ; return status; } @@ -772,8 +772,8 @@ exit: short_read_src: status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; + ? PUFFS_GIF_ERROR_UNEXPECTED_EOF + : PUFFS_GIF_STATUS_SHORT_READ; return status; } @@ -817,7 +817,7 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, } else if (v_label == 254) { } else if (v_label == 255) { } else { - return puffs_gif_error_bad_gif_extension_label; + return PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL; } while (true) { PUFFS_COROUTINE_STATE(2); @@ -834,8 +834,8 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, if (t_2 > b_rend_src - b_rptr_src) { t_2 -= b_rend_src - b_rptr_src; a_src.buf->ri = a_src.buf->wi; - status = a_src.buf->closed ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; + status = a_src.buf->closed ? PUFFS_GIF_ERROR_UNEXPECTED_EOF + : PUFFS_GIF_STATUS_SHORT_READ; return status; } b_rptr_src += t_2; @@ -867,8 +867,8 @@ exit: short_read_src: status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; + ? PUFFS_GIF_ERROR_UNEXPECTED_EOF + : PUFFS_GIF_STATUS_SHORT_READ; return status; } @@ -932,7 +932,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, if (v_interlace) { } if ((v_c[8] & 128) != 0) { - return puffs_gif_error_todo_unsupported_local_color_table; + return PUFFS_GIF_ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE; } PUFFS_COROUTINE_STATE(2); if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) { @@ -941,7 +941,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self, uint8_t t_1 = *b_rptr_src++; v_lw = t_1; if ((v_lw < 2) || (8 < v_lw)) { - return puffs_gif_error_bad_lzw_literal_width; + return PUFFS_GIF_ERROR_BAD_LZW_LITERAL_WIDTH; } puffs_gif_lzw_decoder_set_literal_width(&self->private_impl.f_lzw, ((uint32_t)(v_lw))); @@ -1021,8 +1021,8 @@ exit: short_read_src: status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; + ? PUFFS_GIF_ERROR_UNEXPECTED_EOF + : PUFFS_GIF_STATUS_SHORT_READ; return status; } @@ -1035,11 +1035,11 @@ void puffs_gif_lzw_decoder_set_literal_width(puffs_gif_lzw_decoder* self, return; } if (self->private_impl.magic != PUFFS_MAGIC) { - self->private_impl.status = puffs_gif_error_constructor_not_called; + self->private_impl.status = PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED; return; } if (a_lw < 2 || a_lw > 8) { - self->private_impl.status = puffs_gif_error_bad_argument; + self->private_impl.status = PUFFS_GIF_ERROR_BAD_ARGUMENT; return; } @@ -1050,14 +1050,14 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, puffs_base_writer1 a_dst, puffs_base_reader1 a_src) { if (!self) { - return puffs_gif_error_bad_receiver; + return PUFFS_GIF_ERROR_BAD_RECEIVER; } puffs_gif_status status = self->private_impl.status; if (status < 0) { return status; } if (self->private_impl.magic != PUFFS_MAGIC) { - status = puffs_gif_error_constructor_not_called; + status = PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED; goto exit; } @@ -1139,7 +1139,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, if (v_code < v_clear_code) { PUFFS_COROUTINE_STATE(2); if (b_wptr_dst == b_wend_dst) { - status = puffs_gif_status_short_write; + status = PUFFS_GIF_STATUS_SHORT_WRITE; goto suspend; } *b_wptr_dst++ = ((uint8_t)(v_code)); @@ -1154,7 +1154,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, v_width = (self->private_impl.f_literal_width + 1); goto label_0_continue; } else if (v_code == v_end_code) { - status = puffs_gif_status_ok; + status = PUFFS_GIF_STATUS_OK; goto suspend; } else if (v_code <= v_save_code) { v_s = 4095; @@ -1166,7 +1166,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, while (v_c >= v_clear_code) { self->private_impl.f_stack[v_s] = self->private_impl.f_suffixes[v_c]; if (v_s == 0) { - status = puffs_gif_error_lzw_prefix_chain_is_cyclical; + status = PUFFS_GIF_ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL; goto suspend; } v_s -= 1; @@ -1178,12 +1178,12 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, } PUFFS_COROUTINE_STATE(3); if (a_dst.buf->closed) { - status = puffs_gif_error_closed_for_writes; + status = PUFFS_GIF_ERROR_CLOSED_FOR_WRITES; goto suspend; } if ((b_wend_dst - b_wptr_dst) < (sizeof(self->private_impl.f_stack) - v_s)) { - status = puffs_gif_status_short_write; + status = PUFFS_GIF_STATUS_SHORT_WRITE; goto suspend; } memmove(b_wptr_dst, self->private_impl.f_stack + v_s, @@ -1195,7 +1195,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self, ((uint16_t)(v_prev_code)); } } else { - status = puffs_gif_error_lzw_code_is_out_of_range; + status = PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE; goto suspend; } if (v_save_code <= 4095) { @@ -1251,7 +1251,7 @@ exit: short_read_src: status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? puffs_gif_error_unexpected_eof - : puffs_gif_status_short_read; + ? PUFFS_GIF_ERROR_UNEXPECTED_EOF + : PUFFS_GIF_STATUS_SHORT_READ; goto suspend; } diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index ed4f3585..b22b26c5 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -90,24 +90,24 @@ typedef int32_t puffs_gif_status; #define puffs_gif_packageid 1017222 // 0x000f8586 -#define puffs_gif_status_ok 0 // 0x00000000 -#define puffs_gif_error_bad_version -2147483647 // 0x80000001 -#define puffs_gif_error_bad_receiver -2147483646 // 0x80000002 -#define puffs_gif_error_bad_argument -2147483645 // 0x80000003 -#define puffs_gif_error_constructor_not_called -2147483644 // 0x80000004 -#define puffs_gif_error_unexpected_eof -2147483643 // 0x80000005 -#define puffs_gif_status_short_read 6 // 0x00000006 -#define puffs_gif_status_short_write 7 // 0x00000007 -#define puffs_gif_error_closed_for_writes -2147483640 // 0x80000008 +#define PUFFS_GIF_STATUS_OK 0 // 0x00000000 +#define PUFFS_GIF_ERROR_BAD_VERSION -2147483647 // 0x80000001 +#define PUFFS_GIF_ERROR_BAD_RECEIVER -2147483646 // 0x80000002 +#define PUFFS_GIF_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 +#define PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004 +#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005 +#define PUFFS_GIF_STATUS_SHORT_READ 6 // 0x00000006 +#define PUFFS_GIF_STATUS_SHORT_WRITE 7 // 0x00000007 +#define PUFFS_GIF_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 -#define puffs_gif_error_bad_gif_block -1105848320 // 0xbe161800 -#define puffs_gif_error_bad_gif_extension_label -1105848319 // 0xbe161801 -#define puffs_gif_error_bad_gif_header -1105848318 // 0xbe161802 -#define puffs_gif_error_bad_lzw_literal_width -1105848317 // 0xbe161803 -#define puffs_gif_error_todo_unsupported_local_color_table \ +#define PUFFS_GIF_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800 +#define PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801 +#define PUFFS_GIF_ERROR_BAD_GIF_HEADER -1105848318 // 0xbe161802 +#define PUFFS_GIF_ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xbe161803 +#define PUFFS_GIF_ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE \ -1105848316 // 0xbe161804 -#define puffs_gif_error_lzw_code_is_out_of_range -1105848315 // 0xbe161805 -#define puffs_gif_error_lzw_prefix_chain_is_cyclical -1105848314 // 0xbe161806 +#define PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848315 // 0xbe161805 +#define PUFFS_GIF_ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848314 // 0xbe161806 bool puffs_gif_status_is_error(puffs_gif_status s); diff --git a/test/c/std/gif.c b/test/c/std/gif.c index fee7240c..27f18faf 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -47,23 +47,23 @@ void test_basic_bad_argument_out_of_range() { // Setting to 8 is in the [2..8] range. puffs_gif_lzw_decoder_set_literal_width(&dec, 8); - if (dec.private_impl.status != puffs_gif_status_ok) { + if (dec.private_impl.status != PUFFS_GIF_STATUS_OK) { FAIL("status: got %d, want %d", dec.private_impl.status, - puffs_gif_status_ok); + PUFFS_GIF_STATUS_OK); } // Setting to 999 is out of range. puffs_gif_lzw_decoder_set_literal_width(&dec, 999); - if (dec.private_impl.status != puffs_gif_error_bad_argument) { + if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_ARGUMENT) { FAIL("status: got %d, want %d", dec.private_impl.status, - puffs_gif_error_bad_argument); + PUFFS_GIF_ERROR_BAD_ARGUMENT); } // That error status code should be sticky. puffs_gif_lzw_decoder_set_literal_width(&dec, 8); - if (dec.private_impl.status != puffs_gif_error_bad_argument) { + if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_ARGUMENT) { FAIL("status: got %d, want %d", dec.private_impl.status, - puffs_gif_error_bad_argument); + PUFFS_GIF_ERROR_BAD_ARGUMENT); } } @@ -72,8 +72,8 @@ void test_basic_bad_receiver() { puffs_base_writer1 dst = {0}; puffs_base_reader1 src = {0}; puffs_gif_status status = puffs_gif_lzw_decoder_decode(NULL, dst, src); - if (status != puffs_gif_error_bad_receiver) { - FAIL("status: got %d, want %d", status, puffs_gif_error_bad_receiver); + if (status != PUFFS_GIF_ERROR_BAD_RECEIVER) { + FAIL("status: got %d, want %d", status, PUFFS_GIF_ERROR_BAD_RECEIVER); } } @@ -83,9 +83,9 @@ void test_basic_constructor_not_called() { puffs_base_writer1 dst = {0}; puffs_base_reader1 src = {0}; puffs_gif_status status = puffs_gif_lzw_decoder_decode(&dec, dst, src); - if (status != puffs_gif_error_constructor_not_called) { + if (status != PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED) { FAIL("status: got %d, want %d", status, - puffs_gif_error_constructor_not_called); + PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED); } } @@ -93,9 +93,9 @@ void test_basic_puffs_version_bad() { proc_funcname = __func__; puffs_gif_lzw_decoder dec; puffs_gif_lzw_decoder_constructor(&dec, 0, 0); // 0 is not PUFFS_VERSION. - if (dec.private_impl.status != puffs_gif_error_bad_version) { + if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_VERSION) { FAIL("status: got %d, want %d", dec.private_impl.status, - puffs_gif_error_bad_version); + PUFFS_GIF_ERROR_BAD_VERSION); goto cleanup0; } cleanup0: @@ -121,46 +121,46 @@ cleanup0: void test_basic_status_is_error() { proc_funcname = __func__; - if (puffs_gif_status_is_error(puffs_gif_status_ok)) { - FAIL("is_error(ok) returned true"); + if (puffs_gif_status_is_error(PUFFS_GIF_STATUS_OK)) { + FAIL("is_error(OK) returned true"); return; } - if (!puffs_gif_status_is_error(puffs_gif_error_bad_version)) { - FAIL("is_error(bad_version) returned false"); + if (!puffs_gif_status_is_error(PUFFS_GIF_ERROR_BAD_VERSION)) { + FAIL("is_error(BAD_VERSION) returned false"); return; } - if (puffs_gif_status_is_error(puffs_gif_status_short_write)) { - FAIL("is_error(short_write) returned true"); + if (puffs_gif_status_is_error(PUFFS_GIF_STATUS_SHORT_WRITE)) { + FAIL("is_error(SHORT_WRITE) returned true"); return; } - if (!puffs_gif_status_is_error(puffs_gif_error_lzw_code_is_out_of_range)) { - FAIL("is_error(lzw_code_is_out_of_range) returned false"); + if (!puffs_gif_status_is_error(PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE)) { + FAIL("is_error(LZW_CODE_IS_OUT_OF_RANGE) returned false"); return; } } void test_basic_status_strings() { proc_funcname = __func__; - const char* s0 = puffs_gif_status_string(puffs_gif_status_ok); + const char* s0 = puffs_gif_status_string(PUFFS_GIF_STATUS_OK); const char* t0 = "gif: ok"; if (strcmp(s0, t0)) { FAIL("got \"%s\", want \"%s\"", s0, t0); return; } - const char* s1 = puffs_gif_status_string(puffs_gif_error_bad_version); + const char* s1 = puffs_gif_status_string(PUFFS_GIF_ERROR_BAD_VERSION); const char* t1 = "gif: bad version"; if (strcmp(s1, t1)) { FAIL("got \"%s\", want \"%s\"", s1, t1); return; } - const char* s2 = puffs_gif_status_string(puffs_gif_status_short_write); + const char* s2 = puffs_gif_status_string(PUFFS_GIF_STATUS_SHORT_WRITE); const char* t2 = "gif: short write"; if (strcmp(s2, t2)) { FAIL("got \"%s\", want \"%s\"", s2, t2); return; } const char* s3 = - puffs_gif_status_string(puffs_gif_error_lzw_code_is_out_of_range); + puffs_gif_status_string(PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE); const char* t3 = "gif: LZW code is out of range"; if (strcmp(s3, t3)) { FAIL("got \"%s\", want \"%s\"", s3, t3); @@ -239,14 +239,14 @@ void test_lzw_decode_xxx(const char* src_filename, puffs_gif_status status = puffs_gif_lzw_decoder_decode(&dec, got_writer, src_reader); if (src.ri == src.wi) { - if (status != puffs_gif_status_ok) { - FAIL("status: got %d, want %d", status, puffs_gif_status_ok); + if (status != PUFFS_GIF_STATUS_OK) { + FAIL("status: got %d, want %d", status, PUFFS_GIF_STATUS_OK); goto cleanup1; } break; } - if (status != puffs_gif_status_short_read) { - FAIL("status: got %d, want %d", status, puffs_gif_status_short_read); + if (status != PUFFS_GIF_STATUS_SHORT_READ) { + FAIL("status: got %d, want %d", status, PUFFS_GIF_STATUS_SHORT_READ); goto cleanup1; } if (src.ri < old_ri) { @@ -397,7 +397,7 @@ void test_gif_decode_xxx(const char* filename, goto cleanup1; } - if (want != puffs_gif_status_ok) { + if (want != PUFFS_GIF_STATUS_OK) { goto cleanup1; } @@ -440,13 +440,13 @@ void test_gif_decode_input_is_a_gif() { test_gif_decode_xxx("../../testdata/bricks-dither.gif", "../../testdata/bricks-dither.palette", "../../testdata/bricks-dither.indexes", - puffs_gif_status_ok); + PUFFS_GIF_STATUS_OK); } void test_gif_decode_input_is_a_png() { proc_funcname = __func__; test_gif_decode_xxx("../../testdata/bricks-dither.png", "", "", - puffs_gif_error_bad_gif_header); + PUFFS_GIF_ERROR_BAD_GIF_HEADER); } // ---------------- Mimic Tests