зеркало из https://github.com/github/ruby.git
* iseq.c (rb_iseq_load): renamed from ruby_iseq_load, since it is
for C extensions or the ruby core. [ruby-core:21407] Index: compile.c =================================================================== --- compile.c (revision 21649) +++ compile.c (working copy) @@ -5078,5 +5078,5 @@ iseq_build_exception(rb_iseq_t *iseq, st } else { - eiseqval = ruby_iseq_load(ptr[1], iseq->self, Qnil); + eiseqval = rb_iseq_load(ptr[1], iseq->self, Qnil); } @@ -5162,5 +5162,5 @@ iseq_build_body(rb_iseq_t *iseq, LINK_AN if (op != Qnil) { if (TYPE(op) == T_ARRAY) { - argv[j] = ruby_iseq_load(op, iseq->self, Qnil); + argv[j] = rb_iseq_load(op, iseq->self, Qnil); } else if (CLASS_OF(op) == rb_cISeq) { Index: iseq.c =================================================================== --- iseq.c (revision 21649) +++ iseq.c (working copy) @@ -448,5 +448,5 @@ iseq_s_load(int argc, VALUE *argv, VALUE VALUE -ruby_iseq_load(VALUE data, VALUE parent, VALUE opt) +rb_iseq_load(VALUE data, VALUE parent, VALUE opt) { return iseq_load(rb_cISeq, data, parent, opt); Index: iseq.h =================================================================== --- iseq.h (revision 21649) +++ iseq.h (working copy) @@ -21,5 +21,5 @@ VALUE ruby_iseq_build_from_ary(rb_iseq_t /* iseq.c */ -VALUE ruby_iseq_load(VALUE data, VALUE parent, VALUE opt); +VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt); struct st_table *ruby_insn_make_insn_table(void); git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
69ee4246e5
Коммит
b96f428e48
|
@ -1,3 +1,8 @@
|
|||
Mon Jan 19 04:06:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* iseq.c (rb_iseq_load): renamed from ruby_iseq_load, since it is
|
||||
for C extensions or the ruby core. [ruby-core:21407]
|
||||
|
||||
Mon Jan 19 03:06:22 2009 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* transcode.c (str_transcode0): fix: :xml option doesn't
|
||||
|
|
|
@ -5077,7 +5077,7 @@ iseq_build_exception(rb_iseq_t *iseq, struct st_table *labels_table,
|
|||
eiseqval = 0;
|
||||
}
|
||||
else {
|
||||
eiseqval = ruby_iseq_load(ptr[1], iseq->self, Qnil);
|
||||
eiseqval = rb_iseq_load(ptr[1], iseq->self, Qnil);
|
||||
}
|
||||
|
||||
lstart = register_label(iseq, labels_table, ptr[2]);
|
||||
|
@ -5161,7 +5161,7 @@ iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
|
|||
{
|
||||
if (op != Qnil) {
|
||||
if (TYPE(op) == T_ARRAY) {
|
||||
argv[j] = ruby_iseq_load(op, iseq->self, Qnil);
|
||||
argv[j] = rb_iseq_load(op, iseq->self, Qnil);
|
||||
}
|
||||
else if (CLASS_OF(op) == rb_cISeq) {
|
||||
argv[j] = op;
|
||||
|
|
2
iseq.c
2
iseq.c
|
@ -447,7 +447,7 @@ iseq_s_load(int argc, VALUE *argv, VALUE self)
|
|||
}
|
||||
|
||||
VALUE
|
||||
ruby_iseq_load(VALUE data, VALUE parent, VALUE opt)
|
||||
rb_iseq_load(VALUE data, VALUE parent, VALUE opt)
|
||||
{
|
||||
return iseq_load(rb_cISeq, data, parent, opt);
|
||||
}
|
||||
|
|
2
iseq.h
2
iseq.h
|
@ -20,7 +20,7 @@ VALUE ruby_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
|
|||
VALUE exception, VALUE body);
|
||||
|
||||
/* iseq.c */
|
||||
VALUE ruby_iseq_load(VALUE data, VALUE parent, VALUE opt);
|
||||
VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt);
|
||||
struct st_table *ruby_insn_make_insn_table(void);
|
||||
|
||||
#define ISEQ_TYPE_TOP INT2FIX(1)
|
||||
|
|
Загрузка…
Ссылка в новой задаче