* parse.y (rb_compose_ivar2): function to create a new ivar2

  symbol from a symbol and a class.  back-ported from matzruby.

* parse.y (rb_decompose_ivar2): reverse function of
  rb_compose_ivar2(). 

* marshal.c (w_symbol): support class local instance variables.

* marshal.c (r_object0): ditto.

* compile.c (defined_expr): ditto.

* compile.c (iseq_compile_each): ditto.

* insns.def: add two new instructions: getinstancevariable2 and
  setinstancevariable2.

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

1 files changed, 3 insertions, 0 deletions

diff --git a/intern.h b/intern.h
index ad8c6b42d6..b3fd3cb0ce 100644
--- a/intern.h
+++ b/intern.h
@@ -398,6 +398,7 @@ ID rb_id_attrset(ID);
 void rb_gc_mark_parser(void);
 int rb_is_const_id(ID);
 int rb_is_instance_id(ID);
+int rb_is_instance2_id(ID);
 int rb_is_class_id(ID);
 int rb_is_local_id(ID);
 int rb_is_junk_id(ID);
@@ -409,6 +410,8 @@ void rb_backref_set(VALUE);
 VALUE rb_lastline_get(void);
 void rb_lastline_set(VALUE);
 VALUE rb_sym_all_symbols(void);
+ID rb_compose_ivar2(ID, VALUE);
+ID rb_decompose_ivar2(ID, VALUE*);
 /* process.c */
 struct rb_exec_arg {
     int argc;