* lib/require_relative.rb: check require_relative call in eval.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a099c7f3d..06bdf232a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 16 11:45:31 2008  Tanaka Akira  <akr@fsij.org>
+
+	* lib/require_relative.rb: check require_relative call in eval.
+
 Sat Feb 16 08:00:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ruby.c (process_options): set default_external before loading
diff --git a/lib/require_relative.rb b/lib/require_relative.rb
index 34b0948514..e68546f1ce 100644
--- a/lib/require_relative.rb
+++ b/lib/require_relative.rb
@@ -1,6 +1,11 @@
 def require_relative(relative_feature)
-  /:/ =~ caller.first
-  absolute_feature = File.expand_path(File.join(File.dirname($`), 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