shyouhei	2009-02-13 19:05:02 +0900 (Fri, 13 Feb 2009)

  New Revision: 22281

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22281

  Log:
    merge revision(s) 20231:
    * shell/command-processor.rb: undefined method `top_level_test' in

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/shell/command-processor.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22280)
+++ ruby_1_8_7/ChangeLog	(revision 22281)
@@ -1,3 +1,8 @@
+Fri Feb 13 19:04:54 2009  Keiju Ishitsuka  <keiju@r...>
+
+	* shell/command-processor.rb: undefined method `top_level_test' in
+  	  Shell#test. [ruby-list:45634]
+
 Tue Feb 10 20:00:52 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (load_lock): makes circular require deadlock.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22280)
+++ ruby_1_8_7/version.h	(revision 22281)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-02-11"
+#define RUBY_RELEASE_DATE "2009-02-13"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090211
-#define RUBY_PATCHLEVEL 114
+#define RUBY_RELEASE_CODE 20090213
+#define RUBY_PATCHLEVEL 115
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/lib/shell/command-processor.rb
===================================================================
--- ruby_1_8_7/lib/shell/command-processor.rb	(revision 22280)
+++ ruby_1_8_7/lib/shell/command-processor.rb	(revision 22281)
@@ -155,6 +155,7 @@
     #	  sh[:exists?, "foo"]
     #	  sh["exists?", "foo"]
     #	  
+    alias top_level_test test
     def test(command, file1, file2=nil)
       file1 = expand_path(file1)
       file2 = expand_path(file2) if file2
@@ -162,7 +163,11 @@
 
       case command
       when Integer
-	top_level_test(command, file1, file2)
+	if file2
+	  top_level_test(command, file1, file2)
+	else
+	  top_level_test(command, file1)
+	end
       when String
 	if command.size == 1
 	  if file2

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/