From b9e0361144da82b25243759c4af5d14a0d996d7a Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 16 Feb 2008 02:46:27 +0000 Subject: * lib/require_relative.rb: check require_relative call in eval. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/require_relative.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/require_relative.rb b/lib/require_relative.rb index 34b094851..e68546f1c 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 -- cgit