1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make_econv_exception: do not goto into a branch

Browse Source 
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea.  Better refactor.
This commit is contained in:
卜部昌平 2020-06-19 14:14:02 +09:00
parent fd0e935886
commit 3d636eccfc
Notes: git 2020-06-29 11:06:39 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
transcode.c
View File

@ -2047,7 +2047,6 @@ make_econv_exception(rb_econv_t *ec)
size_t readagain_len = ec->last_error.readagain_len; size_t readagain_len = ec->last_error.readagain_len;
VALUE bytes2 = Qnil; VALUE bytes2 = Qnil;
VALUE dumped2; VALUE dumped2;
int idx;
if (ec->last_error.result == econv_incomplete_input) { if (ec->last_error.result == econv_incomplete_input) {
mesg = rb_sprintf("incomplete %s on %s", mesg = rb_sprintf("incomplete %s on %s",
StringValueCStr(dumped), StringValueCStr(dumped),
@ -2071,17 +2070,7 @@ make_econv_exception(rb_econv_t *ec)
rb_ivar_set(exc, rb_intern("error_bytes"), bytes); rb_ivar_set(exc, rb_intern("error_bytes"), bytes);
rb_ivar_set(exc, rb_intern("readagain_bytes"), bytes2); rb_ivar_set(exc, rb_intern("readagain_bytes"), bytes2);
rb_ivar_set(exc, rb_intern("incomplete_input"), ec->last_error.result == econv_incomplete_input ? Qtrue : Qfalse); rb_ivar_set(exc, rb_intern("incomplete_input"), ec->last_error.result == econv_incomplete_input ? Qtrue : Qfalse);
goto set_encs;
set_encs:
rb_ivar_set(exc, rb_intern("source_encoding_name"), rb_str_new2(ec->last_error.source_encoding));
rb_ivar_set(exc, rb_intern("destination_encoding_name"), rb_str_new2(ec->last_error.destination_encoding));
idx = rb_enc_find_index(ec->last_error.source_encoding);
if (0 <= idx)
rb_ivar_set(exc, rb_intern("source_encoding"), rb_enc_from_encoding(rb_enc_from_index(idx)));
idx = rb_enc_find_index(ec->last_error.destination_encoding);
if (0 <= idx)
rb_ivar_set(exc, rb_intern("destination_encoding"), rb_enc_from_encoding(rb_enc_from_index(idx)));
return exc;
} }
if (ec->last_error.result == econv_undefined_conversion) { if (ec->last_error.result == econv_undefined_conversion) {
VALUE bytes = rb_str_new((const char *)ec->last_error.error_bytes_start, VALUE bytes = rb_str_new((const char *)ec->last_error.error_bytes_start,
@ -2133,6 +2122,17 @@ make_econv_exception(rb_econv_t *ec)
goto set_encs; goto set_encs;
} }
return Qnil; return Qnil;
set_encs:
rb_ivar_set(exc, rb_intern("source_encoding_name"), rb_str_new2(ec->last_error.source_encoding));
rb_ivar_set(exc, rb_intern("destination_encoding_name"), rb_str_new2(ec->last_error.destination_encoding));
int idx = rb_enc_find_index(ec->last_error.source_encoding);
if (0 <= idx)
rb_ivar_set(exc, rb_intern("source_encoding"), rb_enc_from_encoding(rb_enc_from_index(idx)));
idx = rb_enc_find_index(ec->last_error.destination_encoding);
if (0 <= idx)
rb_ivar_set(exc, rb_intern("destination_encoding"), rb_enc_from_encoding(rb_enc_from_index(idx)));
return exc;
} }
static void static void