nobu	2009-04-29 15:22:29 +0900 (Wed, 29 Apr 2009)

  New Revision: 23306

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

  Log:
    * file.c (rb_file_join): recursive array has no meaning as path
      name.  [ruby-core:23329]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/file.c
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/file.c
    trunk/version.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23305)
+++ ChangeLog	(revision 23306)
@@ -1,3 +1,8 @@
+Wed Apr 29 15:22:26 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_join): recursive array has no meaning as path
+	  name.  [ruby-core:23329]
+
 Tue Apr 28 19:09:45 2009  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/test_timeout.rb (TestTimeout#test_timeout): add a test.
Index: version.h
===================================================================
--- version.h	(revision 23305)
+++ version.h	(revision 23306)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-04-28"
+#define RUBY_RELEASE_DATE "2009-04-29"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: file.c
===================================================================
--- file.c	(revision 23305)
+++ file.c	(revision 23306)
@@ -3298,7 +3298,7 @@
 file_inspect_join(VALUE ary, VALUE argp, int recur)
 {
     VALUE *arg = (VALUE *)argp;
-    if (recur) return rb_usascii_str_new2("[...]");
+    if (recur || ary == arg[0]) rb_raise(rb_eArgError, "recursive array");
     return rb_file_join(arg[0], arg[1]);
 }
 
@@ -3332,7 +3332,10 @@
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    {
+	    if (ary == tmp) {
+		rb_raise(rb_eArgError, "recursive array");
+	    }
+	    else {
 		VALUE args[2];
 
 		args[0] = tmp;
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 23305)
+++ ruby_1_8/ChangeLog	(revision 23306)
@@ -1,3 +1,8 @@
+Wed Apr 29 15:22:26 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_join): recursive array has no meaning as path
+	  name.  [ruby-core:23329]
+
 Tue Apr 28 23:05:03 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (get_ts): use readtime clock.  [ruby-dev:38354]
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 23305)
+++ ruby_1_8/version.h	(revision 23306)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2009-04-28"
+#define RUBY_RELEASE_DATE "2009-04-29"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20090428
+#define RUBY_RELEASE_CODE 20090429
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/file.c
===================================================================
--- ruby_1_8/file.c	(revision 23305)
+++ ruby_1_8/file.c	(revision 23306)
@@ -3118,8 +3118,8 @@
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
-		tmp = rb_str_new2("[...]");
+	    if (tmp == ary || rb_inspecting_p(tmp)) {
+		rb_raise(rb_eArgError, "recursive array");
 	    }
 	    else {
 		VALUE args[2];

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