usa	2013-11-01 00:05:19 +0900 (Fri, 01 Nov 2013)

  New Revision: 43493

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43493

  Log:
    merge revision(s) 43413: [Backport #9048]
    
    * parse.y: Remove +(binary) and -(binary) special cases
      [Feature #9048]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/parse.y
    branches/ruby_1_9_3/test/ruby/test_m17n.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 43492)
+++ ruby_1_9_3/ChangeLog	(revision 43493)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Nov  1 00:04:17 2013  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* parse.y: Remove +(binary) and -(binary) special cases
+	  [Feature #9048]
+
 Thu Oct 31 23:57:22 2013  Benoit Daloze  <eregontp@g...>
 
 	* test/ruby/test_array.rb (test_count): add a test case for #count
Index: ruby_1_9_3/parse.y
===================================================================
--- ruby_1_9_3/parse.y	(revision 43492)
+++ ruby_1_9_3/parse.y	(revision 43493)
@@ -9618,8 +9618,6 @@ static const struct { https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/parse.y#L9618
 } op_tbl[] = {
     {tDOT2,	".."},
     {tDOT3,	"..."},
-    {'+',	"+(binary)"},
-    {'-',	"-(binary)"},
     {tPOW,	"**"},
     {tUPLUS,	"+@"},
     {tUMINUS,	"-@"},
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 43492)
+++ ruby_1_9_3/version.h	(revision 43493)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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
Index: ruby_1_9_3/test/ruby/test_m17n.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_m17n.rb	(revision 43492)
+++ ruby_1_9_3/test/ruby/test_m17n.rb	(revision 43493)
@@ -1180,7 +1180,7 @@ class TestM17N < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/ruby/test_m17n.rb#L1180
 
   def test_symbol_op
     ops = %w"
-      .. ... + - +(binary) -(binary) * / % ** +@ -@ | ^ & ! <=> > >= < <= ==
+      .. ... + - * / % ** +@ -@ | ^ & ! <=> > >= < <= ==
       === != =~ !~ ~ ! [] []= << >> :: `
     "
     ops.each do |op|

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43413


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/