From 7e35c2e2d0ba1b0a0d3df190df45158044a2620d Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 28 Dec 2008 09:40:46 +0000 Subject: merges r21088 from trunk into ruby_1_(_1. * iseq.h, iseq.c (rb_iseq_new_main): add a type ISEQ_TYPE_MAIN. [ruby-dev:37619] * compile.c (rb_dvar_defined, ruby_iseq_compile): ditto. * iseq.c (iseq_data_to_ary, iseq_load): ditto. * compile.c (iseq_compile_each): fix to check ip->compile_data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- iseq.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'iseq.h') diff --git a/iseq.h b/iseq.h index 393ba67593..f659708aba 100644 --- a/iseq.h +++ b/iseq.h @@ -30,7 +30,8 @@ struct st_table *ruby_insn_make_insn_table(void); #define ISEQ_TYPE_RESCUE INT2FIX(5) #define ISEQ_TYPE_ENSURE INT2FIX(6) #define ISEQ_TYPE_EVAL INT2FIX(7) -#define ISEQ_TYPE_DEFINED_GUARD INT2FIX(8) +#define ISEQ_TYPE_MAIN INT2FIX(8) +#define ISEQ_TYPE_DEFINED_GUARD INT2FIX(9) #define CATCH_TYPE_RESCUE INT2FIX(1) #define CATCH_TYPE_ENSURE INT2FIX(2) -- cgit v1.2.3