From c7a56bd6d0b49d6311821991f9cc7d3499e92891 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 22 Jul 2013 00:48:38 +0000 Subject: [PATCH] vm_eval.c: use file argument * vm_eval.c (eval_string_with_cref): use the given file name unless eval even if scope is given. additional fix for [Bug #8436]. based on the patch by srawlins at [ruby-core:56099] [Bug #8662]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_method.rb | 2 ++ vm_eval.c | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e9d4193e91..49351a67e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 22 09:48:31 2013 Nobuyoshi Nakada + + * vm_eval.c (eval_string_with_cref): use the given file name unless + eval even if scope is given. additional fix for [Bug #8436]. + based on the patch by srawlins at [ruby-core:56099] [Bug #8662]. + Mon Jul 22 09:24:19 2013 Kouji Takao * ext/readline/readline.c (Init_readline): added diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index dda4190bd8..c11dcf9269 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -547,6 +547,8 @@ class TestMethod < Test::Unit::TestCase assert_equal(File.dirname(File.realpath(__FILE__)), __dir__) bug8436 = '[ruby-core:55123] [Bug #8436]' assert_equal(__dir__, eval("__dir__", binding), bug8436) + bug8662 = '[ruby-core:56099] [Bug #8662]' + assert_equal("arbitrary", eval("__dir__", binding, "arbitrary/file.rb"), bug8662) end def test_alias_owner diff --git a/vm_eval.c b/vm_eval.c index 00d1f26fb8..dfa26186f4 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1205,7 +1205,10 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char if (rb_obj_is_kind_of(scope, rb_cBinding)) { GetBindingPtr(scope, bind); envval = bind->env; - if (strcmp(file, "(eval)") == 0 && bind->path != Qnil) { + if (strcmp(file, "(eval)") != 0) { + absolute_path = rb_str_new_cstr(file); + } + else if (bind->path != Qnil) { file = RSTRING_PTR(bind->path); line = bind->first_lineno; absolute_path = rb_current_realfilepath();