@@ -1,3 +1,8 @@ +Fri Oct 16 22:20:25 2009 Tanaka Akira <akr@fsij.org> + + * prelude.rb (require_relative): defined as a module function of + Kernel. + Fri Oct 16 20:18:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/delegate.rb (Delegator#method_missing): remove backtrace ChangeLog @@ -23,13 +23,16 @@ class Thread end end -def require_relative(relative_feature) - c = caller.first - e = c.rindex(/:\d+:in /) - file = $` - if /\A\((.*)\)/ =~ file # eval, etc. - raise LoadError, "require_relative is called in #{$1}" +module Kernel + module_function + def require_relative(relative_feature) + c = caller.first + e = c.rindex(/:\d+:in /) + file = $` + if /\A\((.*)\)/ =~ file # eval, etc. + raise LoadError, "require_relative is called in #{$1}" + end + absolute_feature = File.expand_path(File.join(File.dirname(file), relative_feature)) + require absolute_feature end - absolute_feature = File.expand_path(File.join(File.dirname(file), relative_feature)) - require absolute_feature end prelude.rb 682ab87c6b1d601ed8a420e79c4c1883ae7f5291 akr akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e http://github.com/skaes/matzruby/commit/74785cabdd6d1e4630adcf97d5e91d13223fb8a4 74785cabdd6d1e4630adcf97d5e91d13223fb8a4 2009-10-16T06:23:15-07:00 2009-10-16T06:23:15-07:00 * prelude.rb (require_relative): defined as a module function of Kernel. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e ba841ed9276011ba7c83c2ee80b2e33709640c77 akr akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e