diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index fcbbea4d..cff14175 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -656,6 +656,20 @@ func (g *gen) genHeader(b *buffer) error { } } + b.writes("// ---------------- Upcasts\n\n") + for _, n := range g.structList { + structName := n.QID().Str(g.tm) + for _, impl := range n.Implements() { + iQID := impl.AsTypeExpr().QID() + iName := fmt.Sprintf("wuffs_%s__%s", iQID[0].Str(g.tm), iQID[1].Str(g.tm)) + b.printf("static inline %s* //\n", iName) + b.printf("%s%s__upcast_as__%s(%s%s* p){\n", + g.pkgPrefix, structName, iName, g.pkgPrefix, structName) + b.printf("return (%s*)p;\n", iName) + b.printf("}\n\n") + } + } + b.writes("// ---------------- Public Function Prototypes\n\n") if err := g.forEachFunc(b, pubOnly, (*gen).writeFuncPrototype); err != nil { return err @@ -1071,6 +1085,15 @@ func (g *gen) writeCppMethods(b *buffer, n *a.Struct) error { b.printf("return %s%s__initialize(this, sizeof_star_self, wuffs_version, initialize_flags);\n}\n\n", g.pkgPrefix, structName) + for _, impl := range n.Implements() { + iQID := impl.AsTypeExpr().QID() + iName := fmt.Sprintf("wuffs_%s__%s", iQID[0].Str(g.tm), iQID[1].Str(g.tm)) + b.printf("inline %s* //\n", iName) + b.printf("upcast_as__%s(){\n", iName) + b.printf("return (%s*)this;\n", iName) + b.printf("}\n\n") + } + structID := n.QID()[1] for _, file := range g.files { for _, tld := range file.TopLevelDecls() { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 8de8a347..15750100 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2633,6 +2633,14 @@ wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self, size_t // sizeof__wuffs_adler32__hasher(); +// ---------------- Upcasts + +static inline wuffs_base__hasher_u32* // +wuffs_adler32__hasher__upcast_as__wuffs_base__hasher_u32( + wuffs_adler32__hasher* p) { + return (wuffs_base__hasher_u32*)p; +} + // ---------------- Public Function Prototypes WUFFS_BASE__MAYBE_STATIC uint32_t // @@ -2694,6 +2702,11 @@ struct wuffs_adler32__hasher__struct { wuffs_version, initialize_flags); } + inline wuffs_base__hasher_u32* // + upcast_as__wuffs_base__hasher_u32() { + return (wuffs_base__hasher_u32*)this; + } + inline uint32_t // update_u32(wuffs_base__slice_u8 a_x) { return wuffs_adler32__hasher__update_u32(this, a_x); @@ -2738,6 +2751,14 @@ wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self, size_t // sizeof__wuffs_crc32__ieee_hasher(); +// ---------------- Upcasts + +static inline wuffs_base__hasher_u32* // +wuffs_crc32__ieee_hasher__upcast_as__wuffs_base__hasher_u32( + wuffs_crc32__ieee_hasher* p) { + return (wuffs_base__hasher_u32*)p; +} + // ---------------- Public Function Prototypes WUFFS_BASE__MAYBE_STATIC uint32_t // @@ -2799,6 +2820,11 @@ struct wuffs_crc32__ieee_hasher__struct { this, sizeof_star_self, wuffs_version, initialize_flags); } + inline wuffs_base__hasher_u32* // + upcast_as__wuffs_base__hasher_u32() { + return (wuffs_base__hasher_u32*)this; + } + inline uint32_t // update_u32(wuffs_base__slice_u8 a_x) { return wuffs_crc32__ieee_hasher__update_u32(this, a_x); @@ -2859,6 +2885,8 @@ wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self, size_t // sizeof__wuffs_deflate__decoder(); +// ---------------- Upcasts + // ---------------- Public Function Prototypes WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // @@ -3039,6 +3067,8 @@ wuffs_lzw__decoder__initialize(wuffs_lzw__decoder* self, size_t // sizeof__wuffs_lzw__decoder(); +// ---------------- Upcasts + // ---------------- Public Function Prototypes WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // @@ -3216,6 +3246,8 @@ wuffs_gif__decoder__initialize(wuffs_gif__decoder* self, size_t // sizeof__wuffs_gif__decoder(); +// ---------------- Upcasts + // ---------------- Public Function Prototypes WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // @@ -3562,6 +3594,8 @@ wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self, size_t // sizeof__wuffs_gzip__decoder(); +// ---------------- Upcasts + // ---------------- Public Function Prototypes WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // @@ -3708,6 +3742,8 @@ wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self, size_t // sizeof__wuffs_zlib__decoder(); +// ---------------- Upcasts + // ---------------- Public Function Prototypes WUFFS_BASE__MAYBE_STATIC uint32_t // diff --git a/test/c/std/adler32.c b/test/c/std/adler32.c index 8dca8ed2..afd9ca7e 100644 --- a/test/c/std/adler32.c +++ b/test/c/std/adler32.c @@ -159,6 +159,23 @@ const char* test_wuffs_adler32_golden() { return NULL; } +const char* test_wuffs_adler32_interface() { + CHECK_FOCUS(__func__); + wuffs_adler32__hasher h; + CHECK_STATUS("initialize", + wuffs_adler32__hasher__initialize( + &h, sizeof h, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + const char* digits = "3.14"; + return do_test__wuffs_base__hasher_u32( + wuffs_adler32__hasher__upcast_as__wuffs_base__hasher_u32(&h), + ((wuffs_base__slice_u8){ + .ptr = (uint8_t*)(digits), + .len = (size_t)(strlen(digits)), + }), + 0x01F000C7); +} + const char* test_wuffs_adler32_pi() { CHECK_FOCUS(__func__); @@ -282,8 +299,9 @@ const char* bench_mimic_adler32_100k() { // The empty comments forces clang-format to place one element per line. proc tests[] = { - test_wuffs_adler32_golden, // - test_wuffs_adler32_pi, // + test_wuffs_adler32_golden, // + test_wuffs_adler32_interface, // + test_wuffs_adler32_pi, // NULL, }; diff --git a/test/c/std/crc32.c b/test/c/std/crc32.c index eb06311f..ab670388 100644 --- a/test/c/std/crc32.c +++ b/test/c/std/crc32.c @@ -159,6 +159,23 @@ const char* test_wuffs_crc32_ieee_golden() { return NULL; } +const char* test_wuffs_crc32_ieee_interface() { + CHECK_FOCUS(__func__); + wuffs_crc32__ieee_hasher h; + CHECK_STATUS("initialize", + wuffs_crc32__ieee_hasher__initialize( + &h, sizeof h, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + const char* digits = "3.14"; + return do_test__wuffs_base__hasher_u32( + wuffs_crc32__ieee_hasher__upcast_as__wuffs_base__hasher_u32(&h), + ((wuffs_base__slice_u8){ + .ptr = (uint8_t*)(digits), + .len = (size_t)(strlen(digits)), + }), + 0x16E010BE); +} + const char* do_test_xxxxx_crc32_ieee_pi(bool mimic) { const char* digits = "3." @@ -316,8 +333,9 @@ const char* bench_mimic_crc32_ieee_100k() { // The empty comments forces clang-format to place one element per line. proc tests[] = { - test_wuffs_crc32_ieee_golden, // - test_wuffs_crc32_ieee_pi, // + test_wuffs_crc32_ieee_golden, // + test_wuffs_crc32_ieee_interface, // + test_wuffs_crc32_ieee_pi, // #ifdef WUFFS_MIMIC diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 853d23ae..515ec1c3 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -740,4 +740,16 @@ const char* do_test_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*, tc_neither, gt, wlimit, rlimit, 1, false); } +// -------- + +const char* do_test__wuffs_base__hasher_u32(wuffs_base__hasher_u32* h, + wuffs_base__slice_u8 data, + uint32_t want) { + uint32_t got = wuffs_base__hasher_u32__update_u32(h, data); + if (got != want) { + RETURN_FAIL("got 0x%08" PRIX32 ", want 0x%08" PRIX32, got, want); + } + return NULL; +} + #endif // WUFFS_INCLUDE_GUARD