Tweak the order of generated C's u_r and v_r vars

This commit is contained in:
Nigel Tao committed 2019-07-07 17:43:57 +10:00
1 parent 4f489d66ce
commit a36bf4be4c
2 files changed
+12 -16

No files matched your search

+10 -13
View File
@@ -272,6 +272,11 @@ func (g *gen) writeVars(b *buffer, f *funk, inStructDecl bool) error {
}
name := n.Name().Str(g.tm)
if typ.IsIOType() {
b.printf("wuffs_base__io_buffer %s%s = wuffs_base__null_io_buffer();\n", uPrefix, name)
}
if err := g.writeCTypeName(b, typ, vPrefix, name); err != nil {
return err
}
@@ -284,24 +289,16 @@ func (g *gen) writeVars(b *buffer, f *funk, inStructDecl bool) error {
} else if typ.IsStatus() {
b.writes(" = NULL;\n")
} else if typ.IsIOType() {
typName := "reader"
if typ.QID()[1] == t.IDIOWriter {
typName = "writer"
}
b.printf(" = wuffs_base__null_io_%s();\n", typName)
b.printf(" = &%s%s;\n", uPrefix, name)
} else {
b.writes(" = {0};\n")
}
if typ.IsIOType() {
b.printf("wuffs_base__io_buffer %s%s WUFFS_BASE__POTENTIALLY_UNUSED = "+
"wuffs_base__null_io_buffer();\n", uPrefix, name)
preName := vPrefix + name
// TODO: io1_etc variables?
b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", iopPrefix, preName)
b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", io0Prefix, preName)
b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", io1Prefix, preName)
b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", io2Prefix, preName)
b.printf("uint8_t* %s%s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", iopPrefix, vPrefix, name)
b.printf("uint8_t* %s%s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", io0Prefix, vPrefix, name)
b.printf("uint8_t* %s%s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", io1Prefix, vPrefix, name)
b.printf("uint8_t* %s%s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;\n", io2Prefix, vPrefix, name)
}
}
return nil
+2 -3
View File
@@ -10785,9 +10785,8 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self,
bool v_need_block_size = false;
uint64_t v_n_compressed = 0;
wuffs_base__slice_u8 v_compressed = {0};
wuffs_base__io_buffer* v_r = wuffs_base__null_io_reader();
wuffs_base__io_buffer u_r WUFFS_BASE__POTENTIALLY_UNUSED =
wuffs_base__null_io_buffer();
wuffs_base__io_buffer u_r = wuffs_base__null_io_buffer();
wuffs_base__io_buffer* v_r = &u_r;
uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;