diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-21 12:40:16 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-21 12:40:16 +0000 |
| commit | 58fbe69a5ba2c6c896745dab5e41b3bbd1950015 (patch) | |
| tree | 5363bf26f7e1a43b175dbcf023a6147feaa952f5 /parse.y | |
| parent | 491f523ab18cae6e14a2929de14d51803c362a7c (diff) | |
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
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 9 |
1 files changed, 8 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: |