diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-24 13:58:44 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-24 13:58:44 +0000 |
commit | 11239c0e8cec548407cdc6da502e94fd50e94753 (patch) | |
tree | 002d9088002cd7b90d48dd31b853bb617518b4ed | |
parent | cafc5a30805e647d7920343cc7056d95263f58b8 (diff) |
merge revision(s) 43413: [Backport #9048]
* parse.y: Remove +(binary) and -(binary) special cases
[Feature #9048]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | test/ruby/test_m17n.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Oct 24 22:49:28 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * parse.y: Remove +(binary) and -(binary) special cases + [Feature #9048] + Thu Oct 24 22:36:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * encoding.c (load_encoding): should preserve outer errinfo, so that @@ -9915,8 +9915,6 @@ static const struct { } op_tbl[] = { {tDOT2, ".."}, {tDOT3, "..."}, - {'+', "+(binary)"}, - {'-', "-(binary)"}, {tPOW, "**"}, {tDSTAR, "**"}, {tUPLUS, "+@"}, diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index a8d56a4a56..5d7f101b59 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1230,7 +1230,7 @@ class TestM17N < Test::Unit::TestCase def test_symbol_op ops = %w" - .. ... + - +(binary) -(binary) * / % ** +@ -@ | ^ & ! <=> > >= < <= == + .. ... + - * / % ** +@ -@ | ^ & ! <=> > >= < <= == === != =~ !~ ~ ! [] []= << >> :: ` " ops.each do |op| @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-10-24" -#define RUBY_PATCHLEVEL 338 +#define RUBY_PATCHLEVEL 339 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 10 |