summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-24 02:21:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-24 02:21:38 +0000
commit34c35bf1074f1a32803f380526fa511414ed3d25 (patch)
tree801f356c70badcada70f34f504f5d886cc89cc2e /parse.y
parent313e34b461365768fa5432ff8e2641664f40021b (diff)
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
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y10
1 files changed, 8 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 30ea0c8133..7820b0b4ac 100644
--- a/parse.y
+++ b/parse.y
@@ -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