aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-24 12:58:54 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-24 12:58:54 +0000
commit8afbb0e6ef724533eff907c064f2eefe00ab2038 (patch)
treeb61c8b6e2e55c14116daff5916e2fbc5cce578a3
parentec9ec2643085486afacc268e330e4a595f898e4b (diff)
downloadruby-8afbb0e6ef724533eff907c064f2eefe00ab2038.tar.gz
* parse.y: Remove +(binary) and -(binary) special cases [Feature #9048]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y2
-rw-r--r--test/ruby/test_m17n.rb2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 68e082d2de..c30fffc0db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 24 21:57:24 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * parse.y: Remove +(binary) and -(binary) special cases
+ [Feature #9048]
+
Thu Oct 24 12:45:53 2013 Zachary Scott <e@zzak.io>
* object.c: [DOC] Document first argument also takes string for:
diff --git a/parse.y b/parse.y
index 4be8c27928..a2174ca4dd 100644
--- a/parse.y
+++ b/parse.y
@@ -10147,8 +10147,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 7c37c8a199..3ea346f025 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|