ruby-changes:13595
From: akr <ko1@a...>
Date: Fri, 16 Oct 2009 22:23:31 +0900 (JST)
Subject: [ruby-changes:13595] Ruby:r25376 (trunk): * prelude.rb (require_relative): defined as a module function of
akr 2009-10-16 22:23:15 +0900 (Fri, 16 Oct 2009) New Revision: 25376 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25376 Log: * prelude.rb (require_relative): defined as a module function of Kernel. Modified files: trunk/ChangeLog trunk/prelude.rb Index: prelude.rb =================================================================== --- prelude.rb (revision 25375) +++ prelude.rb (revision 25376) @@ -23,13 +23,16 @@ 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 Index: ChangeLog =================================================================== --- ChangeLog (revision 25375) +++ ChangeLog (revision 25376) @@ -1,3 +1,8 @@ +Fri Oct 16 22:20:25 2009 Tanaka Akira <akr@f...> + + * prelude.rb (require_relative): defined as a module function of + Kernel. + Fri Oct 16 20:18:28 2009 Yukihiro Matsumoto <matz@r...> * lib/delegate.rb (Delegator#method_missing): remove backtrace -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/