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

rb_enc_cr_str_buf_cat: 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-17 14:59:44 +09:00
parent 31a770ac48
commit 6df790f22e
Notes: git 2020-06-29 11:06:49 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
string.c
View File

@ -2975,9 +2975,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
ptr_cr != ENC_CODERANGE_7BIT) { ptr_cr != ENC_CODERANGE_7BIT) {
str_enc = rb_enc_from_index(str_encindex); str_enc = rb_enc_from_index(str_encindex);
ptr_enc = rb_enc_from_index(ptr_encindex); ptr_enc = rb_enc_from_index(ptr_encindex);
incompatible: goto incompatible;
rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
rb_enc_name(str_enc), rb_enc_name(ptr_enc));
} }
if (str_cr == ENC_CODERANGE_UNKNOWN) { if (str_cr == ENC_CODERANGE_UNKNOWN) {
@ -3013,6 +3011,10 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
str_buf_cat(str, ptr, len); str_buf_cat(str, ptr, len);
ENCODING_CODERANGE_SET(str, res_encindex, res_cr); ENCODING_CODERANGE_SET(str, res_encindex, res_cr);
return str; return str;
incompatible:
rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s",
rb_enc_name(str_enc), rb_enc_name(ptr_enc));
} }
VALUE VALUE