diff options
| -rw-r--r-- | parse.y | 18 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 2 |
2 files changed, 13 insertions, 7 deletions
@@ -7201,13 +7201,17 @@ here_document(struct parser_params *p, rb_strterm_heredoc_t *here) return 0; } bol = was_bol(p); - /* `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)) { + if (!bol) { + /* not beginning of line, cannot be the terminater */ + } + else if (p->heredoc_line_indent == -1) { + /* `heredoc_line_indent == -1` means + * - "after an interpolation in the same line", or + * - "in a continuing line" + */ + p->heredoc_line_indent = 0; + } + else if (whole_match_p(p, eos, len, indent)) { dispatch_heredoc_end(p); heredoc_restore(p, &p->lex.strterm->u.heredoc); p->lex.strterm = 0; diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index e640262d90..4e52bc4a72 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -753,6 +753,8 @@ e" \ TEXT end; + + assert_equal(" TEXT\n", eval("<<~eos\n" " \\\n" "TEXT\n" "eos\n")) end def test_lineno_after_heredoc |