From 02689d147d46776a379b8e31cf0c817bf153da9d Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 16 Oct 2009 13:23:15 +0000 Subject: * prelude.rb (require_relative): defined as a module function of Kernel. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ prelude.rb | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 614c223b6f..30299a20a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 16 22:20:25 2009 Tanaka Akira + + * prelude.rb (require_relative): defined as a module function of + Kernel. + Fri Oct 16 20:18:28 2009 Yukihiro Matsumoto * lib/delegate.rb (Delegator#method_missing): remove backtrace diff --git a/prelude.rb b/prelude.rb index fdf401b56a..a9e9e3c23e 100644 --- a/prelude.rb +++ b/prelude.rb @@ -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 -- cgit v1.2.3