From d327d445c8c53247af82eb8ecd77447cf749cd92 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 17 Dec 2014 02:52:19 +0000 Subject: iseq.c: absolute_path * iseq.c (caller_location): separate absolute_path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- iseq.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'iseq.c') diff --git a/iseq.c b/iseq.c index b9db1c8353..43f3e8fca3 100644 --- a/iseq.c +++ b/iseq.c @@ -553,17 +553,20 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt) } static VALUE -caller_location(VALUE *path) +caller_location(VALUE *path, VALUE *absolute_path) { rb_thread_t *th = GET_THREAD(); rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); + if (cfp) { int line = rb_vm_get_sourceline(cfp); *path = cfp->iseq->location.path; + *absolute_path = cfp->iseq->location.absolute_path; return INT2FIX(line); } else { *path = rb_str_new2(""); + *absolute_path = *path; return INT2FIX(1); } } @@ -573,7 +576,8 @@ rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func) { VALUE iseqval = iseq_alloc(rb_cISeq); rb_iseq_t *iseq; - VALUE path, lineno = caller_location(&path); + VALUE path, absolute_path; + VALUE lineno = caller_location(&path, &absolute_path); VALUE parent = 0; VALUE misc, locals, params, exception, body, send_arg; @@ -581,7 +585,8 @@ rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func) iseq->self = iseqval; iseq->local_iseq = iseq; - prepare_iseq_build(iseq, rb_sym2str(name), path, path, lineno, parent, + prepare_iseq_build(iseq, rb_sym2str(name), path, absolute_path, + lineno, parent, ISEQ_TYPE_METHOD, &COMPILE_OPTION_DEFAULT); misc = params = rb_hash_new(); /* empty */ @@ -619,7 +624,8 @@ rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func) { VALUE iseqval = iseq_alloc(rb_cISeq); rb_iseq_t *iseq; - VALUE path, lineno = caller_location(&path); + VALUE path, absolute_path; + VALUE lineno = caller_location(&path, &absolute_path); VALUE parent = 0; VALUE misc, locals, params, exception, body, send_arg; @@ -627,7 +633,8 @@ rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func) iseq->self = iseqval; iseq->local_iseq = iseq; - prepare_iseq_build(iseq, rb_sym2str(name), path, path, lineno, parent, + prepare_iseq_build(iseq, rb_sym2str(name), path, absolute_path, + lineno, parent, ISEQ_TYPE_METHOD, &COMPILE_OPTION_DEFAULT); /* def name=(val); self[arg] = val; end */ -- cgit v1.2.3