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

* enum.c (id_lshift): use constant ID.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-02-16 22:33:31 +00:00
parent 2f92a267f4
commit f5d724ab19
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Feb 17 07:33:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enum.c (id_lshift): use constant ID.
Fri Feb 17 07:30:53 2012 Tanaka Akira <akr@fsij.org> Fri Feb 17 07:30:53 2012 Tanaka Akira <akr@fsij.org>
* ext/dbm/extconf.rb: refactored to split too long conditions. * ext/dbm/extconf.rb: refactored to split too long conditions.

15
enum.c
View File

@ -19,6 +19,7 @@ static ID id_next;
#define id_each idEach #define id_each idEach
#define id_eqq idEqq #define id_eqq idEqq
#define id_cmp idCmp #define id_cmp idCmp
#define id_lshift idLTLT
static VALUE static VALUE
enum_values_pack(int argc, VALUE *argv) enum_values_pack(int argc, VALUE *argv)
@ -2249,14 +2250,14 @@ chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
if (v == alone) { if (v == alone) {
if (!NIL_P(argp->prev_value)) { if (!NIL_P(argp->prev_value)) {
rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts)); rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
argp->prev_value = argp->prev_elts = Qnil; argp->prev_value = argp->prev_elts = Qnil;
} }
rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(v, rb_ary_new3(1, i))); rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(v, rb_ary_new3(1, i)));
} }
else if (NIL_P(v) || v == separator) { else if (NIL_P(v) || v == separator) {
if (!NIL_P(argp->prev_value)) { if (!NIL_P(argp->prev_value)) {
rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts)); rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
argp->prev_value = argp->prev_elts = Qnil; argp->prev_value = argp->prev_elts = Qnil;
} }
} }
@ -2273,7 +2274,7 @@ chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
rb_ary_push(argp->prev_elts, i); rb_ary_push(argp->prev_elts, i);
} }
else { else {
rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts)); rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
argp->prev_value = v; argp->prev_value = v;
argp->prev_elts = rb_ary_new3(1, i); argp->prev_elts = rb_ary_new3(1, i);
} }
@ -2300,7 +2301,7 @@ chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
rb_block_call(enumerable, id_each, 0, 0, chunk_ii, (VALUE)&arg); rb_block_call(enumerable, id_each, 0, 0, chunk_ii, (VALUE)&arg);
if (!NIL_P(arg.prev_elts)) if (!NIL_P(arg.prev_elts))
rb_funcall(arg.yielder, rb_intern("<<"), 1, rb_assoc_new(arg.prev_value, arg.prev_elts)); rb_funcall(arg.yielder, id_lshift, 1, rb_assoc_new(arg.prev_value, arg.prev_elts));
return Qnil; return Qnil;
} }
@ -2444,7 +2445,7 @@ slicebefore_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
header_p = rb_funcall(argp->sep_pred, rb_intern("call"), 2, i, argp->state); header_p = rb_funcall(argp->sep_pred, rb_intern("call"), 2, i, argp->state);
if (RTEST(header_p)) { if (RTEST(header_p)) {
if (!NIL_P(argp->prev_elts)) if (!NIL_P(argp->prev_elts))
rb_funcall(argp->yielder, rb_intern("<<"), 1, argp->prev_elts); rb_funcall(argp->yielder, id_lshift, 1, argp->prev_elts);
argp->prev_elts = rb_ary_new3(1, i); argp->prev_elts = rb_ary_new3(1, i);
} }
else { else {
@ -2475,7 +2476,7 @@ slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, (VALUE)&arg); rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, (VALUE)&arg);
if (!NIL_P(arg.prev_elts)) if (!NIL_P(arg.prev_elts))
rb_funcall(arg.yielder, rb_intern("<<"), 1, arg.prev_elts); rb_funcall(arg.yielder, id_lshift, 1, arg.prev_elts);
return Qnil; return Qnil;
} }