merge revision(s) 62723,62724: [Backport #14584]

        parse.y: reduce duplicate code

        parse.y: fix interpolated string literal dedent

        * parse.y (heredoc_dedent): fix interpolated string literal dedent,
          remove indentations from only nodes with the newline flag.
          [ruby-core:85983] [Bug #14584]

        * parse.y (here_document): set the newline flag on literal string
          nodes starting at the beginning of line.


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

3 files changed, 24 insertions, 13 deletions

diff --git a/parse.y b/parse.y
index 6b74a63891..7d5c7d23ef 100644
--- a/parse.y
+++ b/parse.y
@@ -6817,7 +6817,6 @@ static NODE *
 parser_heredoc_dedent(struct parser_params *parser, NODE *root)
 {
     NODE *node, *str_node;
-    int bol = TRUE;
     int indent = heredoc_indent;
 
     if (indent <= 0) return root;
@@ -6829,15 +6828,15 @@ parser_heredoc_dedent(struct parser_params *parser, NODE *root)
 
     while (str_node) {
 	VALUE lit = str_node->nd_lit;
-	if (bol) dedent_string(lit, indent);
-	bol = TRUE;
+	if (str_node->flags & NODE_FL_NEWLINE) {
+	    dedent_string(lit, indent);
+	}
 
 	str_node = 0;
 	while ((node = node->nd_next) != 0 && nd_type(node) == NODE_ARRAY) {
 	    if ((str_node = node->nd_head) != 0) {
 		enum node_type type = nd_type(str_node);
 		if (type == NODE_STR || type == NODE_DSTR) break;
-		bol = FALSE;
 		str_node = 0;
 	    }
 	}
@@ -6980,6 +6979,7 @@ parser_here_document(struct parser_params *parser, rb_strterm_heredoc_t *here)
     long len;
     VALUE str = 0;
     rb_encoding *enc = current_enc;
+    int bol;
 
     eos = RSTRING_PTR(here->term);
     len = RSTRING_LEN(here->term) - 2; /* here->term includes term_len and func */
@@ -7018,7 +7018,8 @@ parser_here_document(struct parser_params *parser, rb_strterm_heredoc_t *here)
 	lex_strterm = 0;
 	return 0;
     }
-    if (was_bol() && whole_match_p(eos, len, indent)) {
+    bol = was_bol();
+    if (bol && whole_match_p(eos, len, indent)) {
 	dispatch_heredoc_end();
 	heredoc_restore(&lex_strterm->u.heredoc);
 	lex_strterm = 0;
@@ -7056,10 +7057,7 @@ parser_here_document(struct parser_params *parser, rb_strterm_heredoc_t *here)
 	    if (pend < lex_pend) rb_str_cat(str, "\n", 1);
 	    lex_goto_eol(parser);
 	    if (heredoc_indent > 0) {
-		set_yylval_str(str);
-		add_mark_object(str);
-		flush_string_content(enc);
-		return tSTRING_CONTENT;
+		goto flush_str;
 	    }
 	    if (nextc() == -1) {
 		if (str) {
@@ -7092,10 +7090,14 @@ parser_here_document(struct parser_params *parser, rb_strterm_heredoc_t *here)
 		goto restore;
 	    }
 	    if (c != '\n') {
-		VALUE lit;
 	      flush:
-		add_mark_object(lit = STR_NEW3(tok(), toklen(), enc, func));
-		set_yylval_str(lit);
+		str = STR_NEW3(tok(), toklen(), enc, func);
+	      flush_str:
+		set_yylval_str(str);
+		add_mark_object(str);
+#ifndef RIPPER
+		if (bol) yylval.node->flags |= NODE_FL_NEWLINE;
+#endif
 		flush_string_content(enc);
 		return tSTRING_CONTENT;
 	    }
@@ -7118,6 +7120,9 @@ parser_here_document(struct parser_params *parser, rb_strterm_heredoc_t *here)
     lex_strterm = NEW_STRTERM(func | STR_FUNC_TERM, 0, 0);
     set_yylval_str(str);
     add_mark_object(str);
+#ifndef RIPPER
+    if (bol) yylval.node->flags |= NODE_FL_NEWLINE;
+#endif
     return tSTRING_CONTENT;
 }
 
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index aa82f52987..e1a035704e 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -667,6 +667,12 @@ e"
     assert_dedented_heredoc(expected, result)
   end
 
+  def test_dedented_heredoc_expr_string
+    result = '  one#{"  two  "}'"\n"
+    expected = 'one#{"  two  "}'"\n"
+    assert_dedented_heredoc(expected, result)
+  end
+
   def test_lineno_after_heredoc
     bug7559 = '[ruby-dev:46737]'
     expected, _, actual = __LINE__, <<eom, __LINE__
diff --git a/version.h b/version.h
index 45e9992883..005c770ba5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.5.1"
 #define RUBY_RELEASE_DATE "2018-03-24"
-#define RUBY_PATCHLEVEL 51
+#define RUBY_PATCHLEVEL 52
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3