nagachika	2013-10-24 22:58:44 +0900 (Thu, 24 Oct 2013)

  New Revision: 43415

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/parse.y
    branches/ruby_2_0_0/test/ruby/test_m17n.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43414)
+++ ruby_2_0_0/ChangeLog	(revision 43415)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Oct 24 22:49:28 2013  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* parse.y: Remove +(binary) and -(binary) special cases
+	  [Feature #9048]
+
 Thu Oct 24 22:36:56 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (load_encoding): should preserve outer errinfo, so that
Index: ruby_2_0_0/parse.y
===================================================================
--- ruby_2_0_0/parse.y	(revision 43414)
+++ ruby_2_0_0/parse.y	(revision 43415)
@@ -9915,8 +9915,6 @@ static const struct { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/parse.y#L9915
 } op_tbl[] = {
     {tDOT2,	".."},
     {tDOT3,	"..."},
-    {'+',	"+(binary)"},
-    {'-',	"-(binary)"},
     {tPOW,	"**"},
     {tDSTAR,	"**"},
     {tUPLUS,	"+@"},
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43414)
+++ ruby_2_0_0/version.h	(revision 43415)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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
Index: ruby_2_0_0/test/ruby/test_m17n.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_m17n.rb	(revision 43414)
+++ ruby_2_0_0/test/ruby/test_m17n.rb	(revision 43415)
@@ -1230,7 +1230,7 @@ class TestM17N < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_m17n.rb#L1230
 
   def test_symbol_op
     ops = %w"
-      .. ... + - +(binary) -(binary) * / % ** +@ -@ | ^ & ! <=> > >= < <= ==
+      .. ... + - * / % ** +@ -@ | ^ & ! <=> > >= < <= ==
       === != =~ !~ ~ ! [] []= << >> :: `
     "
     ops.each do |op|

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


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