Compare commits

...
5 changed files with 56 additions and 84 deletions

No files matched your search

+14
View File
@@ -167,6 +167,9 @@ const grSingleFileGuidance = `
const grPragmaPush = `
// Wuffs' C code is generated automatically, not hand-written. These warnings'
// costs outweigh the benefits.
//
// The "elif defined(__clang__)" isn't redundant. While vanilla clang defines
// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@@ -176,6 +179,15 @@ const grPragmaPush = `
#if defined(__cplusplus)
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
#pragma clang diagnostic ignored "-Wunreachable-code"
#pragma clang diagnostic ignored "-Wunused-function"
#pragma clang diagnostic ignored "-Wunused-parameter"
#if defined(__cplusplus)
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif
#endif
`
@@ -183,6 +195,8 @@ const grPragmaPush = `
const grPragmaPop = `
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined(__clang__)
#pragma clang diagnostic pop
#endif
`
+8 -5
View File
@@ -271,7 +271,7 @@ func (g *gen) writeFuncImpl(b *buffer, n *a.Func) error {
if n.Effect().Coroutine() {
b.writex(k.bBodySuspend)
} else if k.hasGotoOK {
b.writes("\ngoto ok;\nok:\n") // The goto avoids the "unused label" warning.
b.writes("\nok:\n")
}
}
@@ -501,11 +501,17 @@ func (g *gen) writeFuncImplBody(b *buffer) error {
}
func (g *gen) writeFuncImplBodySuspend(b *buffer) error {
if (g.currFunk.coroSuspPoint > 0) || g.currFunk.astFunc.Effect().Coroutine() {
if !g.currFunk.hasGotoOK {
b.writes("\ngoto ok;") // Avoid the "unused label" warning.
}
b.writes("\nok:\n")
}
if g.currFunk.coroSuspPoint > 0 {
// We've reached the end of the function body. Reset the coroutine
// suspension point so that the next call to this function starts at
// the top.
b.writes("\ngoto ok;\nok:\n") // The goto avoids the "unused label" warning.
b.printf("self->private_impl.%s%s[0] = 0;\n",
pPrefix, g.currFunk.astFunc.FuncName().Str(g.tm))
b.writes("goto exit;\n}\n\n") // Close the coroutine switch.
@@ -523,9 +529,6 @@ func (g *gen) writeFuncImplBodySuspend(b *buffer) error {
return err
}
b.writes("\n")
} else if g.currFunk.astFunc.Effect().Coroutine() {
b.writes("\ngoto ok;\nok:\n") // The goto avoids the "unused label" warning.
}
return nil
}
+1
View File
@@ -678,6 +678,7 @@ func (g *gen) writeCoroSuspPoint(b *buffer, maybeSuspend bool) error {
macro := ""
if maybeSuspend {
macro = "_MAYBE_SUSPEND"
g.currFunk.hasGotoOK = true
}
b.printf("WUFFS_BASE__COROUTINE_SUSPENSION_POINT%s(%d);\n", macro, g.currFunk.coroSuspPoint)
return nil
+14 -37
View File
@@ -10,6 +10,9 @@
// Wuffs' C code is generated automatically, not hand-written. These warnings'
// costs outweigh the benefits.
//
// The "elif defined(__clang__)" isn't redundant. While vanilla clang defines
// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@@ -19,6 +22,15 @@
#if defined(__cplusplus)
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
#pragma clang diagnostic ignored "-Wunreachable-code"
#pragma clang diagnostic ignored "-Wunused-function"
#pragma clang diagnostic ignored "-Wunused-parameter"
#if defined(__cplusplus)
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif
#endif
// Copyright 2017 The Wuffs Authors.
@@ -22085,7 +22097,6 @@ wuffs_bmp__decoder__decode_image_config(
}
self->private_impl.f_call_sequence = 3;
goto ok;
ok:
self->private_impl.p_decode_image_config[0] = 0;
goto exit;
@@ -22194,7 +22205,6 @@ wuffs_bmp__decoder__decode_frame_config(
}
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -22382,7 +22392,6 @@ wuffs_bmp__decoder__decode_frame(
}
self->private_impl.f_call_sequence = 255;
goto ok;
ok:
self->private_impl.p_decode_frame[0] = 0;
goto exit;
@@ -22496,7 +22505,6 @@ wuffs_bmp__decoder__swizzle_none(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -22759,7 +22767,6 @@ wuffs_bmp__decoder__swizzle_rle(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -22900,7 +22907,6 @@ wuffs_bmp__decoder__swizzle_bitfields(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -23069,7 +23075,6 @@ wuffs_bmp__decoder__swizzle_low_bit_depth(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -24155,7 +24160,6 @@ wuffs_cbor__decoder__decode_tokens(
label__outer__break:;
self->private_impl.f_end_of_data = true;
goto ok;
ok:
self->private_impl.p_decode_tokens[0] = 0;
goto exit;
@@ -25716,7 +25720,6 @@ wuffs_deflate__decoder__transform_io(
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
}
goto ok;
ok:
self->private_impl.p_transform_io[0] = 0;
goto exit;
@@ -25874,7 +25877,6 @@ wuffs_deflate__decoder__decode_blocks(
}
}
goto ok;
ok:
self->private_impl.p_decode_blocks[0] = 0;
goto exit;
@@ -25994,7 +25996,6 @@ wuffs_deflate__decoder__decode_uncompressed(
}
}
goto ok;
ok:
self->private_impl.p_decode_uncompressed[0] = 0;
goto exit;
@@ -27585,7 +27586,6 @@ wuffs_deflate__decoder__decode_huffman_slow(
goto exit;
}
goto ok;
ok:
self->private_impl.p_decode_huffman_slow[0] = 0;
goto exit;
@@ -27857,7 +27857,6 @@ wuffs_lzw__decoder__transform_io(
}
label__0__break:;
goto ok;
ok:
self->private_impl.p_transform_io[0] = 0;
goto exit;
@@ -28101,7 +28100,6 @@ wuffs_lzw__decoder__write_to(
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
}
goto ok;
ok:
self->private_impl.p_write_to[0] = 0;
goto exit;
@@ -28657,7 +28655,6 @@ wuffs_gif__decoder__tell_me_more(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
self->private_impl.p_tell_me_more[0] = 0;
goto exit;
@@ -28925,7 +28922,6 @@ wuffs_gif__decoder__decode_frame_config(
wuffs_base__u64__sat_add_indirect(&self->private_impl.f_num_decoded_frame_configs_value, 1);
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -29591,7 +29587,6 @@ wuffs_gif__decoder__decode_extension(
goto suspend;
}
goto ok;
ok:
self->private_impl.p_decode_extension[0] = 0;
goto exit;
@@ -29660,7 +29655,6 @@ wuffs_gif__decoder__skip_blocks(
iop_a_src += self->private_data.s_skip_blocks[0].scratch;
}
goto ok;
ok:
self->private_impl.p_skip_blocks[0] = 0;
goto exit;
@@ -29879,7 +29873,6 @@ wuffs_gif__decoder__decode_ae(
goto suspend;
}
goto ok;
ok:
self->private_impl.p_decode_ae[0] = 0;
goto exit;
@@ -30349,7 +30342,6 @@ wuffs_gif__decoder__decode_id_part1(
wuffs_lzw__decoder__set_literal_width(&self->private_data.f_lzw, ((uint32_t)(v_lw)));
self->private_impl.f_previous_lzw_decode_ended_abruptly = true;
goto ok;
ok:
self->private_impl.p_decode_id_part1[0] = 0;
goto exit;
@@ -30556,7 +30548,6 @@ wuffs_gif__decoder__decode_id_part2(
goto exit;
}
goto ok;
ok:
self->private_impl.p_decode_id_part2[0] = 0;
goto exit;
@@ -31166,7 +31157,6 @@ wuffs_gzip__decoder__transform_io(
goto exit;
}
goto ok;
ok:
self->private_impl.p_transform_io[0] = 0;
goto exit;
@@ -32623,7 +32613,6 @@ wuffs_json__decoder__decode_tokens(
}
self->private_impl.f_end_of_data = true;
goto ok;
ok:
self->private_impl.p_decode_tokens[0] = 0;
goto exit;
@@ -32925,7 +32914,6 @@ wuffs_json__decoder__decode_leading(
}
label__0__break:;
goto ok;
ok:
self->private_impl.p_decode_leading[0] = 0;
goto exit;
@@ -33106,7 +33094,6 @@ wuffs_json__decoder__decode_comment(
}
}
goto ok;
ok:
self->private_impl.p_decode_comment[0] = 0;
goto exit;
@@ -33267,7 +33254,6 @@ wuffs_json__decoder__decode_inf_nan(
goto exit;
}
goto ok;
ok:
self->private_impl.p_decode_inf_nan[0] = 0;
goto exit;
@@ -33413,7 +33399,6 @@ wuffs_json__decoder__decode_trailer(
}
label__outer__break:;
goto ok;
ok:
self->private_impl.p_decode_trailer[0] = 0;
goto exit;
@@ -33888,7 +33873,6 @@ wuffs_nie__decoder__decode_frame_config(
}
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -33997,7 +33981,6 @@ wuffs_nie__decoder__decode_frame(
label__0__break:;
self->private_impl.f_call_sequence = 255;
goto ok;
ok:
self->private_impl.p_decode_frame[0] = 0;
goto exit;
@@ -34087,7 +34070,6 @@ wuffs_nie__decoder__swizzle(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -34687,7 +34669,6 @@ wuffs_zlib__decoder__transform_io(
goto exit;
}
goto ok;
ok:
self->private_impl.p_transform_io[0] = 0;
goto exit;
@@ -36839,7 +36820,6 @@ wuffs_png__decoder__decode_image_config(
}
self->private_impl.f_call_sequence = 3;
goto ok;
ok:
self->private_impl.p_decode_image_config[0] = 0;
goto exit;
@@ -37565,7 +37545,6 @@ wuffs_png__decoder__decode_frame_config(
}
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -37692,7 +37671,6 @@ wuffs_png__decoder__decode_frame(
label__0__break:;
self->private_impl.f_call_sequence = 255;
goto ok;
ok:
self->private_impl.p_decode_frame[0] = 0;
goto exit;
@@ -37991,7 +37969,6 @@ wuffs_png__decoder__decode_pass(
}
}
goto ok;
ok:
self->private_impl.p_decode_pass[0] = 0;
goto exit;
@@ -38795,7 +38772,6 @@ wuffs_wbmp__decoder__decode_frame_config(
}
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -38960,7 +38936,6 @@ wuffs_wbmp__decoder__decode_frame(
}
self->private_impl.f_call_sequence = 255;
goto ok;
ok:
self->private_impl.p_decode_frame[0] = 0;
goto exit;
@@ -40546,6 +40521,8 @@ done:
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined(__clang__)
#pragma clang diagnostic pop
#endif
#endif // WUFFS_INCLUDE_GUARD
+19 -42
View File
@@ -10,6 +10,9 @@
// Wuffs' C code is generated automatically, not hand-written. These warnings'
// costs outweigh the benefits.
//
// The "elif defined(__clang__)" isn't redundant. While vanilla clang defines
// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@@ -19,6 +22,15 @@
#if defined(__cplusplus)
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
#pragma clang diagnostic ignored "-Wunreachable-code"
#pragma clang diagnostic ignored "-Wunused-function"
#pragma clang diagnostic ignored "-Wunused-parameter"
#if defined(__cplusplus)
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif
#endif
// Copyright 2017 The Wuffs Authors.
@@ -70,15 +82,15 @@ extern "C" {
// each major.minor branch, the commit count should increase monotonically.
//
// WUFFS_VERSION was overridden by "wuffs gen -version" based on revision
// 91857f4c4b827a2dcac7982ef03db1767ef72e23 committed on 2021-06-24.
// f6945c061289cfbc6f6e415b0fd77b70f6cd46f2 committed on 2021-06-25.
#define WUFFS_VERSION 0x000030000
#define WUFFS_VERSION_MAJOR 0
#define WUFFS_VERSION_MINOR 3
#define WUFFS_VERSION_PATCH 0
#define WUFFS_VERSION_PRE_RELEASE_LABEL "beta.2"
#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 3048
#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 20210624
#define WUFFS_VERSION_STRING "0.3.0-beta.2+3048.20210624"
#define WUFFS_VERSION_PRE_RELEASE_LABEL "beta.3"
#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 3051
#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 20210625
#define WUFFS_VERSION_STRING "0.3.0-beta.3+3051.20210625"
// ---------------- Configuration
@@ -22086,7 +22098,6 @@ wuffs_bmp__decoder__decode_image_config(
}
self->private_impl.f_call_sequence = 3;
goto ok;
ok:
self->private_impl.p_decode_image_config[0] = 0;
goto exit;
@@ -22195,7 +22206,6 @@ wuffs_bmp__decoder__decode_frame_config(
}
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -22383,7 +22393,6 @@ wuffs_bmp__decoder__decode_frame(
}
self->private_impl.f_call_sequence = 255;
goto ok;
ok:
self->private_impl.p_decode_frame[0] = 0;
goto exit;
@@ -22497,7 +22506,6 @@ wuffs_bmp__decoder__swizzle_none(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -22760,7 +22768,6 @@ wuffs_bmp__decoder__swizzle_rle(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -22901,7 +22908,6 @@ wuffs_bmp__decoder__swizzle_bitfields(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -23070,7 +23076,6 @@ wuffs_bmp__decoder__swizzle_low_bit_depth(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -24156,7 +24161,6 @@ wuffs_cbor__decoder__decode_tokens(
label__outer__break:;
self->private_impl.f_end_of_data = true;
goto ok;
ok:
self->private_impl.p_decode_tokens[0] = 0;
goto exit;
@@ -25717,7 +25721,6 @@ wuffs_deflate__decoder__transform_io(
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
}
goto ok;
ok:
self->private_impl.p_transform_io[0] = 0;
goto exit;
@@ -25875,7 +25878,6 @@ wuffs_deflate__decoder__decode_blocks(
}
}
goto ok;
ok:
self->private_impl.p_decode_blocks[0] = 0;
goto exit;
@@ -25995,7 +25997,6 @@ wuffs_deflate__decoder__decode_uncompressed(
}
}
goto ok;
ok:
self->private_impl.p_decode_uncompressed[0] = 0;
goto exit;
@@ -27586,7 +27587,6 @@ wuffs_deflate__decoder__decode_huffman_slow(
goto exit;
}
goto ok;
ok:
self->private_impl.p_decode_huffman_slow[0] = 0;
goto exit;
@@ -27858,7 +27858,6 @@ wuffs_lzw__decoder__transform_io(
}
label__0__break:;
goto ok;
ok:
self->private_impl.p_transform_io[0] = 0;
goto exit;
@@ -28102,7 +28101,6 @@ wuffs_lzw__decoder__write_to(
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
}
goto ok;
ok:
self->private_impl.p_write_to[0] = 0;
goto exit;
@@ -28658,7 +28656,6 @@ wuffs_gif__decoder__tell_me_more(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
self->private_impl.p_tell_me_more[0] = 0;
goto exit;
@@ -28926,7 +28923,6 @@ wuffs_gif__decoder__decode_frame_config(
wuffs_base__u64__sat_add_indirect(&self->private_impl.f_num_decoded_frame_configs_value, 1);
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -29592,7 +29588,6 @@ wuffs_gif__decoder__decode_extension(
goto suspend;
}
goto ok;
ok:
self->private_impl.p_decode_extension[0] = 0;
goto exit;
@@ -29661,7 +29656,6 @@ wuffs_gif__decoder__skip_blocks(
iop_a_src += self->private_data.s_skip_blocks[0].scratch;
}
goto ok;
ok:
self->private_impl.p_skip_blocks[0] = 0;
goto exit;
@@ -29880,7 +29874,6 @@ wuffs_gif__decoder__decode_ae(
goto suspend;
}
goto ok;
ok:
self->private_impl.p_decode_ae[0] = 0;
goto exit;
@@ -30350,7 +30343,6 @@ wuffs_gif__decoder__decode_id_part1(
wuffs_lzw__decoder__set_literal_width(&self->private_data.f_lzw, ((uint32_t)(v_lw)));
self->private_impl.f_previous_lzw_decode_ended_abruptly = true;
goto ok;
ok:
self->private_impl.p_decode_id_part1[0] = 0;
goto exit;
@@ -30557,7 +30549,6 @@ wuffs_gif__decoder__decode_id_part2(
goto exit;
}
goto ok;
ok:
self->private_impl.p_decode_id_part2[0] = 0;
goto exit;
@@ -31167,7 +31158,6 @@ wuffs_gzip__decoder__transform_io(
goto exit;
}
goto ok;
ok:
self->private_impl.p_transform_io[0] = 0;
goto exit;
@@ -32624,7 +32614,6 @@ wuffs_json__decoder__decode_tokens(
}
self->private_impl.f_end_of_data = true;
goto ok;
ok:
self->private_impl.p_decode_tokens[0] = 0;
goto exit;
@@ -32926,7 +32915,6 @@ wuffs_json__decoder__decode_leading(
}
label__0__break:;
goto ok;
ok:
self->private_impl.p_decode_leading[0] = 0;
goto exit;
@@ -33107,7 +33095,6 @@ wuffs_json__decoder__decode_comment(
}
}
goto ok;
ok:
self->private_impl.p_decode_comment[0] = 0;
goto exit;
@@ -33268,7 +33255,6 @@ wuffs_json__decoder__decode_inf_nan(
goto exit;
}
goto ok;
ok:
self->private_impl.p_decode_inf_nan[0] = 0;
goto exit;
@@ -33414,7 +33400,6 @@ wuffs_json__decoder__decode_trailer(
}
label__outer__break:;
goto ok;
ok:
self->private_impl.p_decode_trailer[0] = 0;
goto exit;
@@ -33889,7 +33874,6 @@ wuffs_nie__decoder__decode_frame_config(
}
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -33998,7 +33982,6 @@ wuffs_nie__decoder__decode_frame(
label__0__break:;
self->private_impl.f_call_sequence = 255;
goto ok;
ok:
self->private_impl.p_decode_frame[0] = 0;
goto exit;
@@ -34088,7 +34071,6 @@ wuffs_nie__decoder__swizzle(
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
ok:
goto exit;
exit:
@@ -34688,7 +34670,6 @@ wuffs_zlib__decoder__transform_io(
goto exit;
}
goto ok;
ok:
self->private_impl.p_transform_io[0] = 0;
goto exit;
@@ -36840,7 +36821,6 @@ wuffs_png__decoder__decode_image_config(
}
self->private_impl.f_call_sequence = 3;
goto ok;
ok:
self->private_impl.p_decode_image_config[0] = 0;
goto exit;
@@ -37566,7 +37546,6 @@ wuffs_png__decoder__decode_frame_config(
}
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -37693,7 +37672,6 @@ wuffs_png__decoder__decode_frame(
label__0__break:;
self->private_impl.f_call_sequence = 255;
goto ok;
ok:
self->private_impl.p_decode_frame[0] = 0;
goto exit;
@@ -37992,7 +37970,6 @@ wuffs_png__decoder__decode_pass(
}
}
goto ok;
ok:
self->private_impl.p_decode_pass[0] = 0;
goto exit;
@@ -38796,7 +38773,6 @@ wuffs_wbmp__decoder__decode_frame_config(
}
self->private_impl.f_call_sequence = 4;
goto ok;
ok:
self->private_impl.p_decode_frame_config[0] = 0;
goto exit;
@@ -38961,7 +38937,6 @@ wuffs_wbmp__decoder__decode_frame(
}
self->private_impl.f_call_sequence = 255;
goto ok;
ok:
self->private_impl.p_decode_frame[0] = 0;
goto exit;
@@ -40547,6 +40522,8 @@ done:
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined(__clang__)
#pragma clang diagnostic pop
#endif
#endif // WUFFS_INCLUDE_GUARD