ruby-changes:4492
From: ko1@a...
Date: Sat, 12 Apr 2008 23:50:38 +0900 (JST)
Subject: [ruby-changes:4492] matz - Ruby:r15985 (trunk): * prelude.rb (require_relative): move require_relative from
matz 2008-04-12 23:50:18 +0900 (Sat, 12 Apr 2008)
New Revision: 15985
Removed files:
trunk/lib/require_relative.rb
Modified files:
trunk/ChangeLog
trunk/prelude.rb
trunk/test/ruby/test_assignment.rb
trunk/test/ruby/test_beginendblock.rb
trunk/test/ruby/test_file.rb
trunk/test/ruby/test_m17n_comb.rb
trunk/test/ruby/test_marshal.rb
trunk/test/ruby/test_pipe.rb
trunk/test/ruby/test_sprintf_comb.rb
trunk/test/ruby/test_system.rb
trunk/test/ruby/test_yield.rb
Log:
* prelude.rb (require_relative): move require_relative from
lib/require_relative.rb. [ruby-core:16356]
* lib/require_relative.rb: removed.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_pipe.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_beginendblock.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_m17n_comb.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_file.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_assignment.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/prelude.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_system.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_yield.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_marshal.rb?r1=15985&r2=15984&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/require_relative.rb
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_sprintf_comb.rb?r1=15985&r2=15984&diff_format=u
Index: prelude.rb
===================================================================
--- prelude.rb (revision 15984)
+++ prelude.rb (revision 15985)
@@ -23,3 +23,13 @@
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
Index: ChangeLog
===================================================================
--- ChangeLog (revision 15984)
+++ ChangeLog (revision 15985)
@@ -12,6 +12,13 @@
parser_warn, e_option_supplied, warn_unless_e_option, range_op,
cond0): nd_file is no longer used.
+Sat Apr 12 12:17:31 2008 Yukihiro Matsumoto <matz@r...>
+
+ * prelude.rb (require_relative): move require_relative from
+ lib/require_relative.rb. [ruby-core:16356]
+
+ * lib/require_relative.rb: removed.
+
Sat Apr 12 05:55:57 2008 Eric Hodel <drbrain@s...>
* lib/rubygems*, test/rubygems*: Update to RubyGems 1.1.1 r1701.
Index: lib/require_relative.rb
===================================================================
--- lib/require_relative.rb (revision 15984)
+++ lib/require_relative.rb (revision 15985)
@@ -1,11 +0,0 @@
-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
-
Index: test/ruby/test_system.rb
===================================================================
--- test/ruby/test_system.rb (revision 15984)
+++ test/ruby/test_system.rb (revision 15985)
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tmpdir'
-require 'require_relative'
require_relative 'envutil'
class TestSystem < Test::Unit::TestCase
Index: test/ruby/test_beginendblock.rb
===================================================================
--- test/ruby/test_beginendblock.rb (revision 15984)
+++ test/ruby/test_beginendblock.rb (revision 15985)
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tempfile'
-require 'require_relative'
require_relative 'envutil'
class TestBeginEndBlock < Test::Unit::TestCase
Index: test/ruby/test_assignment.rb
===================================================================
--- test/ruby/test_assignment.rb (revision 15984)
+++ test/ruby/test_assignment.rb (revision 15985)
@@ -490,7 +490,6 @@
end
end
-require 'require_relative'
require_relative 'sentence'
class TestAssignmentGen < Test::Unit::TestCase
Syntax = {
Index: test/ruby/test_file.rb
===================================================================
--- test/ruby/test_file.rb (revision 15984)
+++ test/ruby/test_file.rb (revision 15985)
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tempfile'
-require 'require_relative'
require_relative 'ut_eof'
class TestFile < Test::Unit::TestCase
Index: test/ruby/test_m17n_comb.rb
===================================================================
--- test/ruby/test_m17n_comb.rb (revision 15984)
+++ test/ruby/test_m17n_comb.rb (revision 15985)
@@ -1,6 +1,5 @@
require 'test/unit'
require 'stringio'
-require 'require_relative'
require_relative 'allpairs'
class TestM17NComb < Test::Unit::TestCase
Index: test/ruby/test_sprintf_comb.rb
===================================================================
--- test/ruby/test_sprintf_comb.rb (revision 15984)
+++ test/ruby/test_sprintf_comb.rb (revision 15985)
@@ -1,5 +1,4 @@
require 'test/unit'
-require 'require_relative'
require_relative 'allpairs'
class TestSprintfComb < Test::Unit::TestCase
Index: test/ruby/test_marshal.rb
===================================================================
--- test/ruby/test_marshal.rb (revision 15984)
+++ test/ruby/test_marshal.rb (revision 15985)
@@ -1,5 +1,4 @@
require 'test/unit'
-require 'require_relative'
require_relative 'marshaltestlib'
class TestMarshal < Test::Unit::TestCase
Index: test/ruby/test_pipe.rb
===================================================================
--- test/ruby/test_pipe.rb (revision 15984)
+++ test/ruby/test_pipe.rb (revision 15985)
@@ -1,5 +1,4 @@
require 'test/unit'
-require 'require_relative'
require_relative 'ut_eof'
class TestPipe < Test::Unit::TestCase
Index: test/ruby/test_yield.rb
===================================================================
--- test/ruby/test_yield.rb (revision 15984)
+++ test/ruby/test_yield.rb (revision 15985)
@@ -74,7 +74,6 @@
end
end
-require 'require_relative'
require_relative 'sentence'
class TestRubyYieldGen < Test::Unit::TestCase
Syntax = {
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/