зеркало из https://github.com/github/ruby.git
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
This commit is contained in:
Родитель
38eb518feb
Коммит
c7a56bd6d0
|
@ -1,3 +1,9 @@
|
|||
Mon Jul 22 09:48:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* 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 <kouji@takao7.net>
|
||||
|
||||
* ext/readline/readline.c (Init_readline): added
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
Загрузка…
Ссылка в новой задаче