kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* iseq.c (set_relation): added.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-07-03 20:12:55 +00:00
parent 21b644e812
commit e96cd603e5
2 changed files with 48 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Jul 4 05:11:57 2007 Koichi Sasada <ko1@atdot.net>
* iseq.c (set_relation): added.
Wed Jul 4 04:58:30 2007 Koichi Sasada <ko1@atdot.net> Wed Jul 4 04:58:30 2007 Koichi Sasada <ko1@atdot.net>
* insnhelper.ci (caller_setup_args): fix to show correct class * insnhelper.ci (caller_setup_args): fix to show correct class

78
iseq.c
View file

@ -101,14 +101,52 @@ iseq_alloc(VALUE klass)
return obj; return obj;
} }
static void
set_relation(rb_iseq_t *iseq, const VALUE parent)
{
const int type = iseq->type;
rb_thread_t *th = GET_THREAD();
/* set class nest stack */
if (type == ISEQ_TYPE_TOP) {
/* toplevel is private */
iseq->cref_stack = NEW_BLOCK(th->top_wrapper ? th->top_wrapper : rb_cObject);
iseq->cref_stack->nd_file = 0;
iseq->cref_stack->nd_visi = NOEX_PRIVATE;
}
else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
iseq->cref_stack = NEW_BLOCK(0); /* place holder */
iseq->cref_stack->nd_file = 0;
}
else if (RTEST(parent)) {
rb_iseq_t *piseq;
GetISeqPtr(parent, piseq);
iseq->cref_stack = piseq->cref_stack;
}
if (type == ISEQ_TYPE_TOP ||
type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
iseq->local_iseq = iseq;
}
else if (RTEST(parent)) {
rb_iseq_t *piseq;
GetISeqPtr(parent, piseq);
iseq->local_iseq = piseq->local_iseq;
}
if (RTEST(parent)) {
rb_iseq_t *piseq;
GetISeqPtr(parent, piseq);
iseq->parent_iseq = piseq;
}
}
static VALUE static VALUE
prepare_iseq_build(rb_iseq_t *iseq, prepare_iseq_build(rb_iseq_t *iseq,
VALUE name, VALUE filename, VALUE name, VALUE filename,
VALUE parent, VALUE type, VALUE block_opt, VALUE parent, VALUE type, VALUE block_opt,
const rb_compile_option_t *option) const rb_compile_option_t *option)
{ {
rb_thread_t *th = GET_THREAD();
OBJ_FREEZE(name); OBJ_FREEZE(name);
OBJ_FREEZE(filename); OBJ_FREEZE(filename);
@ -126,23 +164,6 @@ prepare_iseq_build(rb_iseq_t *iseq,
iseq->cached_special_block_builder = 0; iseq->cached_special_block_builder = 0;
iseq->cached_special_block = 0; iseq->cached_special_block = 0;
/* set class nest stack */
if (type == ISEQ_TYPE_TOP) {
/* toplevel is private */
iseq->cref_stack = NEW_BLOCK(th->top_wrapper ? th->top_wrapper : rb_cObject);
iseq->cref_stack->nd_file = 0;
iseq->cref_stack->nd_visi = NOEX_PRIVATE;
}
else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
iseq->cref_stack = NEW_BLOCK(0); /* place holder */
iseq->cref_stack->nd_file = 0;
}
else if (parent) {
rb_iseq_t *piseq;
GetISeqPtr(parent, piseq);
iseq->cref_stack = piseq->cref_stack;
}
iseq->compile_data = ALLOC(struct iseq_compile_data); iseq->compile_data = ALLOC(struct iseq_compile_data);
MEMZERO(iseq->compile_data, struct iseq_compile_data, 1); MEMZERO(iseq->compile_data, struct iseq_compile_data, 1);
iseq->compile_data->mark_ary = rb_ary_new(); iseq->compile_data->mark_ary = rb_ary_new();
@ -162,21 +183,7 @@ prepare_iseq_build(rb_iseq_t *iseq,
(char *)(&iseq->compile_data->storage_head->buff + 1); (char *)(&iseq->compile_data->storage_head->buff + 1);
iseq->compile_data->option = option; iseq->compile_data->option = option;
if (type == ISEQ_TYPE_TOP || set_relation(iseq, parent);
type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
iseq->local_iseq = iseq;
}
else {
rb_iseq_t *piseq;
GetISeqPtr(parent, piseq);
iseq->local_iseq = piseq->local_iseq;
}
if (RTEST(parent)) {
rb_iseq_t *piseq;
GetISeqPtr(parent, piseq);
iseq->parent_iseq = piseq;
}
return Qtrue; return Qtrue;
} }
@ -1382,6 +1389,7 @@ rb_iseq_build_for_ruby2cext(
iseq->name = rb_str_new2(name); iseq->name = rb_str_new2(name);
iseq->filename = rb_str_new2(filename); iseq->filename = rb_str_new2(filename);
iseq->mark_ary = rb_ary_new(); iseq->mark_ary = rb_ary_new();
iseq->self = iseqval;
iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size); iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size);
@ -1408,6 +1416,8 @@ rb_iseq_build_for_ruby2cext(
ALLOC_AND_COPY(iseq->arg_opt_table, arg_opt_table, ALLOC_AND_COPY(iseq->arg_opt_table, arg_opt_table,
VALUE, iseq->arg_opts); VALUE, iseq->arg_opts);
set_relation(iseq, 0);
return iseqval; return iseqval;
} }