diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-31 15:05:19 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-31 15:05:19 +0000 |
commit | c84f858379b09a5831d82f989df512683e199eb8 (patch) | |
tree | be9ffd9f090c42d13fd6b1313ea9b78c01655c1d | |
parent | 8a9679b8dfcabc9a9e137deb210575393e3d205a (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_1_9_3@43493 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 @@ +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 @@ -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| @@ -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 |