diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index fdf231c0..ad293cd8 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -224,7 +224,7 @@ func (g *gen) genHeader(b *buffer) error { "// %sstatus__is_error instead.\n", g.pkgPrefix) b.printf("typedef int32_t %sstatus;\n\n", g.pkgPrefix) pkgID := g.checker.PackageID() - b.printf("#define %spackageid %d // %#08x\n\n", g.pkgPrefix, pkgID, pkgID) + b.printf("#define %spackageid %d // 0x%08X\n\n", g.pkgPrefix, pkgID, pkgID) for i, z := range builtin.StatusList { code := uint32(0) @@ -232,7 +232,7 @@ func (g *gen) genHeader(b *buffer) error { code |= 1 << 31 } code |= uint32(i) - b.printf("#define %s %d // %#08x\n", strings.ToUpper(g.cName(z.String())), int32(code), code) + b.printf("#define %s %d // 0x%08X\n", strings.ToUpper(g.cName(z.String())), int32(code), code) } b.writes("\n") @@ -245,7 +245,7 @@ func (g *gen) genHeader(b *buffer) error { code |= 1 << 31 } code |= uint32(i) - b.printf("#define %s %d // %#08x\n", s.name, int32(code), code) + b.printf("#define %s %d // 0x%08X\n", s.name, int32(code), code) } b.writes("\n") @@ -305,13 +305,13 @@ func (g *gen) genImpl(b *buffer) error { b.printf("const char* %sstatus__string(%sstatus s) {\n", g.pkgPrefix, g.pkgPrefix) b.printf("const char** a = NULL;\n") b.printf("uint32_t n = 0;\n") - b.printf("switch ((s >> %d) & %#x) {\n", statusCodeNamespaceShift, statusCodeNamespaceMask) + b.printf("switch ((s >> %d) & 0x%X) {\n", statusCodeNamespaceShift, statusCodeNamespaceMask) b.printf("case 0: a = %sstatus__strings0; n = %d; break;\n", g.pkgPrefix, len(builtin.StatusList)) b.printf("case %spackageid: a = %sstatus__strings1; n = %d; break;\n", g.pkgPrefix, g.pkgPrefix, len(g.statusList)) // TODO: add cases for other packages used by this one. b.printf("}\n") - b.printf("uint32_t i = s & %#0x;\n", 1<> 10) & 0x1fffff) { + switch ((s >> 10) & 0x1FFFFF) { case 0: a = wuffs_flate__status__strings0; n = 11; @@ -743,7 +743,7 @@ const char* wuffs_flate__status__string(wuffs_flate__status s) { n = 22; break; } - uint32_t i = s & 0xff; + uint32_t i = s & 0xFF; return i < n ? a[i] : "flate: unknown status"; } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 337999ea..43ca60ec 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -123,7 +123,7 @@ extern "C" { // wuffs_gif__status__is_error instead. typedef int32_t wuffs_gif__status; -#define wuffs_gif__packageid 1017222 // 0x000f8586 +#define wuffs_gif__packageid 1017222 // 0x000F8586 #define WUFFS_GIF__STATUS_OK 0 // 0x00000000 #define WUFFS_GIF__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 @@ -135,18 +135,18 @@ typedef int32_t wuffs_gif__status; #define WUFFS_GIF__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 #define WUFFS_GIF__SUSPENSION_SHORT_READ 8 // 0x00000008 #define WUFFS_GIF__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000a +#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800 -#define WUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801 -#define WUFFS_GIF__ERROR_BAD_GIF_HEADER -1105848318 // 0xbe161802 -#define WUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xbe161803 +#define WUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xBE161800 +#define WUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xBE161801 +#define WUFFS_GIF__ERROR_BAD_GIF_HEADER -1105848318 // 0xBE161802 +#define WUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xBE161803 #define WUFFS_GIF__ERROR_INTERNAL_ERROR_INCONSISTENT_LIMITED_READ \ - -1105848316 // 0xbe161804 + -1105848316 // 0xBE161804 #define WUFFS_GIF__ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE \ - -1105848315 // 0xbe161805 -#define WUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848314 // 0xbe161806 -#define WUFFS_GIF__ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848313 // 0xbe161807 + -1105848315 // 0xBE161805 +#define WUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848314 // 0xBE161806 +#define WUFFS_GIF__ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848313 // 0xBE161807 bool wuffs_gif__status__is_error(wuffs_gif__status s); @@ -661,7 +661,7 @@ const char* wuffs_gif__status__strings1[8] = { const char* wuffs_gif__status__string(wuffs_gif__status s) { const char** a = NULL; uint32_t n = 0; - switch ((s >> 10) & 0x1fffff) { + switch ((s >> 10) & 0x1FFFFF) { case 0: a = wuffs_gif__status__strings0; n = 11; @@ -671,7 +671,7 @@ const char* wuffs_gif__status__string(wuffs_gif__status s) { n = 8; break; } - uint32_t i = s & 0xff; + uint32_t i = s & 0xFF; return i < n ? a[i] : "gif: unknown status"; } diff --git a/gen/h/std/flate.h b/gen/h/std/flate.h index 96f79de7..9f964ae0 100644 --- a/gen/h/std/flate.h +++ b/gen/h/std/flate.h @@ -123,7 +123,7 @@ extern "C" { // wuffs_flate__status__is_error instead. typedef int32_t wuffs_flate__status; -#define wuffs_flate__packageid 967230 // 0x000ec23e +#define wuffs_flate__packageid 967230 // 0x000EC23E #define WUFFS_FLATE__STATUS_OK 0 // 0x00000000 #define WUFFS_FLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 @@ -135,44 +135,44 @@ typedef int32_t wuffs_flate__status; #define WUFFS_FLATE__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 #define WUFFS_FLATE__SUSPENSION_SHORT_READ 8 // 0x00000008 #define WUFFS_FLATE__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_FLATE__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000a +#define WUFFS_FLATE__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A #define WUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ - -1157040128 // 0xbb08f800 + -1157040128 // 0xBB08F800 #define WUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \ - -1157040127 // 0xbb08f801 + -1157040127 // 0xBB08F801 #define WUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \ - -1157040126 // 0xbb08f802 + -1157040126 // 0xBB08F802 #define WUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \ - -1157040125 // 0xbb08f803 -#define WUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xbb08f804 + -1157040125 // 0xBB08F803 +#define WUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xBB08F804 #define WUFFS_FLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \ - -1157040123 // 0xbb08f805 -#define WUFFS_FLATE__ERROR_BAD_DISTANCE -1157040122 // 0xbb08f806 -#define WUFFS_FLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xbb08f807 -#define WUFFS_FLATE__ERROR_BAD_FLATE_BLOCK -1157040120 // 0xbb08f808 + -1157040123 // 0xBB08F805 +#define WUFFS_FLATE__ERROR_BAD_DISTANCE -1157040122 // 0xBB08F806 +#define WUFFS_FLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xBB08F807 +#define WUFFS_FLATE__ERROR_BAD_FLATE_BLOCK -1157040120 // 0xBB08F808 #define WUFFS_FLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \ - -1157040119 // 0xbb08f809 -#define WUFFS_FLATE__ERROR_CHECKSUM_MISMATCH -1157040118 // 0xbb08f80a + -1157040119 // 0xBB08F809 +#define WUFFS_FLATE__ERROR_CHECKSUM_MISMATCH -1157040118 // 0xBB08F80A #define WUFFS_FLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \ - -1157040117 // 0xbb08f80b + -1157040117 // 0xBB08F80B #define WUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \ - -1157040116 // 0xbb08f80c + -1157040116 // 0xBB08F80C #define WUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_END_OF_BLOCK \ - -1157040115 // 0xbb08f80d + -1157040115 // 0xBB08F80D #define WUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE \ - -1157040114 // 0xbb08f80e + -1157040114 // 0xBB08F80E #define WUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \ - -1157040113 // 0xbb08f80f -#define WUFFS_FLATE__ERROR_MISSING_END_OF_BLOCK_CODE -1157040112 // 0xbb08f810 -#define WUFFS_FLATE__ERROR_NO_HUFFMAN_CODES -1157040111 // 0xbb08f811 + -1157040113 // 0xBB08F80F +#define WUFFS_FLATE__ERROR_MISSING_END_OF_BLOCK_CODE -1157040112 // 0xBB08F810 +#define WUFFS_FLATE__ERROR_NO_HUFFMAN_CODES -1157040111 // 0xBB08F811 #define WUFFS_FLATE__ERROR_INVALID_ZLIB_COMPRESSION_METHOD \ - -1157040110 // 0xbb08f812 + -1157040110 // 0xBB08F812 #define WUFFS_FLATE__ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE \ - -1157040109 // 0xbb08f813 -#define WUFFS_FLATE__ERROR_INVALID_ZLIB_PARITY_CHECK -1157040108 // 0xbb08f814 + -1157040109 // 0xBB08F813 +#define WUFFS_FLATE__ERROR_INVALID_ZLIB_PARITY_CHECK -1157040108 // 0xBB08F814 #define WUFFS_FLATE__ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY \ - -1157040107 // 0xbb08f815 + -1157040107 // 0xBB08F815 bool wuffs_flate__status__is_error(wuffs_flate__status s); diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 0d3fd957..4fb94d83 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -123,7 +123,7 @@ extern "C" { // wuffs_gif__status__is_error instead. typedef int32_t wuffs_gif__status; -#define wuffs_gif__packageid 1017222 // 0x000f8586 +#define wuffs_gif__packageid 1017222 // 0x000F8586 #define WUFFS_GIF__STATUS_OK 0 // 0x00000000 #define WUFFS_GIF__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 @@ -135,18 +135,18 @@ typedef int32_t wuffs_gif__status; #define WUFFS_GIF__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 #define WUFFS_GIF__SUSPENSION_SHORT_READ 8 // 0x00000008 #define WUFFS_GIF__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000a +#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800 -#define WUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801 -#define WUFFS_GIF__ERROR_BAD_GIF_HEADER -1105848318 // 0xbe161802 -#define WUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xbe161803 +#define WUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xBE161800 +#define WUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xBE161801 +#define WUFFS_GIF__ERROR_BAD_GIF_HEADER -1105848318 // 0xBE161802 +#define WUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xBE161803 #define WUFFS_GIF__ERROR_INTERNAL_ERROR_INCONSISTENT_LIMITED_READ \ - -1105848316 // 0xbe161804 + -1105848316 // 0xBE161804 #define WUFFS_GIF__ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE \ - -1105848315 // 0xbe161805 -#define WUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848314 // 0xbe161806 -#define WUFFS_GIF__ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848313 // 0xbe161807 + -1105848315 // 0xBE161805 +#define WUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848314 // 0xBE161806 +#define WUFFS_GIF__ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848313 // 0xBE161807 bool wuffs_gif__status__is_error(wuffs_gif__status s); diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 95155d2d..6dcc614a 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -840,7 +840,7 @@ func (p *parser) parseExpr() (*a.Expr, error) { if !x.IsAssociativeOp() || x != p.peek1() { op := x.BinaryForm() if op == 0 { - return nil, fmt.Errorf(`parse: internal error: no binary form for token.Key 0x%#02x`, x.Key()) + return nil, fmt.Errorf(`parse: internal error: no binary form for token.Key 0x%02X`, x.Key()) } return a.NewExpr(0, op, 0, lhs.Node(), nil, rhs, nil), nil } @@ -856,7 +856,7 @@ func (p *parser) parseExpr() (*a.Expr, error) { } op := x.AssociativeForm() if op == 0 { - return nil, fmt.Errorf(`parse: internal error: no associative form for token.Key 0x%#02x`, x.Key()) + return nil, fmt.Errorf(`parse: internal error: no associative form for token.Key 0x%02X`, x.Key()) } return a.NewExpr(0, op, 0, nil, nil, nil, args), nil } @@ -873,7 +873,7 @@ func (p *parser) parseOperand() (*a.Expr, error) { } op := x.UnaryForm() if op == 0 { - return nil, fmt.Errorf(`parse: internal error: no unary form for token.Key 0x%#02x`, x.Key()) + return nil, fmt.Errorf(`parse: internal error: no unary form for token.Key 0x%02X`, x.Key()) } return a.NewExpr(0, op, 0, nil, nil, rhs.Node(), nil), nil