diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 12:26:12 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 12:26:12 +0000 |
| commit | a61019eee34e0e0f3463da22cc0f3e62eeebf429 (patch) | |
| tree | 55461bc899de6294f5fd2fa3690b27a762c2f92f /ChangeLog | |
| parent | ba02d4b03bf536b24786f5b5982a08b44cf9d427 (diff) | |
merge revision(s) 53541,53555,53570: [Backport #11990]
* parse.y (string1): reset heredoc indent fore each string leteral
so that concatenated string would not be dedented.
[ruby-core:72857] [Bug #11990]
* parse.y (xstring): reset heredoc indent after dedenting,
so that following string literal would not be dedented.
[ruby-core:72857] [Bug #11990]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,15 @@ +Tue Mar 29 21:22:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (xstring): reset heredoc indent after dedenting, + so that following string literal would not be dedented. + [ruby-core:72857] [Bug #11990] + +Tue Mar 29 21:22:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (string1): reset heredoc indent fore each string leteral + so that concatenated string would not be dedented. + [ruby-core:72857] [Bug #11990] + Tue Mar 29 21:18:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (parser_here_document): update indent for each line in |