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 /parse.y | |
| 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 'parse.y')
| -rw-r--r-- | parse.y | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3907,7 +3907,6 @@ strings : string else { node = evstr2dstr(node); } - heredoc_indent = 0; $$ = node; /*% $$ = $1; @@ -3930,6 +3929,7 @@ string : tCHAR string1 : tSTRING_BEG string_contents tSTRING_END { heredoc_dedent($2); + heredoc_indent = 0; /*%%%*/ $$ = $2; /*% @@ -3945,6 +3945,7 @@ xstring : tXSTRING_BEG xstring_contents tSTRING_END /*% %*/ heredoc_dedent($2); + heredoc_indent = 0; /*%%%*/ if (!node) { node = NEW_XSTR(STR_NEW0()); |