* parse.y, compile.c, gc.c, insns.def, intern.h, iseq.c, node.h,

  object.c, string.c, variable.c, vm_macro.def: revert private
  instance variable feature, which is postponed until next major
  release.

* marshal.c: TYPE_SYMBOL2 removed; MARSHAL_MINOR reverted back to
  8th version.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/object.c b/object.c
index f0138d6c29..d1c53717e3 100644
--- a/object.c
+++ b/object.c
@@ -1679,7 +1679,7 @@ rb_obj_ivar_get(VALUE obj, VALUE iv)
 {
     ID id = rb_to_id(iv);
 
-    if (!rb_is_instance_id(id) && !rb_is_instance2_id(id)) {
+    if (!rb_is_instance_id(id)) {
 	rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
     }
     return rb_ivar_get(obj, id);
@@ -1710,7 +1710,7 @@ rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val)
 {
     ID id = rb_to_id(iv);
 
-    if (!rb_is_instance_id(id) && !rb_is_instance2_id(id)) {
+    if (!rb_is_instance_id(id)) {
 	rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
     }
     return rb_ivar_set(obj, id, val);
@@ -1739,7 +1739,7 @@ rb_obj_ivar_defined(VALUE obj, VALUE iv)
 {
     ID id = rb_to_id(iv);
 
-    if (!rb_is_instance_id(id) && !rb_is_instance2_id(id)) {
+    if (!rb_is_instance_id(id)) {
 	rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
     }
     return rb_ivar_defined(obj, id);