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

enum.c: use Qundef

Browse Source 
* enum.c (enum_inject): use Qundef for no initial values.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-10-15 05:25:36 +00:00
parent 2386407223
commit efaed8c80d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
enum.c
View File

@ -555,8 +555,7 @@ inject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
ENUM_WANT_SVALUE(); ENUM_WANT_SVALUE();
if (memo->u2.argc == 0) { if (memo->u1.value == Qundef) {
memo->u2.argc = 1;
memo->u1.value = i; memo->u1.value = i;
} }
else { else {
@ -573,12 +572,12 @@ inject_op_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
ENUM_WANT_SVALUE(); ENUM_WANT_SVALUE();
if (memo->u2.argc == 0) { if (memo->u1.value == Qundef) {
memo->u2.argc = 1;
memo->u1.value = i; memo->u1.value = i;
} }
else if (SYMBOL_P(name = memo->u3.value)) { else if (SYMBOL_P(name = memo->u3.value)) {
memo->u1.value = rb_funcall(memo->u1.value, SYM2ID(name), 1, i); const ID mid = SYM2ID(name);
memo->u1.value = rb_funcall(memo->u1.value, mid, 1, i);
} }
else { else {
VALUE args[2]; VALUE args[2];
@ -642,6 +641,7 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
switch (rb_scan_args(argc, argv, "02", &init, &op)) { switch (rb_scan_args(argc, argv, "02", &init, &op)) {
case 0: case 0:
init = Qundef;
break; break;
case 1: case 1:
if (rb_block_given_p()) { if (rb_block_given_p()) {
@ -649,8 +649,7 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
} }
id = rb_check_id(&init); id = rb_check_id(&init);
op = id ? ID2SYM(id) : init; op = id ? ID2SYM(id) : init;
argc = 0; init = Qundef;
init = Qnil;
iter = inject_op_i; iter = inject_op_i;
break; break;
case 2: case 2:
@ -662,7 +661,7 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
iter = inject_op_i; iter = inject_op_i;
break; break;
} }
memo = NEW_MEMO(init, argc, op); memo = NEW_MEMO(init, Qnil, op);
rb_block_call(obj, id_each, 0, 0, iter, (VALUE)memo); rb_block_call(obj, id_each, 0, 0, iter, (VALUE)memo);
return memo->u1.value; return memo->u1.value;
} }