diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 4 | ||||
| -rw-r--r-- | test/ripper/test_sexp.rb | 5 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Dec 2 02:59:42 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (parser_here_document): store dispatched result of + on_tstring_content at the last fragment of a here document. + Tue Dec 1 02:52:17 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * test/ruby/test_gc.rb: merge partially r52391 to get rid of CI error. @@ -6742,6 +6742,10 @@ parser_here_document(struct parser_params *parser, NODE *here) str = STR_NEW3(tok(), toklen(), enc, func); } dispatch_heredoc_end(); +#ifdef RIPPER + str = ripper_new_yylval(ripper_token2eventid(tSTRING_CONTENT), + yylval.val, str); +#endif heredoc_restore(lex_strterm); lex_strterm = NEW_STRTERM(-1, 0, 0); set_yylval_str(str); diff --git a/test/ripper/test_sexp.rb b/test/ripper/test_sexp.rb index 2c5bcdacde..8fc17fdd4a 100644 --- a/test/ripper/test_sexp.rb +++ b/test/ripper/test_sexp.rb @@ -33,6 +33,11 @@ class TestRipper::Sexp < Test::Unit::TestCase assert_equal '(?<n>a(b|\g<n>))', search_sexp(:@tstring_content, search_sexp(:regexp_literal, sexp))[1] end + def test_heredoc_content + sexp = Ripper.sexp("<<E\nfoo\nE") + assert_equal "foo\n", search_sexp(:@tstring_content, sexp)[1] + end + def search_sexp(sym, sexp) return sexp if !sexp or sexp[0] == sym sexp.find do |e| @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.4" -#define RUBY_RELEASE_DATE "2015-12-01" -#define RUBY_PATCHLEVEL 216 +#define RUBY_RELEASE_DATE "2015-12-02" +#define RUBY_PATCHLEVEL 217 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" |