diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index aa5194a4..f5479671 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -122,7 +122,24 @@ func Do(args []string) error { } messages[uint8(z.Value)] = statusPrefix + "base: " + z.Message } - return genStatusStringData(b, "wuffs_base__", &messages) + if err := genStatusStringData(b, "wuffs_base__", &messages); err != nil { + return err + } + + for _, z := range builtin.StatusList { + pre := "" + switch z.Keyword { + case t.IDError: + pre = "error" + case t.IDSuspension: + pre = "suspension" + default: + continue + } + b.printf("const char* wuffs_base__%s__%s = \"%s\";\n", + pre, cName(z.Message, ""), messages[uint8(z.Value)]) + } + return nil }, }); err != nil { return nil, err @@ -178,12 +195,20 @@ const ( ) type status struct { + cName string name string value int8 msg string keyword t.ID } +func (z status) cNamePrefix() string { + if z.keyword == t.IDSuspension { + return "suspension" + } + return "error" +} + type buffer []byte func (b *buffer) Write(p []byte) (int, error) { @@ -248,6 +273,18 @@ func insertBasePublicH(buf *buffer) error { strings.ToUpper(cName(z.String(), "WUFFS_BASE__")), code, uint32(code)) } b.writes("\n") + for _, z := range builtin.StatusList { + pre := "" + switch z.Keyword { + case t.IDError: + pre = "error" + case t.IDSuspension: + pre = "suspension" + default: + continue + } + b.printf("extern const char* wuffs_base__%s__%s;\n", pre, cName(z.Message, "")) + } return nil }, }); err != nil { @@ -382,6 +419,11 @@ func (g *gen) genHeader(b *buffer) error { } b.writes("\n") + for _, s := range g.statusList { + b.printf("extern const char* %s%s__%s;\n", g.pkgPrefix, s.cNamePrefix(), s.cName) + } + b.writes("\n") + b.printf("const char* %sstatus__string(int32_t status_code);\n\n", g.pkgPrefix) b.writes("// ---------------- Public Consts\n\n") @@ -429,8 +471,8 @@ func (g *gen) genImpl(b *buffer) error { b.writes("// ---------------- Status Codes Implementations\n\n") + messages := [256]string{} { - messages := [256]string{} for _, s := range g.statusList { statusPrefix := "?" if s.keyword == t.IDSuspension { @@ -443,6 +485,12 @@ func (g *gen) genImpl(b *buffer) error { } } + for _, s := range g.statusList { + b.printf("const char* %s%s__%s = \"%s\";\n", + g.pkgPrefix, s.cNamePrefix(), s.cName, messages[uint8(s.value)]) + } + b.writes("\n") + b.printf("const char* %sstatus__string(int32_t status_code) {\n", g.pkgPrefix) b.printf("uint16_t o;") b.printf("switch (status_code & 0x%X) {\n", (1<> 24)]; @@ -4673,6 +4750,43 @@ static const uint16_t wuffs_deflate__status__string_offsets[] = { 0x0227, 0x0254, 0x027C, 0x02AA, }; +const char* wuffs_deflate__error__bad_huffman_code_over_subscribed = + "?deflate: bad Huffman code (over-subscribed)"; +const char* wuffs_deflate__error__bad_huffman_code_under_subscribed = + "?deflate: bad Huffman code (under-subscribed)"; +const char* wuffs_deflate__error__bad_huffman_code_length_count = + "?deflate: bad Huffman code length count"; +const char* wuffs_deflate__error__bad_huffman_code_length_repetition = + "?deflate: bad Huffman code length repetition"; +const char* wuffs_deflate__error__bad_huffman_code = + "?deflate: bad Huffman code"; +const char* wuffs_deflate__error__bad_huffman_minimum_code_length = + "?deflate: bad Huffman minimum code length"; +const char* wuffs_deflate__error__bad_block = "?deflate: bad block"; +const char* wuffs_deflate__error__bad_distance = "?deflate: bad distance"; +const char* wuffs_deflate__error__bad_distance_code_count = + "?deflate: bad distance code count"; +const char* wuffs_deflate__error__bad_literal_length_code_count = + "?deflate: bad literal/length code count"; +const char* wuffs_deflate__error__inconsistent_stored_block_length = + "?deflate: inconsistent stored block length"; +const char* wuffs_deflate__error__missing_end_of_block_code = + "?deflate: missing end-of-block code"; +const char* wuffs_deflate__error__no_huffman_codes = + "?deflate: no Huffman codes"; +const char* + wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state = + "?deflate: internal error: inconsistent Huffman decoder state"; +const char* + wuffs_deflate__error__internal_error_inconsistent_huffman_end_of_block = + "?deflate: internal error: inconsistent Huffman end_of_block"; +const char* wuffs_deflate__error__internal_error_inconsistent_i_o = + "?deflate: internal error: inconsistent I/O"; +const char* wuffs_deflate__error__internal_error_inconsistent_distance = + "?deflate: internal error: inconsistent distance"; +const char* wuffs_deflate__error__internal_error_inconsistent_n_bits = + "?deflate: internal error: inconsistent n_bits"; + const char* wuffs_deflate__status__string(int32_t status_code) { uint16_t o; switch (status_code & 0x1FFFFF) { @@ -6663,6 +6777,17 @@ static const uint16_t wuffs_gif__status__string_offsets[] = { 0x0078, 0x0089, 0x00A3, 0x00BD, }; +const char* wuffs_gif__error__bad_block = "?gif: bad block"; +const char* wuffs_gif__error__bad_extension_label = "?gif: bad extension label"; +const char* wuffs_gif__error__bad_graphic_control = "?gif: bad graphic control"; +const char* wuffs_gif__error__bad_header = "?gif: bad header"; +const char* wuffs_gif__error__bad_literal_width = "?gif: bad literal width"; +const char* wuffs_gif__error__not_enough_pixel_data = + "?gif: not enough pixel data"; +const char* wuffs_gif__error__too_much_pixel_data = "?gif: too much pixel data"; +const char* wuffs_gif__error__internal_error_inconsistent_ri_wi = + "?gif: internal error: inconsistent ri/wi"; + const char* wuffs_gif__status__string(int32_t status_code) { uint16_t o; switch (status_code & 0x1FFFFF) { @@ -8731,6 +8856,12 @@ static const uint16_t wuffs_gzip__status__string_offsets[] = { 0x0001, 0x0013, 0x002D, 0x004B, }; +const char* wuffs_gzip__error__bad_checksum = "?gzip: bad checksum"; +const char* wuffs_gzip__error__bad_compression_method = + "?gzip: bad compression method"; +const char* wuffs_gzip__error__bad_encoding_flags = "?gzip: bad encoding flags"; +const char* wuffs_gzip__error__bad_header = "?gzip: bad header"; + const char* wuffs_gzip__status__string(int32_t status_code) { uint16_t o; switch (status_code & 0x1FFFFF) { @@ -9233,6 +9364,10 @@ static const uint16_t wuffs_lzw__status__string_offsets[] = { 0x0000, 0x0000, 0x0001, 0x001D, }; +const char* wuffs_lzw__error__bad_code = "?lzw: bad code"; +const char* wuffs_lzw__error__cyclical_prefix_chain = + "?lzw: cyclical prefix chain"; + const char* wuffs_lzw__status__string(int32_t status_code) { uint16_t o; switch (status_code & 0x1FFFFF) { @@ -9583,6 +9718,15 @@ static const uint16_t wuffs_zlib__status__string_offsets[] = { 0x002C, 0x0044, 0x0067, 0x0085, }; +const char* wuffs_zlib__error__bad_checksum = "?zlib: bad checksum"; +const char* wuffs_zlib__error__bad_compression_method = + "?zlib: bad compression method"; +const char* wuffs_zlib__error__bad_compression_window_size = + "?zlib: bad compression window size"; +const char* wuffs_zlib__error__bad_parity_check = "?zlib: bad parity check"; +const char* wuffs_zlib__error__todo_unsupported_preset_dictionary = + "?zlib: TODO: unsupported preset dictionary"; + const char* wuffs_zlib__status__string(int32_t status_code) { uint16_t o; switch (status_code & 0x1FFFFF) {