diff options
| -rw-r--r-- | parse.y | 9 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 12 |
2 files changed, 20 insertions, 1 deletions
@@ -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 |