kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r24332 and r24333 from trunk into ruby_1_9_1.

Browse source 
--
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-08-08 15:28:03 +00:00
parent ff17ee0d31
commit a97190548f
4 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -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

3
bootstraptest/test_syntax.rb
View file

@ -828,3 +828,6 @@ assert_normal_exit %q{
p a.compact!
}
assert_equal 'ok', %q{
"#{}""#{}ok"
}, '[ruby-dev:38968]'

4
parse.y
View file

@ -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);

2
version.h
View file

@ -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