From aad72320354dd5893e49b91952789c5163beb6b2 Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 27 Nov 2015 21:38:54 +0000 Subject: merge revision(s) 51820: [Backport #11519] * 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/branches/ruby_2_2@52773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 9df51a19b9..dfeadb0918 100644 --- a/parse.y +++ b/parse.y @@ -8744,7 +8744,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; } @@ -8817,7 +8817,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; } -- cgit v1.2.3