diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-31 01:54:14 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-31 01:54:14 +0000 |
commit | 5004e33f8de3b7ce8208421da512102c95c597cb (patch) | |
tree | 6aac63908ff3865b1d4a52d6c1224c3e4e051c8e | |
parent | 3129ed327ed8a365652fedf1d311e0af6137491c (diff) | |
download | ruby-5004e33f8de3b7ce8208421da512102c95c597cb.tar.gz |
* parse.y (literal_concat_gen): reduced unnecessary node at string
literal concatenation with empty head dstr. [ruby-dev:38968]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +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 @@ -7832,8 +7832,14 @@ 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 { - list_concat(head, NEW_ARRAY(tail)); + nd_set_type(tail, NODE_ARRAY); + tail->nd_head = NEW_STR(tail->nd_lit); + list_concat(head, tail); } break; |