diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-12 14:39:18 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-12 14:39:18 +0000 |
commit | 0e05caace7ba048a874629c30b5003b8611ffea5 (patch) | |
tree | 1b6c15e318322287522b55ad0efe85ef7026e67e /parse.y | |
parent | 0179055d2d146d495b93c148e431cf103b55208f (diff) |
merge revision(s) 57717: [Backport #13253]
parse.y: indent at invalid identifier
* parse.y (parser_heredoc_identifier): set indent only when valid
identifier, not to dedent non-existent contents later.
[ruby-core:79772] [Bug #13253]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -6407,6 +6407,7 @@ parser_heredoc_identifier(struct parser_params *parser) int token = tSTRING_BEG; long len; int newline = 0; + int indent = 0; if (c == '-') { c = nextc(); @@ -6415,8 +6416,7 @@ parser_heredoc_identifier(struct parser_params *parser) else if (c == '~') { c = nextc(); func = STR_FUNC_INDENT; - heredoc_indent = INT_MAX; - heredoc_line_indent = 0; + indent = INT_MAX; } switch (c) { case '\'': @@ -6455,7 +6455,7 @@ parser_heredoc_identifier(struct parser_params *parser) if (!parser_is_identchar()) { pushback(c); if (func & STR_FUNC_INDENT) { - pushback(heredoc_indent > 0 ? '~' : '-'); + pushback(indent > 0 ? '~' : '-'); } return 0; } @@ -6478,6 +6478,8 @@ parser_heredoc_identifier(struct parser_params *parser) lex_lastline); /* nd_orig */ nd_set_line(lex_strterm, ruby_sourceline); ripper_flush(parser); + heredoc_indent = indent; + heredoc_line_indent = 0; return token; } |