* parse.y (op_tbl): remove duplication to avoid symbol aliases.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 5 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index b9c0a25337..41dd97cf25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 18 14:45:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (op_tbl): remove duplication to avoid symbol aliases.
+
 Tue Dec 18 14:39:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_nth): need not to raise out-of-range exception.
diff --git a/object.c b/object.c
index 25a9c29752..aa1b1caaf5 100644
--- a/object.c
+++ b/object.c
@@ -2348,7 +2348,7 @@ Init_Object(void)
     rb_define_alloc_func(rb_cBasicObject, rb_class_allocate_instance);
     rb_define_method(rb_cBasicObject, "==", rb_obj_equal, 1);
     rb_define_method(rb_cBasicObject, "equal?", rb_obj_equal, 1);
-    rb_define_method(rb_cBasicObject, "!@", rb_obj_not, 0);
+    rb_define_method(rb_cBasicObject, "!", rb_obj_not, 0);
     rb_define_method(rb_cBasicObject, "!=", rb_obj_not_equal, 1);
 
     rb_define_private_method(rb_cBasicObject, "singleton_method_added", rb_obj_dummy, 1);
diff --git a/parse.y b/parse.y
index d4535c5929..85e2852659 100644
--- a/parse.y
+++ b/parse.y
@@ -8583,8 +8583,6 @@ static const struct {
     {tPOW,	"**"},
     {tUPLUS,	"+@"},
     {tUMINUS,	"-@"},
-    {tUPLUS,	"+(unary)"},
-    {tUMINUS,	"-(unary)"},
     {'|',	"|"},
     {'^',	"^"},
     {'&',	"&"},
@@ -8600,11 +8598,7 @@ static const struct {
     {tMATCH,	"=~"},
     {tNMATCH,	"!~"},
     {'~',	"~"},
-    {'~',	"~(unary)"},
-    {'~',	"~@"},
     {'!',	"!"},
-    {'!',	"!(unary)"},
-    {'!',	"!@"},
     {tAREF,	"[]"},
     {tASET,	"[]="},
     {tLSHFT,	"<<"},