summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-28 07:37:22 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-28 07:37:22 +0000
commit3f23ee7015448fbc33515dd8168c7b4d370c26e4 (patch)
treef9ce8f908fee424089f3be9aa34cbb9486e18e74 /parse.y
parentbcafeef2e753b4f02bea2e73bd5082bb789bea26 (diff)
merge revision(s) 48484: [Backport #10524]
* parse.y (symbol_list): fix the node type of literal symbol list with no interpolation. [ruby-core:66343] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y8
1 files changed, 7 insertions, 1 deletions
diff --git a/parse.y b/parse.y
index 00b1a4cba9..7484f4e53b 100644
--- a/parse.y
+++ b/parse.y
@@ -4043,7 +4043,13 @@ symbol_list : /* none */
{
/*%%%*/
$2 = evstr2dstr($2);
- nd_set_type($2, NODE_DSYM);
+ if (nd_type($2) == NODE_DSTR) {
+ nd_set_type($2, NODE_DSYM);
+ }
+ else {
+ nd_set_type($2, NODE_LIT);
+ $2->nd_lit = rb_str_intern($2->nd_lit);
+ }
$$ = list_append($1, $2);
/*%
$$ = dispatch2(symbols_add, $1, $2);