* prelude.rb (require_relative): move require_relative from

  lib/require_relative.rb.  [ruby-core:16356]

* lib/require_relative.rb: removed.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 0 deletions

diff --git a/prelude.rb b/prelude.rb
index a38a57859..fdf401b56 100644
--- a/prelude.rb
+++ b/prelude.rb
@@ -23,3 +23,13 @@ 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}"
+  end
+  absolute_feature = File.expand_path(File.join(File.dirname(file), relative_feature))
+  require absolute_feature
+end