summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/irb/workspace.rb2
-rw-r--r--proc.c20
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index 9ce84b60fa..5216520f32 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -108,7 +108,7 @@ EOF
end
def code_around_binding
- file, pos = @binding.eval('[__FILE__, __LINE__]')
+ file, pos = @binding.source_location
unless defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file]
begin
diff --git a/proc.c b/proc.c
index 9dbc78ae4a..23c4d3a2d4 100644
--- a/proc.c
+++ b/proc.c
@@ -12,6 +12,7 @@
#include "eval_intern.h"
#include "internal.h"
#include "gc.h"
+#include "vm_core.h"
#include "iseq.h"
/* 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);
}
+/*
+ * 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
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_defined?", bind_local_variable_defined_p, 1);
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);
}