diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_method.rb | 2 | ||||
| -rw-r--r-- | vm_eval.c | 4 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Jun 15 08:37:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_eval.c (eval_string_with_cref): propagate absolute path from the + binding if it is given explicitly. patch by Gat (Dawid Janczak) at + [ruby-core:55123]. [Bug #8436] + Sat Jun 15 02:40:18 2013 Tanaka Akira <akr@fsij.org> * bignum.c (bdigs_small_lshift): Extracted from big_lshift. diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 6faf564546..dda4190bd8 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -545,6 +545,8 @@ class TestMethod < Test::Unit::TestCase def test___dir__ assert_instance_of String, __dir__ assert_equal(File.dirname(File.realpath(__FILE__)), __dir__) + bug8436 = '[ruby-core:55123] [Bug #8436]' + assert_equal(__dir__, eval("__dir__", binding), bug8436) end def test_alias_owner @@ -1164,6 +1164,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char int state; VALUE result = Qundef; VALUE envval; + VALUE absolute_path = Qnil; rb_thread_t *th = GET_THREAD(); rb_env_t *env = NULL; rb_block_t block, *base_block; @@ -1190,6 +1191,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char if (strcmp(file, "(eval)") == 0 && bind->path != Qnil) { file = RSTRING_PTR(bind->path); line = bind->first_lineno; + absolute_path = rb_current_realfilepath(); } } else { @@ -1217,7 +1219,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char /* make eval iseq */ th->parse_in_eval++; th->mild_compile_error++; - iseqval = rb_iseq_compile_on_base(src, rb_str_new2(file), INT2FIX(line), base_block); + iseqval = rb_iseq_compile_with_option(src, rb_str_new2(file), absolute_path, INT2FIX(line), base_block, Qnil); th->mild_compile_error--; th->parse_in_eval--; |