From ad81b56e35f314dfe6ff1091d29c7e4a0e4ba497 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 8 Aug 2009 15:28:03 +0000 Subject: merges r24332 and r24333 from trunk into ruby_1_9_1. -- * parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as NODE_STR. [ruby-dev:38968] * bootstraptest/test_syntax.rb: add a test for above. -- * parse.y (literal_concat_gen): reduced unnecessary node at string literal concatenation with empty head dstr. [ruby-dev:38968] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++++++++ bootstraptest/test_syntax.rb | 3 +++ parse.y | 4 ++++ version.h | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ff81c415d..47e04290b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Fri Jul 31 10:54:08 2009 Nobuyoshi Nakada + + * parse.y (literal_concat_gen): reduced unnecessary node at string + literal concatenation with empty head dstr. [ruby-dev:38968] + +Fri Jul 31 02:57:39 2009 Yusuke Endoh + + * parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as + NODE_STR. [ruby-dev:38968] + + * bootstraptest/test_syntax.rb: add a test for above. + Thu Jul 30 23:04:32 2009 Yuki Sonoda (Yugui) * gem_prelude.rb (Gem.path): uses Gem.default_path as a default value diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb index a9005a429..131625ea6 100644 --- a/bootstraptest/test_syntax.rb +++ b/bootstraptest/test_syntax.rb @@ -828,3 +828,6 @@ assert_normal_exit %q{ p a.compact! } +assert_equal 'ok', %q{ + "#{}""#{}ok" +}, '[ruby-dev:38968]' diff --git a/parse.y b/parse.y index 84314c816..3961733cd 100644 --- a/parse.y +++ b/parse.y @@ -7880,6 +7880,10 @@ literal_concat_gen(struct parser_params *parser, NODE *head, NODE *tail) rb_gc_force_recycle((VALUE)head); head = tail; } + else if (NIL_P(tail->nd_lit)) { + list_concat(head, tail->nd_next); + rb_gc_force_recycle((VALUE)tail); + } else { nd_set_type(tail, NODE_ARRAY); tail->nd_head = NEW_STR(tail->nd_lit); diff --git a/version.h b/version.h index 02ddd40be..372cc4d3f 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 258 +#define RUBY_PATCHLEVEL 259 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit