From b96f428e4892e4eb568ae47478947b886ae2dc87 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 18 Jan 2009 19:05:15 +0000 Subject: * 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 --- ChangeLog | 5 +++++ compile.c | 4 ++-- iseq.c | 2 +- iseq.h | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4d9cb310d..996b9c6bf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 19 04:06:10 2009 Nobuyoshi Nakada + + * 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 * transcode.c (str_transcode0): fix: :xml option doesn't diff --git a/compile.c b/compile.c index 205ebafa5c..0cd765c867 100644 --- a/compile.c +++ b/compile.c @@ -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; diff --git a/iseq.c b/iseq.c index 52003fad2f..a96c9c1eef 100644 --- a/iseq.c +++ b/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); } diff --git a/iseq.h b/iseq.h index f659708aba..fecdbc5ecb 100644 --- a/iseq.h +++ b/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) -- cgit v1.2.3