diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 35cc7a58..f47f71f0 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -25,6 +25,7 @@ var StatusList = [...]string{ "$short write", "?bad argument (length too short)", "?bad argument", + "?bad call sequence", "?bad receiver", "?bad sizeof receiver", "?bad wuffs version", @@ -32,7 +33,6 @@ var StatusList = [...]string{ "?check_wuffs_version not applicable", "?check_wuffs_version missing", "?disabled by previous error", - "?invalid call sequence", } var StatusMap = map[string]bool{} diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index 0547abd6..167889ef 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -137,6 +137,7 @@ extern const char* wuffs_base__suspension__short_read; extern const char* wuffs_base__suspension__short_write; extern const char* wuffs_base__error__bad_argument_length_too_short; extern const char* wuffs_base__error__bad_argument; +extern const char* wuffs_base__error__bad_call_sequence; extern const char* wuffs_base__error__bad_receiver; extern const char* wuffs_base__error__bad_sizeof_receiver; extern const char* wuffs_base__error__bad_wuffs_version; @@ -144,7 +145,6 @@ 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__invalid_call_sequence; static inline bool // wuffs_base__status__is_error(wuffs_base__status z) { @@ -3622,6 +3622,7 @@ const char* wuffs_base__suspension__short_write = "$base: short write"; const char* wuffs_base__error__bad_argument_length_too_short = "?base: bad argument (length too short)"; const char* wuffs_base__error__bad_argument = "?base: bad argument"; +const char* wuffs_base__error__bad_call_sequence = "?base: bad call sequence"; const char* wuffs_base__error__bad_receiver = "?base: bad receiver"; const char* wuffs_base__error__bad_sizeof_receiver = "?base: bad sizeof receiver"; @@ -3634,8 +3635,6 @@ const char* wuffs_base__error__check_wuffs_version_missing = "?base: check_wuffs_version missing"; const char* wuffs_base__error__disabled_by_previous_error = "?base: disabled by previous error"; -const char* wuffs_base__error__invalid_call_sequence = - "?base: invalid call sequence"; #endif // !defined(WUFFS_CONFIG__MODULES) || // defined(WUFFS_CONFIG__MODULE__BASE) @@ -6377,7 +6376,7 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; if (self->private_impl.f_call_sequence >= 1) { - status = wuffs_base__error__invalid_call_sequence; + status = wuffs_base__error__bad_call_sequence; goto exit; } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); @@ -6495,7 +6494,7 @@ wuffs_gif__decoder__reset_for_decode_frame(wuffs_gif__decoder* self, wuffs_base__status status = NULL; if (self->private_impl.f_call_sequence == 0) { - status = wuffs_base__error__invalid_call_sequence; + status = wuffs_base__error__bad_call_sequence; goto exit; } self->private_impl.f_num_decoded_frame_configs_value = diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index e8bd8f83..e7de4ef4 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -117,7 +117,7 @@ pub struct decoder?( pub func decoder.decode_image_config!??(dst nptr base.image_config, src base.io_reader) { if this.call_sequence >= 1 { - return status "?invalid call sequence" + return status "?bad call sequence" } this.decode_header!??(src:args.src) this.decode_lsd!??(src:args.src) @@ -167,7 +167,7 @@ pub func decoder.work_buffer_size() base.range_ii_u64 { pub func decoder.reset_for_decode_frame!??(fc ptr base.frame_config) { if this.call_sequence == 0 { - return status "?invalid call sequence" + return status "?bad call sequence" } // TODO: change ~sat+ to + or change the semantics so that the io_position // is before, not after, the frame config. diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 6630bf6b..1e4a5ec1 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -469,9 +469,9 @@ void test_wuffs_gif_call_sequence() { } z = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader); - if (z != wuffs_base__error__invalid_call_sequence) { + if (z != wuffs_base__error__bad_call_sequence) { FAIL("decode_image_config: got \"%s\", want \"%s\"", z, - wuffs_base__error__invalid_call_sequence); + wuffs_base__error__bad_call_sequence); return; } }