diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-26 23:25:21 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-26 23:25:21 +0000 |
commit | d187f4bc215119469c3da6828ef78f216dfe20f2 (patch) | |
tree | 76740f631a2fa05420269f9bd17481eb18ea9831 /vm_trace.c | |
parent | a916278900dcd0db090db11d50e082e941968b9f (diff) |
* vm_trace.c: rename TracePoint#file and TracePoint#line
to TracePoint#path and TracePoint#lineno respectively.
They are consistent to RubyVM::Backtrace::Location.
* include/ruby/debug.h: ditto.
* vm_core.h: ditto.
* test/ruby/test_settracefunc.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_trace.c')
-rw-r--r-- | vm_trace.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vm_trace.c b/vm_trace.c index e02376324c..ddd8dfd3be 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -643,38 +643,38 @@ int rb_vm_control_frame_id_and_class(rb_control_frame_t *cfp, ID *idp, VALUE *kl VALUE rb_binding_new_with_cfp(rb_thread_t *th, rb_control_frame_t *src_cfp); static void -fill_file_and_line(rb_trace_arg_t *trace_arg) +fill_path_and_lineno(rb_trace_arg_t *trace_arg) { - if (trace_arg->file == Qundef) { + if (trace_arg->path == Qundef) { rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(trace_arg->th, trace_arg->cfp); if (cfp) { - trace_arg->file = cfp->iseq->location.path; - trace_arg->line = rb_vm_get_sourceline(cfp); + trace_arg->path = cfp->iseq->location.path; + trace_arg->lineno = rb_vm_get_sourceline(cfp); } else { - trace_arg->file = Qnil; - trace_arg->line = 0; + trace_arg->path = Qnil; + trace_arg->lineno = 0; } } } VALUE -rb_tracepoint_attr_line(VALUE tpval) +rb_tracepoint_attr_lineno(VALUE tpval) { rb_tp_t *tp = tpptr(tpval); tp_attr_check_active(tp); - fill_file_and_line(tp->trace_arg); - return INT2FIX(tp->trace_arg->line); + fill_path_and_lineno(tp->trace_arg); + return INT2FIX(tp->trace_arg->lineno); } VALUE -rb_tracepoint_attr_file(VALUE tpval) +rb_tracepoint_attr_path(VALUE tpval) { rb_tp_t *tp = tpptr(tpval); tp_attr_check_active(tp); - fill_file_and_line(tp->trace_arg); - return tp->trace_arg->file; + fill_path_and_lineno(tp->trace_arg); + return tp->trace_arg->path; } static void @@ -957,8 +957,8 @@ Init_vm_trace(void) rb_define_method(rb_cTracePoint, "enabled?", rb_tracepoint_enabled_p, 0); rb_define_method(rb_cTracePoint, "event", rb_tracepoint_attr_event, 0); - rb_define_method(rb_cTracePoint, "line", rb_tracepoint_attr_line, 0); - rb_define_method(rb_cTracePoint, "file", rb_tracepoint_attr_file, 0); + rb_define_method(rb_cTracePoint, "lineno", rb_tracepoint_attr_lineno, 0); + rb_define_method(rb_cTracePoint, "path", rb_tracepoint_attr_path, 0); rb_define_method(rb_cTracePoint, "id", rb_tracepoint_attr_id, 0); rb_define_method(rb_cTracePoint, "klass", rb_tracepoint_attr_klass, 0); rb_define_method(rb_cTracePoint, "binding", rb_tracepoint_attr_binding, 0); |