Call initializers for out-of-pkg struct fields

This commit is contained in:
Nigel Tao committed 2017-12-03 14:22:49 +11:00
1 parent 6fec22c6d7
commit 7e73a5ac5f
4 files changed
+43 -32

No files matched your search

+11 -4
View File
@@ -696,12 +696,19 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
// TODO: arrays of sub-structs.
continue
}
if g.structMap[x.Name()] == nil {
prefix := g.pkgPrefix
if otherPkgID := x.Decorator(); otherPkgID != 0 {
// See gen.writeCTypeName for a related TODO with otherPkg.
otherPkg := g.tm.ByID(otherPkgID)
prefix = "wuffs_" + otherPkg + "__"
} else if g.structMap[x.Name()] == nil {
// Skip field types like u32 and bool.
continue
}
b.printf("%s%s__initialize(&self->private_impl.%s%s,"+
"WUFFS_VERSION, WUFFS_BASE__ALREADY_ZEROED);\n",
g.pkgPrefix, x.Name().Str(g.tm), fPrefix, f.Name().Str(g.tm))
b.printf("%s%s__initialize(&self->private_impl.%s%s, WUFFS_VERSION, WUFFS_BASE__ALREADY_ZEROED);\n",
prefix, x.Name().Str(g.tm), fPrefix, f.Name().Str(g.tm))
}
b.writes("}\n\n")
+2
View File
@@ -574,6 +574,8 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var
// to generating "wuffs_bar__qux".
//
// TODO: sanitize or validate otherPkg, e.g. that it's ASCII only?
//
// See gen.writeInitializerImpl for a similar use of otherPkg.
prefix = "wuffs_" + otherPkg + "__"
}
b.printf("%s%s", prefix, innermost.Name().Str(g.tm))
+2
View File
@@ -901,6 +901,8 @@ void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self,
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
wuffs_flate__flate_decoder__initialize(
&self->private_impl.f_flate, WUFFS_VERSION, WUFFS_BASE__ALREADY_ZEROED);
wuffs_zlib__adler32__initialize(&self->private_impl.f_adler, WUFFS_VERSION,
WUFFS_BASE__ALREADY_ZEROED);
}
+28 -28
View File
@@ -113,13 +113,13 @@ void test_wuffs_adler32() {
if (!read_file(&src, test_cases[i].filename)) {
return;
}
wuffs_flate__adler32 checksum;
wuffs_flate__adler32__initialize(&checksum, WUFFS_VERSION, 0);
wuffs_zlib__adler32 checksum;
wuffs_zlib__adler32__initialize(&checksum, WUFFS_VERSION, 0);
uint32_t got =
wuffs_flate__adler32__update(&checksum, ((wuffs_base__slice_u8){
.ptr = src.ptr + src.ri,
.len = src.wi - src.ri,
}));
wuffs_zlib__adler32__update(&checksum, ((wuffs_base__slice_u8){
.ptr = src.ptr + src.ri,
.len = src.wi - src.ri,
}));
if (got != test_cases[i].want) {
FAIL("i=%d, filename=\"%s\": got 0x%08" PRIX32 ", want 0x%08" PRIX32 "\n",
i, test_cases[i].filename, got, test_cases[i].want);
@@ -134,8 +134,8 @@ const char* wuffs_zlib_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_flate__zlib_decoder dec;
wuffs_flate__zlib_decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_zlib__decoder dec;
wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0);
uint64_t wlim = 0;
uint64_t rlim = 0;
@@ -151,17 +151,17 @@ const char* wuffs_zlib_decode(wuffs_base__buf1* dst,
src_reader.private_impl.limit.ptr_to_len = &rlim;
}
wuffs_flate__status s =
wuffs_flate__zlib_decoder__decode(&dec, dst_writer, src_reader);
wuffs_zlib__status s =
wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
if (s == WUFFS_FLATE__STATUS_OK) {
if (s == WUFFS_ZLIB__STATUS_OK) {
return NULL;
}
if ((wlimit && (s == WUFFS_FLATE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == WUFFS_FLATE__SUSPENSION_SHORT_READ))) {
if ((wlimit && (s == WUFFS_ZLIB__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == WUFFS_ZLIB__SUSPENSION_SHORT_READ))) {
continue;
}
return wuffs_flate__status__string(s);
return wuffs_zlib__status__string(s);
}
}
@@ -181,18 +181,18 @@ void test_wuffs_zlib_checksum_mismatch() {
// Flip a bit in the zlib checksum, which comes at the end of the file.
src.ptr[src.wi - 1] ^= 1;
wuffs_flate__zlib_decoder dec;
wuffs_flate__zlib_decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_zlib__decoder dec;
wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_flate__status status =
wuffs_flate__zlib_decoder__decode(&dec, got_writer, src_reader);
if (status != WUFFS_FLATE__ERROR_CHECKSUM_MISMATCH) {
wuffs_zlib__status status =
wuffs_zlib__decoder__decode(&dec, got_writer, src_reader);
if (status != WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_flate__status__string(status),
WUFFS_FLATE__ERROR_CHECKSUM_MISMATCH,
wuffs_flate__status__string(WUFFS_FLATE__ERROR_CHECKSUM_MISMATCH));
wuffs_zlib__status__string(status),
WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH,
wuffs_zlib__status__string(WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH));
return;
}
}
@@ -232,13 +232,13 @@ const char* wuffs_bench_adler32(wuffs_base__buf1* dst,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
wuffs_flate__adler32 checksum;
wuffs_flate__adler32__initialize(&checksum, WUFFS_VERSION, 0);
wuffs_zlib__adler32 checksum;
wuffs_zlib__adler32__initialize(&checksum, WUFFS_VERSION, 0);
global_wuffs_zlib_unused_u32 =
wuffs_flate__adler32__update(&checksum, ((wuffs_base__slice_u8){
.ptr = src->ptr + src->ri,
.len = src->wi - src->ri,
}));
wuffs_zlib__adler32__update(&checksum, ((wuffs_base__slice_u8){
.ptr = src->ptr + src->ri,
.len = src->wi - src->ri,
}));
src->ri = src->wi;
return NULL;
}