diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_method.rb | 2 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | vm_eval.c | 5 |
4 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Jul 23 00:00:27 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]. + Sat Jul 20 23:49:33 2013 NAKAMURA Usaku <usa@ruby-lang.org> * test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 688386774c..1935bf2ad8 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -508,6 +508,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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-07-20" -#define RUBY_PATCHLEVEL 273 +#define RUBY_RELEASE_DATE "2013-07-23" +#define RUBY_PATCHLEVEL 274 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" @@ -1198,7 +1198,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(); |