diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-28 08:15:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-28 08:15:42 +0000 |
| commit | 95d1b61a146f9e88564d3df7e648b78881741a61 (patch) | |
| tree | 80a5e7736295617b89cdd4c1b16d631b00daa759 /enum.c | |
| parent | e4c92f24fe23fbadc1a92f4e545b2a594ea56cba (diff) | |
| download | ruby-95d1b61a146f9e88564d3df7e648b78881741a61.tar.gz | |
symbols instead of IDs
* encoding.c (rb_enc_get_index): deal with symbols instead of IDs
to get rid of inadvertent pin-downs.
* enum.c (chunk_ii): ditto.
* enumerator.c (append_method): ditto.
* iseq.c (iseq_load): ditto.
* marshal.c (w_symbol, r_symlink, r_symreal, r_symbol): ditto.
* signal.c (trap_handler): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enum.c')
| -rw-r--r-- | enum.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2679,7 +2679,7 @@ static VALUE chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp)) { struct chunk_arg *argp = MEMO_FOR(struct chunk_arg, _argp); - VALUE v; + VALUE v, s; VALUE alone = ID2SYM(rb_intern("_alone")); VALUE separator = ID2SYM(rb_intern("_separator")); @@ -2703,7 +2703,7 @@ chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp)) argp->prev_value = argp->prev_elts = Qnil; } } - else if (SYMBOL_P(v) && rb_id2name(SYM2ID(v))[0] == '_') { + else if (SYMBOL_P(v) && (s = rb_sym2str(v), RSTRING_PTR(s)[0] == '_')) { rb_raise(rb_eRuntimeError, "symbols beginning with an underscore are reserved"); } else { |