Rename some check_wuffs_version status messages

This commit is contained in:
Nigel Tao committed 2019-02-09 14:56:27 +11:00
1 parent 451301137f
commit 4f76d2f893
5 files changed
+36 -36

No files matched your search

+1 -1
View File
@@ -971,7 +971,7 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
b.writes("if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {\n") b.writes("if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {\n")
b.writes("memset(self, 0, sizeof_star_self);\n") b.writes("memset(self, 0, sizeof_star_self);\n")
b.writes("} else if (self->private_impl.magic != 0) {\n") b.writes("} else if (self->private_impl.magic != 0) {\n")
b.writes("return wuffs_base__error__check_wuffs_version_not_applicable;\n") b.writes("return wuffs_base__error__initialize_falsely_claimed_already_zeroed;\n")
b.writes("}\n") b.writes("}\n")
// Call any ctors on sub-structs. // Call any ctors on sub-structs.
+1 -1
View File
@@ -248,7 +248,7 @@ func (g *gen) writeFuncImplPrologue(b *buffer) error {
if g.currFunk.returnsStatus { if g.currFunk.returnsStatus {
b.writes("(self->private_impl.magic == WUFFS_BASE__DISABLED) " + b.writes("(self->private_impl.magic == WUFFS_BASE__DISABLED) " +
"? wuffs_base__error__disabled_by_previous_error " + "? wuffs_base__error__disabled_by_previous_error " +
": wuffs_base__error__check_wuffs_version_missing") ": wuffs_base__error__initialize_not_called")
} else if err := g.writeOutParamZeroValue(b, out); err != nil { } else if err := g.writeOutParamZeroValue(b, out); err != nil {
return err return err
} }
+2 -2
View File
@@ -37,9 +37,9 @@ var Statuses = [...]string{
`"?bad workbuf length"`, `"?bad workbuf length"`,
`"?bad wuffs version"`, `"?bad wuffs version"`,
`"?cannot return a suspension"`, `"?cannot return a suspension"`,
`"?check_wuffs_version not applicable"`,
`"?check_wuffs_version missing"`,
`"?disabled by previous error"`, `"?disabled by previous error"`,
`"?initialize falsely claimed already zeroed"`,
`"?initialize not called"`,
`"?interleaved coroutine calls"`, `"?interleaved coroutine calls"`,
} }
+21 -21
View File
@@ -155,9 +155,9 @@ extern const char* wuffs_base__error__bad_sizeof_receiver;
extern const char* wuffs_base__error__bad_workbuf_length; extern const char* wuffs_base__error__bad_workbuf_length;
extern const char* wuffs_base__error__bad_wuffs_version; extern const char* wuffs_base__error__bad_wuffs_version;
extern const char* wuffs_base__error__cannot_return_a_suspension; extern const char* wuffs_base__error__cannot_return_a_suspension;
extern const char* wuffs_base__error__check_wuffs_version_not_applicable;
extern const char* wuffs_base__error__check_wuffs_version_missing;
extern const char* wuffs_base__error__disabled_by_previous_error; extern const char* wuffs_base__error__disabled_by_previous_error;
extern const char* wuffs_base__error__initialize_falsely_claimed_already_zeroed;
extern const char* wuffs_base__error__initialize_not_called;
extern const char* wuffs_base__error__interleaved_coroutine_calls; extern const char* wuffs_base__error__interleaved_coroutine_calls;
static inline bool // static inline bool //
@@ -4753,12 +4753,12 @@ const char* wuffs_base__error__bad_workbuf_length = "?base: bad workbuf length";
const char* wuffs_base__error__bad_wuffs_version = "?base: bad wuffs version"; const char* wuffs_base__error__bad_wuffs_version = "?base: bad wuffs version";
const char* wuffs_base__error__cannot_return_a_suspension = const char* wuffs_base__error__cannot_return_a_suspension =
"?base: cannot return a suspension"; "?base: cannot return a suspension";
const char* wuffs_base__error__check_wuffs_version_not_applicable =
"?base: check_wuffs_version not applicable";
const char* wuffs_base__error__check_wuffs_version_missing =
"?base: check_wuffs_version missing";
const char* wuffs_base__error__disabled_by_previous_error = const char* wuffs_base__error__disabled_by_previous_error =
"?base: disabled by previous error"; "?base: disabled by previous error";
const char* wuffs_base__error__initialize_falsely_claimed_already_zeroed =
"?base: initialize falsely claimed already zeroed";
const char* wuffs_base__error__initialize_not_called =
"?base: initialize not called";
const char* wuffs_base__error__interleaved_coroutine_calls = const char* wuffs_base__error__interleaved_coroutine_calls =
"?base: interleaved coroutine calls"; "?base: interleaved coroutine calls";
@@ -4951,7 +4951,7 @@ wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {
memset(self, 0, sizeof_star_self); memset(self, 0, sizeof_star_self);
} else if (self->private_impl.magic != 0) { } else if (self->private_impl.magic != 0) {
return wuffs_base__error__check_wuffs_version_not_applicable; return wuffs_base__error__initialize_falsely_claimed_already_zeroed;
} }
self->private_impl.magic = WUFFS_BASE__MAGIC; self->private_impl.magic = WUFFS_BASE__MAGIC;
return NULL; return NULL;
@@ -5950,7 +5950,7 @@ wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {
memset(self, 0, sizeof_star_self); memset(self, 0, sizeof_star_self);
} else if (self->private_impl.magic != 0) { } else if (self->private_impl.magic != 0) {
return wuffs_base__error__check_wuffs_version_not_applicable; return wuffs_base__error__initialize_falsely_claimed_already_zeroed;
} }
self->private_impl.magic = WUFFS_BASE__MAGIC; self->private_impl.magic = WUFFS_BASE__MAGIC;
return NULL; return NULL;
@@ -6228,7 +6228,7 @@ wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {
memset(self, 0, sizeof_star_self); memset(self, 0, sizeof_star_self);
} else if (self->private_impl.magic != 0) { } else if (self->private_impl.magic != 0) {
return wuffs_base__error__check_wuffs_version_not_applicable; return wuffs_base__error__initialize_falsely_claimed_already_zeroed;
} }
self->private_impl.magic = WUFFS_BASE__MAGIC; self->private_impl.magic = WUFFS_BASE__MAGIC;
return NULL; return NULL;
@@ -6276,7 +6276,7 @@ wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self,
if (self->private_impl.magic != WUFFS_BASE__MAGIC) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
return (self->private_impl.magic == WUFFS_BASE__DISABLED) return (self->private_impl.magic == WUFFS_BASE__DISABLED)
? wuffs_base__error__disabled_by_previous_error ? wuffs_base__error__disabled_by_previous_error
: wuffs_base__error__check_wuffs_version_missing; : wuffs_base__error__initialize_not_called;
} }
if ((self->private_impl.active_coroutine != 0) && if ((self->private_impl.active_coroutine != 0) &&
(self->private_impl.active_coroutine != 1)) { (self->private_impl.active_coroutine != 1)) {
@@ -8011,7 +8011,7 @@ wuffs_lzw__decoder__initialize(wuffs_lzw__decoder* self,
if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {
memset(self, 0, sizeof_star_self); memset(self, 0, sizeof_star_self);
} else if (self->private_impl.magic != 0) { } else if (self->private_impl.magic != 0) {
return wuffs_base__error__check_wuffs_version_not_applicable; return wuffs_base__error__initialize_falsely_claimed_already_zeroed;
} }
self->private_impl.magic = WUFFS_BASE__MAGIC; self->private_impl.magic = WUFFS_BASE__MAGIC;
return NULL; return NULL;
@@ -8078,7 +8078,7 @@ wuffs_lzw__decoder__decode_io_writer(wuffs_lzw__decoder* self,
if (self->private_impl.magic != WUFFS_BASE__MAGIC) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
return (self->private_impl.magic == WUFFS_BASE__DISABLED) return (self->private_impl.magic == WUFFS_BASE__DISABLED)
? wuffs_base__error__disabled_by_previous_error ? wuffs_base__error__disabled_by_previous_error
: wuffs_base__error__check_wuffs_version_missing; : wuffs_base__error__initialize_not_called;
} }
if ((self->private_impl.active_coroutine != 0) && if ((self->private_impl.active_coroutine != 0) &&
(self->private_impl.active_coroutine != 1)) { (self->private_impl.active_coroutine != 1)) {
@@ -8587,7 +8587,7 @@ wuffs_gif__decoder__initialize(wuffs_gif__decoder* self,
if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {
memset(self, 0, sizeof_star_self); memset(self, 0, sizeof_star_self);
} else if (self->private_impl.magic != 0) { } else if (self->private_impl.magic != 0) {
return wuffs_base__error__check_wuffs_version_not_applicable; return wuffs_base__error__initialize_falsely_claimed_already_zeroed;
} }
{ {
wuffs_base__status z = wuffs_lzw__decoder__initialize( wuffs_base__status z = wuffs_lzw__decoder__initialize(
@@ -8628,7 +8628,7 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self,
if (self->private_impl.magic != WUFFS_BASE__MAGIC) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
return (self->private_impl.magic == WUFFS_BASE__DISABLED) return (self->private_impl.magic == WUFFS_BASE__DISABLED)
? wuffs_base__error__disabled_by_previous_error ? wuffs_base__error__disabled_by_previous_error
: wuffs_base__error__check_wuffs_version_missing; : wuffs_base__error__initialize_not_called;
} }
if ((self->private_impl.active_coroutine != 0) && if ((self->private_impl.active_coroutine != 0) &&
(self->private_impl.active_coroutine != 1)) { (self->private_impl.active_coroutine != 1)) {
@@ -8791,7 +8791,7 @@ wuffs_gif__decoder__restart_frame(wuffs_gif__decoder* self,
if (self->private_impl.magic != WUFFS_BASE__MAGIC) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
return (self->private_impl.magic == WUFFS_BASE__DISABLED) return (self->private_impl.magic == WUFFS_BASE__DISABLED)
? wuffs_base__error__disabled_by_previous_error ? wuffs_base__error__disabled_by_previous_error
: wuffs_base__error__check_wuffs_version_missing; : wuffs_base__error__initialize_not_called;
} }
if (self->private_impl.f_call_sequence == 0) { if (self->private_impl.f_call_sequence == 0) {
@@ -8818,7 +8818,7 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self,
if (self->private_impl.magic != WUFFS_BASE__MAGIC) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
return (self->private_impl.magic == WUFFS_BASE__DISABLED) return (self->private_impl.magic == WUFFS_BASE__DISABLED)
? wuffs_base__error__disabled_by_previous_error ? wuffs_base__error__disabled_by_previous_error
: wuffs_base__error__check_wuffs_version_missing; : wuffs_base__error__initialize_not_called;
} }
if ((self->private_impl.active_coroutine != 0) && if ((self->private_impl.active_coroutine != 0) &&
(self->private_impl.active_coroutine != 2)) { (self->private_impl.active_coroutine != 2)) {
@@ -9018,7 +9018,7 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
if (self->private_impl.magic != WUFFS_BASE__MAGIC) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
return (self->private_impl.magic == WUFFS_BASE__DISABLED) return (self->private_impl.magic == WUFFS_BASE__DISABLED)
? wuffs_base__error__disabled_by_previous_error ? wuffs_base__error__disabled_by_previous_error
: wuffs_base__error__check_wuffs_version_missing; : wuffs_base__error__initialize_not_called;
} }
if (!a_dst) { if (!a_dst) {
self->private_impl.magic = WUFFS_BASE__DISABLED; self->private_impl.magic = WUFFS_BASE__DISABLED;
@@ -10747,7 +10747,7 @@ wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self,
if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {
memset(self, 0, sizeof_star_self); memset(self, 0, sizeof_star_self);
} else if (self->private_impl.magic != 0) { } else if (self->private_impl.magic != 0) {
return wuffs_base__error__check_wuffs_version_not_applicable; return wuffs_base__error__initialize_falsely_claimed_already_zeroed;
} }
{ {
wuffs_base__status z = wuffs_crc32__ieee_hasher__initialize( wuffs_base__status z = wuffs_crc32__ieee_hasher__initialize(
@@ -10826,7 +10826,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self,
if (self->private_impl.magic != WUFFS_BASE__MAGIC) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
return (self->private_impl.magic == WUFFS_BASE__DISABLED) return (self->private_impl.magic == WUFFS_BASE__DISABLED)
? wuffs_base__error__disabled_by_previous_error ? wuffs_base__error__disabled_by_previous_error
: wuffs_base__error__check_wuffs_version_missing; : wuffs_base__error__initialize_not_called;
} }
if ((self->private_impl.active_coroutine != 0) && if ((self->private_impl.active_coroutine != 0) &&
(self->private_impl.active_coroutine != 1)) { (self->private_impl.active_coroutine != 1)) {
@@ -11220,7 +11220,7 @@ wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self,
if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) { if ((initialize_flags & WUFFS_INITIALIZE__ALREADY_ZEROED) == 0) {
memset(self, 0, sizeof_star_self); memset(self, 0, sizeof_star_self);
} else if (self->private_impl.magic != 0) { } else if (self->private_impl.magic != 0) {
return wuffs_base__error__check_wuffs_version_not_applicable; return wuffs_base__error__initialize_falsely_claimed_already_zeroed;
} }
{ {
wuffs_base__status z = wuffs_adler32__hasher__initialize( wuffs_base__status z = wuffs_adler32__hasher__initialize(
@@ -11299,7 +11299,7 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self,
if (self->private_impl.magic != WUFFS_BASE__MAGIC) { if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
return (self->private_impl.magic == WUFFS_BASE__DISABLED) return (self->private_impl.magic == WUFFS_BASE__DISABLED)
? wuffs_base__error__disabled_by_previous_error ? wuffs_base__error__disabled_by_previous_error
: wuffs_base__error__check_wuffs_version_missing; : wuffs_base__error__initialize_not_called;
} }
if ((self->private_impl.active_coroutine != 0) && if ((self->private_impl.active_coroutine != 0) &&
(self->private_impl.active_coroutine != 1)) { (self->private_impl.active_coroutine != 1)) {
+11 -11
View File
@@ -106,15 +106,15 @@ const char* test_basic_bad_wuffs_version() {
return NULL; return NULL;
} }
const char* test_basic_check_wuffs_version_not_called() { const char* test_basic_initialize_not_called() {
CHECK_FOCUS(__func__); CHECK_FOCUS(__func__);
wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_base__image_config ic = ((wuffs_base__image_config){}); wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src = ((wuffs_base__io_reader){}); wuffs_base__io_reader src = ((wuffs_base__io_reader){});
const char* status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src); const char* status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src);
if (status != wuffs_base__error__check_wuffs_version_missing) { if (status != wuffs_base__error__initialize_not_called) {
RETURN_FAIL("decode_image_config: got \"%s\", want \"%s\"", status, RETURN_FAIL("decode_image_config: got \"%s\", want \"%s\"", status,
wuffs_base__error__check_wuffs_version_missing); wuffs_base__error__initialize_not_called);
} }
return NULL; return NULL;
} }
@@ -1589,14 +1589,14 @@ proc tests[] = {
// These basic tests are really testing the Wuffs compiler. They aren't // These basic tests are really testing the Wuffs compiler. They aren't
// specific to the std/gif code, but putting them here is as good as any // specific to the std/gif code, but putting them here is as good as any
// other place. // other place.
test_basic_bad_receiver, // test_basic_bad_receiver, //
test_basic_bad_sizeof_receiver, // test_basic_bad_sizeof_receiver, //
test_basic_bad_wuffs_version, // test_basic_bad_wuffs_version, //
test_basic_check_wuffs_version_not_called, // test_basic_initialize_not_called, //
test_basic_status_is_error, // test_basic_status_is_error, //
test_basic_status_strings, // test_basic_status_strings, //
test_basic_status_used_package, // test_basic_status_used_package, //
test_basic_sub_struct_initializer, // test_basic_sub_struct_initializer, //
test_wuffs_gif_call_interleaved, // test_wuffs_gif_call_interleaved, //
test_wuffs_gif_call_sequence, // test_wuffs_gif_call_sequence, //