diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-24 02:21:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-04-24 02:21:38 +0000 |
commit | 34c35bf1074f1a32803f380526fa511414ed3d25 (patch) | |
tree | 801f356c70badcada70f34f504f5d886cc89cc2e | |
parent | 313e34b461365768fa5432ff8e2641664f40021b (diff) | |
download | ruby-34c35bf1074f1a32803f380526fa511414ed3d25.tar.gz |
parse.y: check for symbol
* parse.y (rb_sym2id, rb_sym2id_without_pindown): return 0 for
non-symbol values, for the time being.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 10 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Apr 24 11:21:37 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (rb_sym2id, rb_sym2id_without_pindown): return 0 for + non-symbol values, for the time being. + Thu Apr 24 05:50:13 2014 NARUSE, Yui <naruse@ruby-lang.org> * parse.y (dsym_node_gen): like r45492, call rb_gc_resurrect(). @@ -10774,9 +10774,12 @@ rb_sym2id(VALUE x) if (STATIC_SYM_P(x)) { return RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT); } - else { + else if (!SPECIAL_CONST_P(x) && BUILTIN_TYPE(x) == T_SYMBOL) { return rb_pin_dynamic_symbol(x); } + else { + return 0; + } } ID @@ -10785,9 +10788,12 @@ rb_sym2id_without_pindown(VALUE x) if (STATIC_SYM_P(x)) { return RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT); } - else { + else if (!SPECIAL_CONST_P(x) && BUILTIN_TYPE(x) == T_SYMBOL) { return (ID)x; } + else { + return 0; + } } VALUE |