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

cmp_clamp: 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-11 14:20:24 +09:00
parent 3a3728e4b3
commit a93da4970b
Notes: git 2020-06-29 11:07:13 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compar.c
View File

@ -233,11 +233,9 @@ cmp_clamp(int argc, VALUE *argv, VALUE x)
} }
if (!NIL_P(max)) { if (!NIL_P(max)) {
if (excl) rb_raise(rb_eArgError, "cannot clamp with an exclusive range"); if (excl) rb_raise(rb_eArgError, "cannot clamp with an exclusive range");
if (!NIL_P(min) && cmpint(min, max) > 0) goto arg_error;
} }
} }
else if (cmpint(min, max) > 0) { if (!NIL_P(min) && !NIL_P(max) && cmpint(min, max) > 0) {
arg_error:
rb_raise(rb_eArgError, "min argument must be smaller than max argument"); rb_raise(rb_eArgError, "min argument must be smaller than max argument");
} }