diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-12 07:34:23 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-12 07:34:23 +0000 |
commit | c32c4364c3b2118d6be62de9fe1f69bc2c2e1c2d (patch) | |
tree | d7abbcef6dccd1930dab25f78afcc16903b21f5c | |
parent | dbb8970a8ad0adb6013fee32199f0fd677039170 (diff) |
merge frrom trunk (r27729)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | eval_intern.h | 1 | ||||
-rw-r--r-- | vm_dump.c | 2 | ||||
-rw-r--r-- | vm_method.c | 1 |
4 files changed, 5 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Wed May 12 16:34:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval_intern.h (rb_vm_get_sourceline): add prototype. + Wed May 12 16:25:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * numeric.c (flo_to_s): exponent needs 2 digits. diff --git a/eval_intern.h b/eval_intern.h index 549953acfc..72ce25f2a7 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -210,6 +210,7 @@ void rb_vm_set_progname(VALUE filename); void rb_thread_terminate_all(void); VALUE rb_vm_top_self(); VALUE rb_vm_cbase(void); +int rb_vm_get_sourceline(const rb_control_frame_t *); void rb_trap_restore_mask(void); #ifndef CharNext /* defined as CharNext[AW] on Windows. */ @@ -103,8 +103,6 @@ control_frame_dump(rb_thread_t *th, rb_control_frame_t *cfp) iseq_name = "<ifunc>"; } else { - int rb_vm_get_sourceline(rb_control_frame_t *); - pc = cfp->pc - cfp->iseq->iseq_encoded; iseq_name = RSTRING_PTR(cfp->iseq->name); line = rb_vm_get_sourceline(cfp); diff --git a/vm_method.c b/vm_method.c index 69d50d969b..fffde6a333 100644 --- a/vm_method.c +++ b/vm_method.c @@ -304,7 +304,6 @@ method_added(VALUE klass, ID mid) rb_method_entry_t * rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *opts, rb_method_flag_t noex) { - int rb_vm_get_sourceline(const rb_control_frame_t *cfp); rb_thread_t *th; rb_control_frame_t *cfp; int line; |