1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proc.c (bind_location): Add Binding#source_location

Browse Source 
Fixes #14230

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2017-12-26 08:38:35 +00:00
parent f6631c3096
commit 571e48b744
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/irb/workspace.rb
View File

@ -108,7 +108,7 @@ EOF
end end
def code_around_binding def code_around_binding
file, pos = @binding.eval('[__FILE__, __LINE__]') file, pos = @binding.source_location
unless defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file] unless defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file]
begin begin

20
proc.c
View File

@ -12,6 +12,7 @@
#include "eval_intern.h" #include "eval_intern.h"
#include "internal.h" #include "internal.h"
#include "gc.h" #include "gc.h"
#include "vm_core.h"
#include "iseq.h" #include "iseq.h"
/* Proc.new with no block will raise an exception in the future /* Proc.new with no block will raise an exception in the future
@ -611,6 +612,24 @@ bind_receiver(VALUE bindval)
return vm_block_self(&bind->block); return vm_block_self(&bind->block);
} }
/*
* call-seq:
* binding.source_location -> [String, Integer]
*
* Returns the Ruby source filename and line number of the binding object.
*/
static VALUE
bind_location(VALUE bindval)
{
VALUE loc[2];
const rb_binding_t *bind;
GetBindingPtr(bindval, bind);
loc[0] = pathobj_path(bind->pathobj);
loc[1] = INT2FIX(bind->first_lineno);
return rb_ary_new4(2, loc);
}
static VALUE static VALUE
cfunc_proc_new(VALUE klass, VALUE ifunc, int8_t is_lambda) cfunc_proc_new(VALUE klass, VALUE ifunc, int8_t is_lambda)
{ {
@ -3223,5 +3242,6 @@ Init_Binding(void)
rb_define_method(rb_cBinding, "local_variable_set", bind_local_variable_set, 2); rb_define_method(rb_cBinding, "local_variable_set", bind_local_variable_set, 2);
rb_define_method(rb_cBinding, "local_variable_defined?", bind_local_variable_defined_p, 1); rb_define_method(rb_cBinding, "local_variable_defined?", bind_local_variable_defined_p, 1);
rb_define_method(rb_cBinding, "receiver", bind_receiver, 0); rb_define_method(rb_cBinding, "receiver", bind_receiver, 0);
rb_define_method(rb_cBinding, "source_location", bind_location, 0);
rb_define_global_function("binding", rb_f_binding, 0); rb_define_global_function("binding", rb_f_binding, 0);
} }