archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 48484: [Backport #10524]

Browse source 
* parse.y (symbol_list): fix the node type of literal symbol list
	  with no interpolation.  [ruby-core:66343]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-11-28 07:37:22 +00:00
parent bcafeef2e7
commit 3f23ee7015
4 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Nov 28 16:36:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (symbol_list): fix the node type of literal symbol list
with no interpolation. [ruby-core:66343]
Fri Nov 28 16:28:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (etc_getlogin): set login name encoding properly.

8
parse.y
View file

@ -4043,7 +4043,13 @@ symbol_list : /* none */
{
/*%%%*/
$2 = evstr2dstr($2);
nd_set_type($2, NODE_DSYM);
if (nd_type($2) == NODE_DSTR) {
nd_set_type($2, NODE_DSYM);
}
else {
nd_set_type($2, NODE_LIT);
$2->nd_lit = rb_str_intern($2->nd_lit);
}
$$ = list_append($1, $2);
/*%
$$ = dispatch2(symbols_add, $1, $2);

10
test/ruby/test_literal.rb
View file

@ -434,4 +434,14 @@ class TestRubyLiteral < Test::Unit::TestCase
}
end
def test_symbol_list
assert_equal([:foo, :bar], %i[foo bar])
assert_equal([:"\"foo"], %i["foo])
x = 10
assert_equal([:foo, :b10], %I[foo b#{x}])
assert_equal([:"\"foo10"], %I["foo#{x}])
assert_ruby_status(["--disable-gems", "--dump=parsetree"], "%I[foo bar]")
end
end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-11-28"
#define RUBY_PATCHLEVEL 604
#define RUBY_PATCHLEVEL 605
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 11