From 11239c0e8cec548407cdc6da502e94fd50e94753 Mon Sep 17 00:00:00 2001 From: nagachika Date: Thu, 24 Oct 2013 13:58:44 +0000 Subject: 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 --- ChangeLog | 5 +++++ parse.y | 2 -- test/ruby/test_m17n.rb | 2 +- version.h | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86d2a3d5d4..f4ae0065af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 24 22:49:28 2013 Marc-Andre Lafortune + + * parse.y: Remove +(binary) and -(binary) special cases + [Feature #9048] + Thu Oct 24 22:36:56 2013 Nobuyoshi Nakada * encoding.c (load_encoding): should preserve outer errinfo, so that diff --git a/parse.y b/parse.y index 4a4fb12cb7..9f8b284924 100644 --- a/parse.y +++ b/parse.y @@ -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| diff --git a/version.h b/version.h index 80eaec0284..ab300b2cd6 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3