From 58fbe69a5ba2c6c896745dab5e41b3bbd1950015 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 21 Mar 2018 12:40:16 +0000
Subject: parse.y: terminator at continued line

* parse.y (here_document): a continuing line is not the
  terminator.  [ruby-core:86283] [Bug #14621]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y                  |  9 ++++++++-
 test/ruby/test_syntax.rb | 12 ++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/parse.y b/parse.y
index 138a29fab6..845face90f 100644
--- a/parse.y
+++ b/parse.y
@@ -6301,7 +6301,13 @@ here_document(struct parser_params *p, rb_strterm_heredoc_t *here)
 	return 0;
     }
     bol = was_bol(p);
-    if (bol && whole_match_p(p, eos, len, indent)) {
+    /* `heredoc_line_indent == -1` means
+     * - "after an interpolation in the same line", or
+     * - "in a continuing line"
+     */
+    if (bol &&
+	(p->heredoc_line_indent != -1 || (p->heredoc_line_indent = 0)) &&
+	whole_match_p(p, eos, len, indent)) {
 	dispatch_heredoc_end(p);
 	heredoc_restore(p, &p->lex.strterm->u.heredoc);
 	p->lex.strterm = 0;
@@ -6371,6 +6377,7 @@ here_document(struct parser_params *p, rb_strterm_heredoc_t *here)
 		goto restore;
 	    }
 	    if (c != '\n') {
+		if (c == '\\') p->heredoc_line_indent = -1;
 	      flush:
 		str = STR_NEW3(tok(p), toklen(p), enc, func);
 	      flush_str:
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index 283bac3f5f..b9316ec669 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -725,6 +725,18 @@ e"
     result = "  1\\\n" "  2\n"
     expected = "1\\\n" "2\n"
     assert_dedented_heredoc(expected, result)
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /can't find string "TEXT"/)
+    begin;
+      <<-TEXT
+      \
+      TEXT
+    end;
+    assert_syntax_error("#{<<~"begin;"}\n#{<<~'end;'}", /can't find string "TEXT"/)
+    begin;
+      <<~TEXT
+      \
+      TEXT
+    end;
   end
 
   def test_lineno_after_heredoc
-- 
cgit v1.2.3