aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--compile.c4
-rw-r--r--iseq.c2
-rw-r--r--iseq.h2
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 <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
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)