merge revision(s) 52777: [Backport #11748]

	* parse.y (parser_here_document): store dispatched result of
	  on_tstring_content at the last fragment of a here document.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/parse.y b/parse.y
index dfeadb0918..6fb911b4b0 100644
--- a/parse.y
+++ b/parse.y
@@ -6742,6 +6742,10 @@ parser_here_document(struct parser_params *parser, NODE *here)
 	str = STR_NEW3(tok(), toklen(), enc, func);
     }
     dispatch_heredoc_end();
+#ifdef RIPPER
+    str = ripper_new_yylval(ripper_token2eventid(tSTRING_CONTENT),
+			    yylval.val, str);
+#endif
     heredoc_restore(lex_strterm);
     lex_strterm = NEW_STRTERM(-1, 0, 0);
     set_yylval_str(str);