diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-05 06:28:07 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-05 06:28:07 +0000 |
commit | 2ac460af94948caa8af7c13648a0d3a7e46eb446 (patch) | |
tree | 9ebd2438f3a9c855d88607980bd47b1ad3744ad4 /parse.y | |
parent | eb78d224e3bb0747d4ae671e3aa4068d94398d00 (diff) | |
download | ruby-2ac460af94948caa8af7c13648a0d3a7e46eb446.tar.gz |
* parse.y (parser_here_document): should dispatch heredoc_end
scanner event on an empty here document. fixed Bug#4543.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 23 |
1 files changed, 17 insertions, 6 deletions
@@ -6095,6 +6095,21 @@ parser_whole_match_p(struct parser_params *parser, return strncmp(eos, p, len) == 0; } +#ifdef RIPPER +static void +ripper_dispatch_heredoc_end(struct parser_params *parser) +{ + if (!NIL_P(parser->delayed)) + ripper_dispatch_delayed_token(parser, tSTRING_CONTENT); + lex_goto_eol(parser); + ripper_dispatch_ignored_scan_event(parser, tHEREDOC_END); +} + +#define dispatch_heredoc_end() ripper_dispatch_heredoc_end(parser) +#else +#define dispatch_heredoc_end() ((void)0) +#endif + static int parser_here_document(struct parser_params *parser, NODE *here) { @@ -6131,6 +6146,7 @@ parser_here_document(struct parser_params *parser, NODE *here) return 0; } if (was_bol() && whole_match_p(eos, len, indent)) { + dispatch_heredoc_end(); heredoc_restore(lex_strterm); return tSTRING_END; } @@ -6192,12 +6208,7 @@ parser_here_document(struct parser_params *parser, NODE *here) } while (!whole_match_p(eos, len, indent)); str = STR_NEW3(tok(), toklen(), enc, func); } -#ifdef RIPPER - if (!NIL_P(parser->delayed)) - ripper_dispatch_delayed_token(parser, tSTRING_CONTENT); - lex_goto_eol(parser); - ripper_dispatch_ignored_scan_event(parser, tHEREDOC_END); -#endif + dispatch_heredoc_end(); heredoc_restore(lex_strterm); lex_strterm = NEW_STRTERM(-1, 0, 0); set_yylval_str(str); |