diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | bootstraptest/test_syntax.rb | 3 | ||||
| -rw-r--r-- | parse.y | 4 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,15 @@ +Fri Jul 31 10:54:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <mame@tsg.ne.jp> + + * 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) <yugui@yugui.jp> * 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]' @@ -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); @@ -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 |