archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

iseq.c: absolute_path

Browse source 
* iseq.c (caller_location): separate absolute_path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-17 02:52:19 +00:00
parent bf29986371
commit d327d445c8
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
iseq.c
View file

@ -553,17 +553,20 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
} }
static VALUE static VALUE
caller_location(VALUE *path) caller_location(VALUE *path, VALUE *absolute_path)
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
if (cfp) { if (cfp) {
int line = rb_vm_get_sourceline(cfp); int line = rb_vm_get_sourceline(cfp);
*path = cfp->iseq->location.path; *path = cfp->iseq->location.path;
*absolute_path = cfp->iseq->location.absolute_path;
return INT2FIX(line); return INT2FIX(line);
} }
else { else {
*path = rb_str_new2("<compiled>"); *path = rb_str_new2("<compiled>");
*absolute_path = *path;
return INT2FIX(1); 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); VALUE iseqval = iseq_alloc(rb_cISeq);
rb_iseq_t *iseq; 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 parent = 0;
VALUE misc, locals, params, exception, body, send_arg; 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->self = iseqval;
iseq->local_iseq = iseq; 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); ISEQ_TYPE_METHOD, &COMPILE_OPTION_DEFAULT);
misc = params = rb_hash_new(); /* empty */ 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); VALUE iseqval = iseq_alloc(rb_cISeq);
rb_iseq_t *iseq; 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 parent = 0;
VALUE misc, locals, params, exception, body, send_arg; 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->self = iseqval;
iseq->local_iseq = iseq; 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); ISEQ_TYPE_METHOD, &COMPILE_OPTION_DEFAULT);
/* def name=(val); self[arg] = val; end */ /* def name=(val); self[arg] = val; end */