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_1_9_3@43493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f38d716cb6..494d745ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov  1 00:04:17 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* parse.y: Remove +(binary) and -(binary) special cases
+	  [Feature #9048]
+
 Thu Oct 31 23:57:22 2013  Benoit Daloze  <eregontp@gmail.com>
 
 	* test/ruby/test_array.rb (test_count): add a test case for #count
diff --git a/parse.y b/parse.y
index 671f333275..69608f7bf0 100644
--- a/parse.y
+++ b/parse.y
@@ -9618,8 +9618,6 @@ static const struct {
 } op_tbl[] = {
     {tDOT2,	".."},
     {tDOT3,	"..."},
-    {'+',	"+(binary)"},
-    {'-',	"-(binary)"},
     {tPOW,	"**"},
     {tUPLUS,	"+@"},
     {tUMINUS,	"-@"},
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 699c8151dd..e92b85dbb8 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -1180,7 +1180,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 0a5baf411b..3a5972130c 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 480
+#define RUBY_PATCHLEVEL 481
 
 #define RUBY_RELEASE_DATE "2013-11-01"
 #define RUBY_RELEASE_YEAR 2013