aboutsummaryrefslogtreecommitdiffstats
path: root/parse.y
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-10 13:48:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-10 13:48:51 +0000
commitb4efab9ed9e2e945b230c8c5cefd0172a02b8eb5 (patch)
treef170f5a1046873ffd627e7b361f9efb1d783172f /parse.y
parent9fb0863f4f760dfb1b5deb47b37a32cc96b26478 (diff)
downloadruby-b4efab9ed9e2e945b230c8c5cefd0172a02b8eb5.tar.gz
parse.y: keep literal encoding
* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal encoding beginning with an interpolation same as the source file encoding. [ruby-core:70703] [Bug #11519] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y4
1 files changed, 2 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index b4c8c9ad05..dbcb6544ae 100644
--- a/parse.y
+++ b/parse.y
@@ -8725,7 +8725,7 @@ literal_concat_gen(struct parser_params *parser, NODE *head, NODE *tail)
htype = nd_type(head);
if (htype == NODE_EVSTR) {
- NODE *node = NEW_DSTR(Qnil);
+ NODE *node = NEW_DSTR(STR_NEW0());
head = list_append(node, head);
htype = NODE_DSTR;
}
@@ -8798,7 +8798,7 @@ static NODE *
evstr2dstr_gen(struct parser_params *parser, NODE *node)
{
if (nd_type(node) == NODE_EVSTR) {
- node = list_append(NEW_DSTR(Qnil), node);
+ node = list_append(NEW_DSTR(STR_NEW0()), node);
}
return node;
}