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

replace hand-written argument check by call to rb_scan_args in unicode_normalize_common

Browse Source 
In string.c, replace hand-written argument count check by call to rb_scan_args.
This allows to use rb_funcallv once, rather than using rb_funcall twice.
Thanks to Hanmac (Hans Mackowiak) for the idea, see
https://bugs.ruby-lang.org/issues/11078#note-7.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2017-05-09 11:13:45 +00:00
parent 88892c8d65
commit a4301ec214
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
string.c
View File

@ -9592,17 +9592,14 @@ static VALUE
unicode_normalize_common(int argc, VALUE *argv, VALUE str, ID id)
{
static int UnicodeNormalizeRequired = 0;
VALUE argv2[2] = { str };
if (!UnicodeNormalizeRequired) {
rb_require("unicode_normalize/normalize.rb");
UnicodeNormalizeRequired = 1;
}
if (argc==0)
return rb_funcall(mUnicodeNormalize, id, 1, str);
else if (argc==1)
return rb_funcall(mUnicodeNormalize, id, 2, str, argv[0]);
else
rb_raise(rb_eArgError, "too many arguments to unicode normalization function");
rb_scan_args(argc, argv, "01", &argv2[1]);
return rb_funcallv(mUnicodeNormalize, id, argc+1, argv2);
}
/*