From fecd7b631cc391606314ada5647b1797fe722836 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 27 Dec 2017 13:15:37 +1100 Subject: [PATCH] Re-organize some status codes --- gen/c/std/deflate.c | 24 ++++++++++++------------ gen/c/std/zlib.c | 20 ++++++++++---------- gen/h/std/deflate.h | 20 ++++++++++---------- gen/h/std/zlib.h | 20 ++++++++++---------- std/deflate/decode_deflate.wuffs | 5 +++-- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 2bfc5955..4c370465 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -158,17 +158,17 @@ typedef int32_t wuffs_deflate__status; -1278585847 // 0xB3CA5409 #define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ -1278585846 // 0xB3CA540A -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1278585845 // 0xB3CA540B -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1278585844 // 0xB3CA540C -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1278585843 // 0xB3CA540D -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1278585842 // 0xB3CA540E #define WUFFS_DEFLATE__ERROR_MISSING_END_OF_BLOCK_CODE \ - -1278585841 // 0xB3CA540F -#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585840 // 0xB3CA5410 + -1278585845 // 0xB3CA540B +#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585844 // 0xB3CA540C +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ + -1278585843 // 0xB3CA540D +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ + -1278585842 // 0xB3CA540E +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ + -1278585841 // 0xB3CA540F +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ + -1278585840 // 0xB3CA5410 bool wuffs_deflate__status__is_error(wuffs_deflate__status s); @@ -657,12 +657,12 @@ const char* wuffs_deflate__status__strings1[17] = { "deflate: bad flate block", "deflate: bad literal/length code count", "deflate: inconsistent stored block length", + "deflate: missing end-of-block code", + "deflate: no Huffman codes", "deflate: internal error: inconsistent Huffman decoder state", "deflate: internal error: inconsistent Huffman end_of_block", "deflate: internal error: inconsistent distance", "deflate: internal error: inconsistent n_bits", - "deflate: missing end-of-block code", - "deflate: no Huffman codes", }; const char* wuffs_deflate__status__string(wuffs_deflate__status s) { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index ae9d19da..ad5c3781 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -167,17 +167,17 @@ typedef int32_t wuffs_deflate__status; -1278585847 // 0xB3CA5409 #define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ -1278585846 // 0xB3CA540A -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1278585845 // 0xB3CA540B -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1278585844 // 0xB3CA540C -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1278585843 // 0xB3CA540D -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1278585842 // 0xB3CA540E #define WUFFS_DEFLATE__ERROR_MISSING_END_OF_BLOCK_CODE \ - -1278585841 // 0xB3CA540F -#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585840 // 0xB3CA5410 + -1278585845 // 0xB3CA540B +#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585844 // 0xB3CA540C +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ + -1278585843 // 0xB3CA540D +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ + -1278585842 // 0xB3CA540E +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ + -1278585841 // 0xB3CA540F +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ + -1278585840 // 0xB3CA5410 bool wuffs_deflate__status__is_error(wuffs_deflate__status s); diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index 0336fc33..feb8512f 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -158,17 +158,17 @@ typedef int32_t wuffs_deflate__status; -1278585847 // 0xB3CA5409 #define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ -1278585846 // 0xB3CA540A -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1278585845 // 0xB3CA540B -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1278585844 // 0xB3CA540C -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1278585843 // 0xB3CA540D -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1278585842 // 0xB3CA540E #define WUFFS_DEFLATE__ERROR_MISSING_END_OF_BLOCK_CODE \ - -1278585841 // 0xB3CA540F -#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585840 // 0xB3CA5410 + -1278585845 // 0xB3CA540B +#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585844 // 0xB3CA540C +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ + -1278585843 // 0xB3CA540D +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ + -1278585842 // 0xB3CA540E +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ + -1278585841 // 0xB3CA540F +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ + -1278585840 // 0xB3CA5410 bool wuffs_deflate__status__is_error(wuffs_deflate__status s); diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 582e7950..5d9cae40 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -167,17 +167,17 @@ typedef int32_t wuffs_deflate__status; -1278585847 // 0xB3CA5409 #define WUFFS_DEFLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ -1278585846 // 0xB3CA540A -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1278585845 // 0xB3CA540B -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1278585844 // 0xB3CA540C -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1278585843 // 0xB3CA540D -#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1278585842 // 0xB3CA540E #define WUFFS_DEFLATE__ERROR_MISSING_END_OF_BLOCK_CODE \ - -1278585841 // 0xB3CA540F -#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585840 // 0xB3CA5410 + -1278585845 // 0xB3CA540B +#define WUFFS_DEFLATE__ERROR_NO_HUFFMAN_CODES -1278585844 // 0xB3CA540C +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ + -1278585843 // 0xB3CA540D +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ + -1278585842 // 0xB3CA540E +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ + -1278585841 // 0xB3CA540F +#define WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ + -1278585840 // 0xB3CA5410 bool wuffs_deflate__status__is_error(wuffs_deflate__status s); diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 7b127c57..b55c01c7 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -25,12 +25,13 @@ pub error "bad distance code count" pub error "bad flate block" pub error "bad literal/length code count" pub error "inconsistent stored block length" +pub error "missing end-of-block code" +pub error "no Huffman codes" + pri error "internal error: inconsistent Huffman decoder state" pri error "internal error: inconsistent Huffman end_of_block" pri error "internal error: inconsistent distance" pri error "internal error: inconsistent n_bits" -pub error "missing end-of-block code" -pub error "no Huffman codes" // The next two tables were created by script/print-deflate-magic-numbers.go. //